From 00271e9e213409327d97f1d2b472b0a0bba0728c Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 5 Mar 2018 14:35:04 +0630 Subject: [PATCH 1/2] update license --- config/license.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 config/license.yml diff --git a/config/license.yml b/config/license.yml new file mode 100644 index 00000000..32094fb3 --- /dev/null +++ b/config/license.yml @@ -0,0 +1,15 @@ +iv_key: l6jSSxA1D2hcajRgfsd6Nw== +shop_name: sx_license_test2 +email: aungmyo.zaw@code2lab.com +telephone: 0099404923 +fax: 49494949432 +address: Yangon +dbhost: oUG2cXgGsuNxgiItgwvhIQ== +dbschema: IQzxsvLca7eq6Qa2SAplwg== +dbusername: Nm1E9EzonZwRbJZIGpFxBg== +dbpassword: kdoY1Z4Mvq06eqa1BxAcug== +api_token: uGrwtgWHsDEBNrdZIckHgRItdUIGnDcIGYYIZJM +app_token: aJPiVvXbAfdPDqGppRPZnxlFTBkMIwk +plan_sku: qDklFYomm87GBgerRT+fBA== +renewable_date: mbE4vFnUpFhPpoRehP/HQw== +plan_name: /CnVZqmB4N4B2t1gaw0Geg== From 981aef32ba26cccbb40fd3a7c76b8b878bb3c256 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 5 Mar 2018 16:35:50 +0630 Subject: [PATCH 2/2] update license check offline --- app/models/license.rb | 26 ++++++++++++++------------ config/license.yml | 22 +++++++++++----------- 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/app/models/license.rb b/app/models/license.rb index 1cbce908..7d935185 100755 --- a/app/models/license.rb +++ b/app/models/license.rb @@ -70,13 +70,11 @@ class License # For Local System def detail_with_local_file() renewal_date_str = read_license("renewable_date") - if check_expiring(renewal_date_str) # return for all ok return 1 else has_license = verify_license() - if has_license # return for expiring return 2 @@ -137,23 +135,27 @@ class License api_token = read_license_no_decrypt("api_token") @params = { query: {lookup_type: "application", api_token: api_token} } response = self.class.get("/verify", @params) - @varified = response.parsed_response - Rails.logger.debug "License Remote Response - " + response.parsed_response.to_s - if (@varified["status"]) - if (!check_expired(@varified["renewable_date"])) - return true - end - else - delete_license_file - end + rescue SocketError => e + Rails.logger.debug "In Socket errror" + return true + rescue => e + @varified = response.parsed_response + Rails.logger.debug "License Remote Response - " + response.parsed_response.to_s + if (@varified["status"]) + if (!check_expired(@varified["renewable_date"])) + return true + end + else + delete_license_file + end return false end # Check Expired before 30 days def check_expiring(renewal_date_str) if !renewal_date_str.empty? - renewal_date = DateTime.parse(renewal_date_str) + renewal_date = DateTime.parse(renewal_date_str) renewal_date > Date.today.advance(:days => 30) end end diff --git a/config/license.yml b/config/license.yml index 32094fb3..fefa7d40 100644 --- a/config/license.yml +++ b/config/license.yml @@ -1,15 +1,15 @@ -iv_key: l6jSSxA1D2hcajRgfsd6Nw== -shop_name: sx_license_test2 +iv_key: f3ICP0M2HJLIeXURn3yv5A== +shop_name: sx_license_test3 email: aungmyo.zaw@code2lab.com telephone: 0099404923 fax: 49494949432 address: Yangon -dbhost: oUG2cXgGsuNxgiItgwvhIQ== -dbschema: IQzxsvLca7eq6Qa2SAplwg== -dbusername: Nm1E9EzonZwRbJZIGpFxBg== -dbpassword: kdoY1Z4Mvq06eqa1BxAcug== -api_token: uGrwtgWHsDEBNrdZIckHgRItdUIGnDcIGYYIZJM -app_token: aJPiVvXbAfdPDqGppRPZnxlFTBkMIwk -plan_sku: qDklFYomm87GBgerRT+fBA== -renewable_date: mbE4vFnUpFhPpoRehP/HQw== -plan_name: /CnVZqmB4N4B2t1gaw0Geg== +dbhost: m4ZCds3ANyqjqCgZVSTfRQ== +dbschema: +mvY73HAjWqMrby9Zu+tBg== +dbusername: UO2rBxhoSfDEKutK2OEL4A== +dbpassword: sVpy+Lj6i3MpT+CjoJrDOw== +api_token: srTutEOCzphDFOXQqVWnZwQDTXiHdzwzY +app_token: pSzbojYfXLNpSLmhdNTfLCtxfzeUahO +plan_sku: +53eC6oiOsBRxtBgVjyULw== +renewable_date: hon6p5jvfirTFniaFrH0qw== +plan_name: eaMIWzHlTnljCEkE2oxoHg==