unionpei 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98b28f654f4ca48e64be757fc3d5fd74f523acd18388affdfcaca5f1125fcd31
-  data.tar.gz: 53d6ed97a4de7a451024c31ef9737f0e9eeb8d83fbf4898b22964d7288325b43
+  metadata.gz: ab2f6a36a20d9faf9d86114493a7ec077afd68a937cc8f321a9b721d72ec5765
+  data.tar.gz: 3430627f305f5772463bead2e8ca45b39414b023a02da1d7856433216fc2b16c
 SHA512:
-  metadata.gz: c170604ec476c96c0fbf3ec661ac1fedb2bc57a9952b3f8e8a6092aefe7e55bfc01f9e86fe7fd7eac88a0bc0df6a43ebee279cb97ebfcaa40dd2ef4e23aac2e8
-  data.tar.gz: 822b695d4549dbdcdb4b39a989f04ae842012684ea01b4ea69a85526be564286c7933edff124963e054b5389d2465e0a34a07a70d894add087186e631edeb558
+  metadata.gz: 179c56aac0e48f0938de414db3a46978d3ac6d46b03cad194cbeada375c4e028778a1aa68083910ef71f39e7112538cd3999ca7d0504e4f73bc80c06bee82ab2
+  data.tar.gz: 7097aaa2fd90dae33c6426a583c6d5deefdf231dbfe7ca5a00f4524f5134767849e0cc50b52d4e6415e2e3ace6790337f0a17770cb9e901e68fee014ffe207b0

data/.gitignore

@@ -0,0 +1,17 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+.idea
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/Gemfile

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in alipay.gemspec
+gemspec

data/Rakefile

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+  t.test_files = FileList['test/**/*_test.rb']
+end
+
+task default: :test

data/certs/acp_test_enc.cer

@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIEPzCCAyegAwIBAgIFEDl2NhIwDQYJKoZIhvcNAQEFBQAwWDELMAkGA1UEBhMC
+Q04xMDAuBgNVBAoTJ0NoaW5hIEZpbmFuY2lhbCBDZXJ0aWZpY2F0aW9uIEF1dGhv
+cml0eTEXMBUGA1UEAxMOQ0ZDQSBURVNUIE9DQTEwHhcNMjAwOTExMDI0MzI2WhcN
+MjUwOTExMDI0MzI2WjBzMQswCQYDVQQGEwJDTjESMBAGA1UEChMJQ0ZDQSBPQ0Ex
+MQ0wCwYDVQQLEwRZQ0NBMRUwEwYDVQQLEwxJbmRpdmlkdWFsLTExKjAoBgNVBAMM
+IVlDQ0FA5rWL6K+V5L2/55SoQDAwMDQwMDAwOlNJR05AMTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBALUwYYpqUXZyDAu0gX5d8XkiUfFxdCan/VyLa6Cz
+KH38cjX0QZIShn/O6Cw2hn2WurP/r3LdopLRzTHI0vIDJpQY/0Y135QHRFZHkAH0
+omRTfAZ/atePnRF7VW766LGhR5n05h1nITDHlzCZYPSumpDPpVcJj4y30+G3A5Ou
+1VVAsuLi48XtGIKwRX6gMXI+P75RwHSmPt5/pHlEPT6wUbmF0HBoF2gRBpYZwiSK
+51Z52XUVEk96reolFFLu/9qyL767/v2izd5YuN9i7oSXNw1gDYcLnAuww6V6BUnK
+Kq4KUG6H3Lz3WyXbEay72f12A5pnHWDjLEOwJ2SG1VVMLN8CAwEAAaOB9DCB8TAf
+BgNVHSMEGDAWgBTPcJ1h6518Lrj3ywJA9wmd/jN0gDBIBgNVHSAEQTA/MD0GCGCB
+HIbvKgEBMDEwLwYIKwYBBQUHAgEWI2h0dHA6Ly93d3cuY2ZjYS5jb20uY24vdXMv
+dXMtMTQuaHRtMDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly91Y3JsLmNmY2EuY29t
+LmNuL1JTQS9jcmw3NTM3Ni5jcmwwCwYDVR0PBAQDAgPoMB0GA1UdDgQWBBSwaOVL
+eW+I7Pm7C8lXu94+MTXAzjAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwQw
+DQYJKoZIhvcNAQEFBQADggEBADhYan/FCZWzD0BS+KvZivpp498eWRqzXjH2QkBv
+IDYv2+Ntue66WxECMW7i9+RZVjyMeYbFkoxVEcg0cE/mcHOnqd1mTBpeb62NRbWR
+OuquWHxcdIHJ/TjGX8+NwtpAKsn/IvTdEBz+EOOzmXuxNqNxV3Gg7Ay3YavWZzci
+h9GEAQ11WKAjaNqq+XO6dDwBSVEQEkvHqf1DeqCZ9wl58I4MvUmAI7wKfnoonquu
+1wCNMxnkHYS5EAk1Zb0nsprjz771+YZI6ai/I2ehn8hyUR46TYmPMn0WyaXkmEO7
+ig055dazyfvMinsHmKyLa/yJvQMlZIWtsKzaNG4ikdA+ELQ=
+-----END CERTIFICATE-----

