From a6252923f1233b2e247c68544489738de9f919b2 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 10 Nov 2017 19:03:10 +0630 Subject: [PATCH] test license --- app/controllers/application_controller.rb | 6 +++--- app/models/license.rb | 4 ++-- config/secrets.yml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index da9fde0a..5d68d8c5 100755 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -23,8 +23,8 @@ class ApplicationController < ActionController::Base end def lookup_domain - if request.subdomain.present? && request.subdomain != "www" - @license = current_license(ENV["SX_PROVISION_URL"], request.subdomain.downcase) + # if request.subdomain.present? && request.subdomain != "www" + @license = current_license(ENV["SX_PROVISION_URL"], "chromisreal-16") # request.subdomain.downcase if (!@license.nil?) # logger.info "Location - " + @license.name ActiveRecord::Base.establish_connection(website_connection(@license)) @@ -35,7 +35,7 @@ class ApplicationController < ActionController::Base # redirect_to root_url(:host => request.domain) + "store_error" render :json => [{ status: false, message: 'Invalid Access!'}] end - end + # end end def current_license(url, key) diff --git a/app/models/license.rb b/app/models/license.rb index 6089218a..a7365107 100755 --- a/app/models/license.rb +++ b/app/models/license.rb @@ -1,7 +1,7 @@ class License include HTTParty - base_uri "secure.smartsales.asia/api" + base_uri "provision.zsai.ws/api" attr_accessor :name, :address_1, :address_2, :township, :city, :country, :email, :phone, :fax, :logo, :subdomain, :plan_activation_date, :plan_next_renewal_date, :plan_max_products,:plan_max_customers, :plan_active_connections, @@ -20,7 +20,7 @@ class License end # generate key for license file encrypt - AESCrypt.export_key() + AESEncDec.export_key() @secret = ENV["aes_key"] @params = { query: { device: "SX", token: SECRETS_CONFIG['provision_key'] } } diff --git a/config/secrets.yml b/config/secrets.yml index 794deddf..a61f9592 100755 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -12,7 +12,7 @@ development: secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61 - sx_provision_url: secure.smartsales.asia/api + sx_provision_url: provision.zsai.ws/api aes_key: <%= ENV['aes_key'] %> aes_iv: <%= ENV['aes_iv'] %> @@ -23,7 +23,7 @@ test: # instead read values from the environment. production: secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22 - sx_provision_url: secure.smartsales.asia/api + sx_provision_url: provision.zsai.ws/api aes_key: <%= ENV['aes_key'] %> aes_iv: <%= ENV['aes_iv'] %>