data/certs/acp_test_middle.cer

@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIIDzjCCAragAwIBAgIKGNDz/H99Hd/CxjANBgkqhkiG9w0BAQUFADBZMQswCQYD
+VQQGEwJDTjEwMC4GA1UEChMnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24g
+QXV0aG9yaXR5MRgwFgYDVQQDEw9DRkNBIFRFU1QgQ1MgQ0EwHhcNMTIwODMwMDMx
+NDMzWhcNMzEwNTExMDMxNDMzWjBYMQswCQYDVQQGEwJDTjEwMC4GA1UEChMnQ2hp
+bmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRcwFQYDVQQDEw5D
+RkNBIFRFU1QgT0NBMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALiL
+J/BrdvHSbXNfLIMTwUg9tDtVjMRGXOl6aZnu9IpxjI5SMUJ4hVwgJnmbTokxs6GF
+IXKsCLSm5H1jHLI22ysc/ltByEybLWj5jjJuC9+Uknbl3/Ls1RBG6MogUCqZckuo
+hKrf5DmlV3C/jVLxGn3pUeanvmqVUi4TKpXxgm5QqKSPF8VtQY4qCpNcQwwZqbMr
+D+IfJtfpGAeVrP+Kg6i1t65seeEnVSaLhqpRUDU0PTblOuUv3OhiKJWA3cYWxUrg
+7U7SIHNJLSEUWmjy4mKty+g7Cnjzt29F9qXFb6oB2mR8yt4GHCilw1Rc5RBXY63H
+eTuOwdtGE3M2p7Q++OECAwEAAaOBmDCBlTAfBgNVHSMEGDAWgBR03sWNCn0QGqpp
+g1tNIc6Gm8xxODAMBgNVHRMEBTADAQH/MDgGA1UdHwQxMC8wLaAroCmGJ2h0dHA6
+Ly8yMTAuNzQuNDIuMy90ZXN0cmNhL1JTQS9jcmwxLmNybDALBgNVHQ8EBAMCAQYw
+HQYDVR0OBBYEFM9wnWHrnXwuuPfLAkD3CZ3+M3SAMA0GCSqGSIb3DQEBBQUAA4IB
+AQC0JOazrbkk0XMxMMeBCc3lgBId1RjQLgWUZ7zaUISpPstGIrE5A9aB6Ppq0Sxl
+pt2gkFhPEKUqgOFN1CzCDEbP3n4H0chqK1DOMrgTCD8ID5UW+ECTYNe35rZ+1JiF
+lOPEhFL3pv6XSkiKTfDnjum8+wFwUBGlfoWK1Hcx0P2Hk1jcZZKwGTx1IAkesF83
+pufhxHE2Ur7W4d4tfp+eC7XXcA91pdd+VUrAfkj9eKHcDEYZz66HvHzmt6rtJVBa
+pwrtCi9pW3rcm8c/1jSnEETZIaokai0fD7260h/LkD/GrNCibSWxFj1CqyP9Y5Yv
+cj6aA5LnUcJYeNkrQ3V4XvVc
+-----END CERTIFICATE-----

data/certs/acp_test_root.cer

@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDkzCCAnugAwIBAgIKUhN+zB19hbc65jANBgkqhkiG9w0BAQUFADBZMQswCQYD
+VQQGEwJDTjEwMC4GA1UEChMnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24g
+QXV0aG9yaXR5MRgwFgYDVQQDEw9DRkNBIFRFU1QgQ1MgQ0EwHhcNMTIwODI5MDUw
+MTI5WhcNMzIwODI5MDUwMTI5WjBZMQswCQYDVQQGEwJDTjEwMC4GA1UEChMnQ2hp
+bmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRgwFgYDVQQDEw9D
+RkNBIFRFU1QgQ1MgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa
+rMJGruH6rOBPFxUI7T1ybydSRRtOM1xvkVjQNX0qmYir8feE6Tb0ctgtKR7a20DI
+YCj9kZ5ANBQqjRcj3Soq9XH3cirqhYHJ723OKyTpS0RPQ0N6vtVt3P5JQ+ztjWHd
+qIbbTOQ6O024TGTiqi6uHgMuz9/OVur81X3a5YVkK7jFeZ9o8cTcvQxD853/1sgZ
+QcmR9aUSw0RXH4XFLTrn7n4QSfWKiNotlD8Ag5gS1pH9ONUb6nGkMn3gh1xfJqjm
+ONMSknPXTGiNpXtqvYi8oIvByVCbUDO59IwPP1r1SYyE3P8Nr7DdQRu0KQSdXLoG
+iugSR3fn+toObVAQmplDAgMBAAGjXTBbMB8GA1UdIwQYMBaAFHTexY0KfRAaqmmD
+W00hzoabzHE4MAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBR0
+3sWNCn0QGqppg1tNIc6Gm8xxODANBgkqhkiG9w0BAQUFAAOCAQEAM0eTkM35D4hj
+RlGC63wY0h++wVPUvOrObqAVBbzEEQ7ScBienmeY8Q6lWMUTXM9ALibZklpJPcJv
+3ntht7LL6ztd4wdX7E9RzZCQnRvbL9A/BU3NxWdeSpCg/OyPod5oCKP+6Uc7kApi
+F9OtYNWnt3l2Zp/NiedzEQD8H4qEWQLAq+0dFo5BkfVhb/jPcktndpfPOuH1IMhP
+tVcvo6jpFHw4U/nP2Jv59osIE97KJz/SPt2JAYnZOlIDqWwp9/Afvt0/MDr8y0PK
+Q9c6eqIzBx7a9LpUTUl5u1jS+xSDZ/KF2lXnjwaFp7jICLWEMlBstCoogi7KwH9A
+LpJP7/dj9g==
+-----END CERTIFICATE-----

data/install.sh

@@ -0,0 +1,2 @@
+gem build unionpei.gemspec
+gem install unionpei-*.gem

data/lib/unionpei/acp_service.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'openssl'
 require 'base64'
@@ -8,99 +8,94 @@ require_relative 'sdk_util'
 
 module UnionPei
   class AcpService
-    def AcpService.sign(req, certPath=SDKConfig.instance.signCertPath, certPwd=SDKConfig.instance.signCertPwd)
+    def self.sign(req, certPath = SDKConfig.instance.signCertPath, certPwd = SDKConfig.instance.signCertPwd)
       SDKUtil.buildSignature(req, certPath, certPwd)
     end
 
-    def AcpService.signByCertInfo(req, certPath, certPwd)
+    def self.signByCertInfo(req, certPath, certPwd)
       SDKUtil.buildSignature(req, certPath, certPwd)
     end
 
-    def AcpService.signBySecureKey(req, secureKey)
+    def self.signBySecureKey(req, secureKey)
       SDKUtil.buildSignature(req, nil, nil, secureKey)
     end
 
-    def AcpService.validate(resp)
+    def self.validate(resp)
       SDKUtil.verify(resp)
     end
 
-    def AcpService.validateBySecureKey(resp, secureKey)
+    def self.validateBySecureKey(resp, secureKey)
       SDKUtil.verifyBySecureKey(resp, secureKey)
     end
 
-    def AcpService.post(params, url)
+    def self.post(params, url)
       content = SDKUtil.createLinkString(params, false, true)
       respString = SDKUtil.post(url, content)
-      resp = SDKUtil.parseQString(respString)
-      return resp
+      SDKUtil.parseQString(respString)
     end
 
-    def AcpService.createAutoFormHtml(params, reqUrl)
-      return SDKUtil.createAutoFormHtml(params, reqUrl)
+    def self.createAutoFormHtml(params, reqUrl)
+      SDKUtil.createAutoFormHtml(params, reqUrl)
     end
 
-    def AcpService.getCustomerInfo(customerInfo)
-      if(customerInfo == nil or customerInfo.length == 0)
-          return ""
-      end
-      return Base.encode64("{" + SDKUtil.createLinkString(customerInfo,false,false)+"}").gsub(/\n|\r/, '')
+    def self.getCustomerInfo(customerInfo)
+      return '' if customerInfo.nil? || customerInfo.length.zero?
+
+      Base.encode64("{#{SDKUtil.createLinkString(customerInfo, false, false)}}").gsub(/\n|\r/, '')
     end
 
-    def AcpService.getCustomerInfoWithEncrypt(customerInfo)
-      if(customerInfo == nil or customerInfo.length == 0)
-        return ""
-      end
+    def self.getCustomerInfoWithEncrypt(customerInfo)
+      return '' if customerInfo.nil? || customerInfo.length.zero?
+
       encryptedInfo = {}
-      for key in customerInfo.keys
-        if (key == 'phoneNo' or key == 'cvn2' or key == 'expired')
-          encryptedInfo[key] = customerInfo.delete(key)
-        end
+      customerInfo.each_key do |key|
+        encryptedInfo[key] = customerInfo.delete(key) if (key == 'phoneNo') || (key == 'cvn2') || (key == 'expired')
       end
-      if (encryptedInfo.length > 0)
+      if encryptedInfo.length.positive?
         encryptedInfo = SDKUtil.createLinkString(encryptedInfo, false, false)
         encryptedInfo = AcpService.encryptData(encryptedInfo, SDKConfig.instance.encryptCertPath)
         customerInfo['encryptedInfo'] = encryptedInfo
       end
-      return Base64.encode64("{" + SDKUtil.createLinkString(customerInfo,false,false)+"}").gsub(/\n|\r/, '')
+      Base64.encode64("{#{SDKUtil.createLinkString(customerInfo, false, false)}}").gsub(/\n|\r/, '')
     end
 
-    def AcpService.parseCustomerInfo(customerInfostr, certPath=SDKConfig.instance.signCertPath, certPwd=SDKConfig.instance.signCertPwd)
+    def self.parseCustomerInfo(customerInfostr, certPath = SDKConfig.instance.signCertPath, certPwd = SDKConfig.instance.signCertPwd)
       customerInfostr = Base64.decode64(customerInfostr)
-      customerInfostr = customerInfostr[1, customerInfostr.length-1]
+      customerInfostr = customerInfostr[1, customerInfostr.length - 1]
       customerInfo = SDKUtil.parseQString(customerInfostr)
       if customerInfo['encryptedInfo']
         encryptedInfoStr = customerInfo.delete('encryptedInfo')
         encryptedInfoStr = AcpService.decryptData(encryptedInfoStr, certPath, certPwd)
         encryptedInfo = SDKUtil.parseQString(encryptedInfoStr)
-        for key in encryptedInfo.keys
+        encryptedInfo.each_key do |key|
           customerInfo[key] = encryptedInfo[key]
         end
       end
-      return customerInfo
+      customerInfo
     end
 
-    def AcpService.getEncryptCertId
-      return CertUtil.getEncryptCertId
+    def self.getEncryptCertId
+      CertUtil.getEncryptCertId
     end
 
-    def AcpService.encryptData(data, certPath=SDKConfig.instance.encryptCertPath)
-        return SDKUtil.encryptPub(data, certPath)
+    def self.encryptData(data, certPath = SDKConfig.instance.encryptCertPath)
+      SDKUtil.encryptPub(data, certPath)
     end
 
-    def AcpService.decryptData(data, certPath=SDKConfig.instance.signCertPath, certPwd=SDKConfig.instance.signCertPwd)
-        return SDKUtil.decryptPri(data, certPath, certPwd)
+    def self.decryptData(data, certPath = SDKConfig.instance.signCertPath, certPwd = SDKConfig.instance.signCertPwd)
+      SDKUtil.decryptPri(data, certPath, certPwd)
     end
 
-    def AcpService.deCodeFileContent(params, fileDirectory)
-        return SDKUtil.deCodeFileContent(params, fileDirectory)
+    def self.deCodeFileContent(params, fileDirectory)
+      SDKUtil.deCodeFileContent(params, fileDirectory)
     end
 
-    def AcpService.enCodeFileContent(path)
-        return SDKUtil.enCodeFileContent(path)
+    def self.enCodeFileContent(path)
+      SDKUtil.enCodeFileContent(path)
     end
 
-    def AcpService.updateEncryptCert(params)
-        return SDKUtil.getEncryptCert(params)
+    def self.updateEncryptCert(params)
+      SDKUtil.getEncryptCert(params)
     end
   end
 end

data/lib/unionpei/cert_util.rb

@@ -1,37 +1,31 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'openssl'
 require 'base64'
 require_relative 'log_util'
 require_relative 'sdk_config'
 
-
 module UnionPei
-  UNIONPAY_CNNAME = "中国银联股份有限公司"
+  UNIONPAY_CNNAME = '中国银联股份有限公司'
 
   class Cert
     attr_accessor :cert, :certId, :key
-    @certId
-    @key
-    @cert
   end
 
   class CertUtil
-
     @@signCerts = {}
     @@encryptCert = {}
-    @@verifyCerts = {} #5.0.0验签证书，key是certId
-    @@verifyCerts5_1_0 = {} #5.1.0验签证书，key是base64的证书内容
+    @@verifyCerts = {} # 5.0.0验签证书，key是certId
+    @@verifyCerts5_1_0 = {} # 5.1.0验签证书，key是base64的证书内容
     @@middleCert = nil
     @@rootCert = nil
 
-    private
-    def CertUtil.initSignCert(certPath, certPwd)
+    def self.initSignCert(certPath, certPwd)
       if !certPath || !certPwd
-        LogUtil.info("signCertPath or signCertPwd is none, exit initSignCert")
+        LogUtil.info('signCertPath or signCertPwd is none, exit initSignCert')
         return
       end
-      LogUtil.info("读取签名证书……")
+      LogUtil.info('读取签名证书……')
       cert = Cert.new
       file = IO.binread(certPath)
       p12 = OpenSSL::PKCS12.new(file, certPwd)
@@ -39,89 +33,76 @@ module UnionPei
       cert.cert = p12.certificate
       cert.key = p12.key
       @@signCerts[certPath] = cert
-      LogUtil.info("签名证书读取成功，序列号：" + cert.certId)
-    end
-
-    def CertUtil.initEncryptCert(certPath=SDKConfig.instance.encryptCertPath)
-        if !certPath
-          LogUtil.info("encryptCertPath is none, exit initEncryptCert")
-          return
-        end
-        LogUtil.info("读取加密证书……")
-        cert = Cert.new
-        file = IO.binread(certPath)
-        x509Cert = OpenSSL::X509::Certificate.new(file)
-        cert.cert = x509Cert
-        cert.certId = x509Cert.serial.to_s
-        cert.key = x509Cert.public_key
-        @@encryptCert[certPath] = cert
-        LogUtil.info("加密证书读取成功，序列号：" + cert.certId)
+      LogUtil.info("签名证书读取成功，序列号：#{cert.certId}")
     end
 
-    def CertUtil.initRootCert()
-      if @@rootCert
+    def self.initEncryptCert(certPath = SDKConfig.instance.encryptCertPath)
+      unless certPath
+        LogUtil.info('encryptCertPath is none, exit initEncryptCert')
         return
       end
-      if !SDKConfig.instance.rootCertPath
-        LogUtil.info("rootCertPath is none, exit initRootCert")
+      LogUtil.info('读取加密证书……')
+      cert = Cert.new
+      file = IO.binread(certPath)
+      x509Cert = OpenSSL::X509::Certificate.new(file)
+      cert.cert = x509Cert
+      cert.certId = x509Cert.serial.to_s
+      cert.key = x509Cert.public_key
+      @@encryptCert[certPath] = cert
+      LogUtil.info("加密证书读取成功，序列号：#{cert.certId}")
+    end
+
+    def self.initRootCert
+      return if @@rootCert
+
+      unless SDKConfig.instance.rootCertPath
+        LogUtil.info('rootCertPath is none, exit initRootCert')
         return
       end
-      LogUtil.info("start initRootCert")
+      LogUtil.info('start initRootCert')
       file = IO.binread(SDKConfig.instance.rootCertPath)
       x509Cert = OpenSSL::X509::Certificate.new(file)
       @@rootCert = x509Cert
-      LogUtil.info("initRootCert succeed")
+      LogUtil.info('initRootCert succeed')
     end
 
-    def CertUtil.initMiddleCert()
-      if @@middleCert
-        return
-      end
-      if !SDKConfig.instance.middleCertPath
-        LogUtil.info("middleCertPath is none, exit initMiddleCert")
+    def self.initMiddleCert
+      return if @@middleCert
+
+      unless SDKConfig.instance.middleCertPath
+        LogUtil.info('middleCertPath is none, exit initMiddleCert')
         return
       end
-      LogUtil.info("start initMiddleCert")
+      LogUtil.info('start initMiddleCert')
       file = IO.binread(SDKConfig.instance.middleCertPath)
       x509Cert = OpenSSL::X509::Certificate.new(file)
       @@middleCert = x509Cert
-      LogUtil.info("initMiddleCert succeed")
+      LogUtil.info('initMiddleCert succeed')
     end
 
-    public
-    def CertUtil.getSignPriKey(certPath=SDKConfig.instance.signCertPath, certPwd=SDKConfig.instance.signCertPwd)
-      if !@@signCerts[certPath]
-        CertUtil.initSignCert(certPath, certPwd)
-      end
+    def self.getSignPriKey(certPath = SDKConfig.instance.signCertPath, certPwd = SDKConfig.instance.signCertPwd)
+      CertUtil.initSignCert(certPath, certPwd) unless @@signCerts[certPath]
       @@signCerts[certPath].key
     end
 
-    def CertUtil.getSignCertId(certPath=SDKConfig.instance.signCertPath, certPwd=SDKConfig.instance.signCertPwd)
-      if !@@signCerts[certPath]
-        CertUtil.initSignCert(certPath, certPwd)
-      end
+    def self.getSignCertId(certPath = SDKConfig.instance.signCertPath, certPwd = SDKConfig.instance.signCertPwd)
+      CertUtil.initSignCert(certPath, certPwd) unless @@signCerts[certPath]
       @@signCerts[certPath].certId
     end
 
-    def CertUtil.getEncryptKey(certPath=SDKConfig.instance.encryptCertPath)
-      if !@@encryptCert[certPath]
-        CertUtil.initEncryptCert(certPath)
-      end
+    def self.getEncryptKey(certPath = SDKConfig.instance.encryptCertPath)
+      CertUtil.initEncryptCert(certPath) unless @@encryptCert[certPath]
       @@encryptCert[certPath].key
     end
 
-    def CertUtil.getEncryptCertId(certPath=SDKConfig.instance.encryptCertPath)
-      if !@@encryptCert[certPath]
-        CertUtil.initEncryptCert(certPath)
-      end
+    def self.getEncryptCertId(certPath = SDKConfig.instance.encryptCertPath)
+      CertUtil.initEncryptCert(certPath) unless @@encryptCert[certPath]
       @@encryptCert[certPath].certId
     end
 
-    def CertUtil.verifyAndGetVerifyKey(certBase64String)
+    def self.verifyAndGetVerifyKey(certBase64String)
+      return @@verifyCerts5_1_0[certBase64String].key if @@verifyCerts5_1_0[certBase64String]
 
-      if @@verifyCerts5_1_0[certBase64String]
-        return @@verifyCerts5_1_0[certBase64String].key
-      end
       initMiddleCert
       initRootCert
 
@@ -137,31 +118,31 @@ module UnionPei
       store.add_cert(x509Cert)
       store.add_cert(@@middleCert)
       store.add_cert(@@rootCert)
-      if !store.verify(x509Cert)
-        LogUtil.error("validate signPubKeyCert by cert chain failed, error=" + store.error + ", error string=" + store.error_string)
+      unless store.verify(x509Cert)
+        LogUtil.error("validate signPubKeyCert by cert chain failed, error=#{store.error}, error string=#{store.error_string}")
         return nil
       end
 
       sSubject = x509Cert.subject.to_s
-      ss = sSubject.split("@")
+      ss = sSubject.split('@')
       if ss.length <= 2
-        LogUtil.error("error sSubject: " + sSubject)
+        LogUtil.error("error sSubject: #{sSubject}")
         return nil
       end
-      cn = ss[2];
+      cn = ss[2]
       if SDKConfig.instance.ifValidateCNName
         if UNIONPAY_CNNAME != cn
-          LogUtil.error("cer owner is not CUP:" + cn)
+          LogUtil.error("cer owner is not CUP:#{cn}")
           return nil
-        elsif UNIONPAY_CNNAME != cn and cn != "00040000:SIGN" #测试环境目前是00040000:SIGN
-          LogUtil.error("cer owner is not CUP:" + cn)
+        elsif (UNIONPAY_CNNAME != cn) && (cn != '00040000:SIGN') # 测试环境目前是00040000:SIGN
+          LogUtil.error("cer owner is not CUP:#{cn}")
           return nil
         end
       end
 
-      LogUtil.info("validate signPubKeyCert by cert succeed: " + certBase64String)
-      @@verifyCerts5_1_0[certBase64String] = cert;
-      return @@verifyCerts5_1_0[certBase64String].key
+      LogUtil.info("validate signPubKeyCert by cert succeed: #{certBase64String}")
+      @@verifyCerts5_1_0[certBase64String] = cert
+      @@verifyCerts5_1_0[certBase64String].key
 
       # 用bc的jar用中级证书验证可以单独验时间，然后再用中级证书验一下，但为了和谐统一，目前改store验证书链验证了。
       # if Time.new<x509Cert.not_before or Time.new>x509Cert.not_after
@@ -176,19 +157,17 @@ module UnionPei
       # end
     end
 
-    def CertUtil.getDecryptPriKey(certPath=SDKConfig.instance.signCertPath, certPwd=SDKConfig.instance.signCertPwd)
-      if !@@signCerts[certPath]
-        CertUtil.initSignCert(certPath, certPwd)
-      end
+    def self.getDecryptPriKey(certPath = SDKConfig.instance.signCertPath, certPwd = SDKConfig.instance.signCertPwd)
+      CertUtil.initSignCert(certPath, certPwd) unless @@signCerts[certPath]
       @@signCerts[certPath].key
     end
 
-    def CertUtil.resetEncryptCertPublicKey()
+    def self.resetEncryptCertPublicKey
       @@encryptCert = {}
       CertUtil.initEncryptCert
     end
 
-    def CertUtil.getX509Cert(strCert)
+    def self.getX509Cert(strCert)
       OpenSSL::X509::Certificate.new(strCert)
     end
   end

data/lib/unionpei/log_util.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'singleton'
 require 'logger'
@@ -8,74 +8,68 @@ require_relative 'sdk_config'
 
 module UnionPei
   class LogUtil
-
     @@logger = nil
 
     private_class_method :new
 
-    private
-
-    def LogUtil.getLogger
-      if !@@logger
-        if SDKConfig.instance.logFilePath.nil?
-          @@logger = Logger.new(STDOUT)
-        else
-          @@logger = Logger.new(SDKConfig.instance.logFilePath)
-        end
+    def self.getLogger
+      unless @@logger
+        @@logger = if SDKConfig.instance.logFilePath.nil?
+                     Logger.new($stdout)
+                   else
+                     Logger.new(SDKConfig.instance.logFilePath)
+                   end
         @@logger.datetime_format = '%Y-%m-%d %H:%M:%S'
         @@logger.formatter = proc do |severity, datetime, progname, msg|
           "#{datetime} [#{severity}] #{progname}: #{msg}\n"
         end
         @@logger.level = case SDKConfig.instance.logLevel.upcase
-                         when 'INFO' then
+                         when 'INFO'
                            Logger::INFO
-                         when 'DEBUG' then
+                         when 'DEBUG'
                            Logger::DEBUG
-                         when 'WARN' then
+                         when 'WARN'
                            Logger::WARN
-                         when 'ERROR' then
+                         when 'ERROR'
                            Logger::ERROR
-                         when 'FATAL' then
+                         when 'FATAL'
                            Logger::FATAL
                          else
                            Logger::UNKNOWN
-                       end
+                         end
       end
       p = LogUtil.parse_caller(caller(0)[2])
-      @@logger.progname = p[0].to_s + ":" + p[1].to_s
+      @@logger.progname = "#{p[0]}:#{p[1]}"
       @@logger
     end
 
-    def LogUtil.parse_caller(at)
+    def self.parse_caller(at)
       if /^(.+?):(\d+)(?::in `(.*)')?/ =~ at
-        file = $1
-        line = $2.to_i
-        method = $3
+        file = Regexp.last_match(1)
+        line = Regexp.last_match(2).to_i
+        method = Regexp.last_match(3)
         [file, line, method]
       end
     end
 
-    public
-
-    def LogUtil.info(msg)
+    def self.info(msg)
       LogUtil.getLogger.info(msg)
     end
 
-    def LogUtil.debug(msg)
+    def self.debug(msg)
       LogUtil.getLogger.debug(msg)
     end
 
-    def LogUtil.warn(msg)
+    def self.warn(msg)
       LogUtil.getLogger.warn(msg)
     end
 
-    def LogUtil.error(msg)
+    def self.error(msg)
       LogUtil.getLogger.error(msg)
     end
 
-    def LogUtil.fatal(msg)
+    def self.fatal(msg)
       LogUtil.getLogger.fatal(msg)
     end
-
   end
 end