unionpei 1.0.0 → 1.3.1

data/lib/unionpei/log_util.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'singleton'
 require 'logger'
@@ -8,75 +8,68 @@ require_relative 'sdk_config'
 
 module UnionPei
   class LogUtil
-
     @@logger = nil
 
     private_class_method :new
 
-    private
-
-    def LogUtil.getLogger
-      if !@@logger
-        puts "init LogUtil"
-        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

data/lib/unionpei/payment.rb

@@ -1,67 +1,97 @@
-#encoding: utf-8
+# frozen_string_literal: true
 
-require "date"
+require 'date'
 require_relative 'sdk_config'
 require_relative 'acp_service'
 module UnionPei
   class Payment
     class << self
-      @@default_b2c_req = {
-        "version"=>UnionPei::SDKConfig.instance.version,
-        "encoding"=>UnionPei::SDKConfig.instance.encoding,
-        "signMethod"=>UnionPei::SDKConfig.instance.signMethod,
-        "frontUrl"=>UnionPei::SDKConfig.instance.frontUrl,
-        "backUrl"=>UnionPei::SDKConfig.instance.backUrl,
-        "txnType"=>"01",
-        "txnSubType"=>"01",
-        "bizType"=>"000201", # 000201 是b2c / 000202 是 b2b
-        "channelType"=>"07",
-        "currencyCode"=>"156",
-        "txnAmt"=>"881000",
-        "merId"=>"777290058189920",
-        "orderId"=>DateTime.parse(Time.now.to_s).strftime("%Y%m%d%H%M%S").to_s,
-        "txnTime"=>DateTime.parse(Time.now.to_s).strftime("%Y%m%d%H%M%S").to_s,
-        "accessType"=>"0"
-      }
+      def default_b2c_req
+        {
+          'version' => UnionPei::SDKConfig.instance.version,
+          'encoding' => UnionPei::SDKConfig.instance.encoding,
+          'signMethod' => UnionPei::SDKConfig.instance.signMethod,
+          'frontUrl' => UnionPei::SDKConfig.instance.frontUrl,
+          'backUrl' => UnionPei::SDKConfig.instance.backUrl,
+          'txnType' => '01',
+          'txnSubType' => '01',
+          'bizType' => '000201', # 000201 是b2c / 000202 是 b2b
+          'channelType' => '07',
+          'currencyCode' => '156',
+          'txnAmt' => '881000',
+          'merId' => '777290058189920',
+          'orderId' => DateTime.parse(Time.now.to_s).strftime('%Y%m%d%H%M%S').to_s,
+          'txnTime' => DateTime.parse(Time.now.to_s).strftime('%Y%m%d%H%M%S').to_s,
+          'accessType' => '0'
+        }
+      end
 
       # 【默认大于配置】哲学
-      def b2c(req=@@default_b2c_req)
-        req = @@default_b2c_req.merge(req)
-        UnionPei::AcpService.sign(req)
+      def b2c(req = {})
+        req = default_b2c_req.merge(req)
+        signature = UnionPei::AcpService.sign(req)
+        req['signature'] = signature
         url = UnionPei::SDKConfig.instance.frontTransUrl
         UnionPei::AcpService.createAutoFormHtml(req, url)
       end
 
-      @@default_b2b_req = {
-        "version"=>UnionPei::SDKConfig.instance.version,
-        "encoding"=>UnionPei::SDKConfig.instance.encoding,
-        "signMethod"=>UnionPei::SDKConfig.instance.signMethod,
-        "frontUrl"=>UnionPei::SDKConfig.instance.frontUrl,
-        "backUrl"=>UnionPei::SDKConfig.instance.backUrl,
-        "txnType"=>"01",
-        "txnSubType"=>"01",
-        "bizType"=>"000202", # 000201 是b2c / 000202 是 b2b,
-        "channelType"=>"07",
-        "currencyCode"=>"156",
-        "txnAmt"=>"881000",
-        "merId"=>"777290058189920",
-        "orderId"=>DateTime.parse(Time.now.to_s).strftime("%Y%m%d%H%M%S").to_s,
-        "txnTime"=>DateTime.parse(Time.now.to_s).strftime("%Y%m%d%H%M%S").to_s,
-        "accessType"=>"0",
-        "payTimeout"=>DateTime.parse((Time.now + 15 * 60 * 1000).to_s).strftime("%Y%m%d%H%M%S").to_s,
-        "bizScene"=> "110001",
-        "payeeAcctNm"=> "xx商户",
-        "payeeAcctNo"=> "12345678",
-        "payeeBankName"=> "xx行"
-      }
+      def default_b2b_req
+        {
+          'version' => UnionPei::SDKConfig.instance.version,
+          'encoding' => UnionPei::SDKConfig.instance.encoding,
+          'signMethod' => UnionPei::SDKConfig.instance.signMethod,
+          'frontUrl' => UnionPei::SDKConfig.instance.frontUrl,
+          'backUrl' => UnionPei::SDKConfig.instance.backUrl,
+          'txnType' => '01',
+          'txnSubType' => '01',
+          'bizType' => '000202', # 000201 是b2c / 000202 是 b2b,
+          'channelType' => '07',
+          'currencyCode' => '156',
+          'txnAmt' => '881000',
+          'merId' => '777290058189920',
+          'orderId' => DateTime.parse(Time.now.to_s).strftime('%Y%m%d%H%M%S').to_s,
+          'txnTime' => DateTime.parse(Time.now.to_s).strftime('%Y%m%d%H%M%S').to_s,
+          'accessType' => '0',
+          'payTimeout' => DateTime.parse((Time.now + 15 * 60 * 1000).to_s).strftime('%Y%m%d%H%M%S').to_s,
+          'bizScene' => '110001',
+          'payeeAcctNm' => 'xx商户',
+          'payeeAcctNo' => '12345678',
+          'payeeBankName' => 'xx行'
+        }
+      end
 
-      def b2b(req=@@default_b2b_req)
-        req = @@default_b2b_req.merge(req)
-        UnionPei::AcpService.sign(req)
+      def b2b(req = {})
+        req = default_b2b_req.merge(req)
+        signature = UnionPei::AcpService.sign(req)
+        req['signature'] = signature
         url = UnionPei::SDKConfig.instance.frontTransUrl
         UnionPei::AcpService.createAutoFormHtml(req, url)
       end
+
+      def default_trans_req
+        {
+          'version' => UnionPei::SDKConfig.instance.version,
+          'encoding' => UnionPei::SDKConfig.instance.encoding,
+          'bizType' => '000000',
+          'txnTime' => DateTime.parse(Time.now.to_s).strftime('%Y%m%d%H%M%S').to_s,
+          'txnType' => '00',
+          'txnSubType' => '00',
+          'accessType' => '0',
+          'signMethod' => UnionPei::SDKConfig.instance.signMethod,
+          'merId' => '777290058189920',
+          'orderId' => DateTime.parse(Time.now.to_s).strftime('%Y%m%d%H%M%S').to_s
+        }
+      end
+
+      # query single transaction info
+      # doc https://open.unionpay.com/tjweb/acproduct/APIList?acpAPIId=757&apiservId=448&version=V2.2&bussType=0
+      def query_trans(req = {})
+        req = default_trans_req.merge(req)
+        signature = UnionPei::AcpService.sign(req)
+        req['signature'] = signature
+        url = UnionPei::SDKConfig.instance.singleQueryUrl
+        UnionPei::AcpService.post(req, url)
+      end
     end
   end
 end
-

data/lib/unionpei/sdk_config.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'iniparse'
 require 'singleton'
@@ -14,63 +14,61 @@ module UnionPei
                 :encoding, :secureKey, :logFilePath, :logLevel
 
     def initialize
-
-      path = File.dirname(__FILE__)
-      ini = IniParse.parse(File.read("#{path}/acp_sdk.ini").force_encoding("UTF-8"))
-      puts 'load config: ' + "#{path}/acp_sdk.ini"
-
-      @frontTransUrl = ini["acpsdk"]["acpsdk.frontTransUrl"]
-      @singleQueryUrl = ini["acpsdk"]["acpsdk.singleQueryUrl"]
-      @backTransUrl = ini["acpsdk"]["acpsdk.backTransUrl"]
-      @batchTransUrl = ini["acpsdk"]["acpsdk.batchTransUrl"]
-      @fileTransUrl = ini["acpsdk"]["acpsdk.fileTransUrl"]
-      @appTransUrl = ini["acpsdk"]["acpsdk.appTransUrl"]
-      @cardTransUrl = ini["acpsdk"]["acpsdk.cardTransUrl"]
-
-      @jfFrontTransUrl = ini["acpsdk"]["acpsdk.jfFrontTransUrl"]
-      @jfSingleQueryUrl = ini["acpsdk"]["acpsdk.jfSingleQueryUrl"]
-      @jfBackTransUrl = ini["acpsdk"]["acpsdk.jfBackTransUrl"]
-      @jfCardTransUrl = ini["acpsdk"]["acpsdk.jfCardTransUrl"]
-      @jfAppTransUrl = ini["acpsdk"]["acpsdk.jfAppTransUrl"]
-
-      @qrcBackTransUrl = ini["acpsdk"]["acpsdk.qrcBackTransUrl"]
-      @qrcB2cIssBackTransUrl = ini["acpsdk"]["acpsdk.qrcB2cIssBackTransUrl"]
-      @qrcB2cMerBackTransUrl = ini["acpsdk"]["acpsdk.qrcB2cMerBackTransUrl"]
-
-      @signMethod = ini["acpsdk"]["acpsdk.signMethod"]
-      @signMethod = @signMethod.to_s if !@signMethod.nil?
-      @version = ini["acpsdk"]["acpsdk.version"]
-      @version = "5.0.0" if @version.nil?
-
-      @ifValidateCNName = ini["acpsdk"]["acpsdk.ifValidateCNName"]
+      ini = parse_acpsdk
+      acpsdk = ini['acpsdk']
+      @frontTransUrl = acpsdk['acpsdk.frontTransUrl']
+      @singleQueryUrl = acpsdk['acpsdk.singleQueryUrl']
+      @backTransUrl = acpsdk['acpsdk.backTransUrl']
+      @batchTransUrl = acpsdk['acpsdk.batchTransUrl']
+      @fileTransUrl = acpsdk['acpsdk.fileTransUrl']
+      @appTransUrl = acpsdk['acpsdk.appTransUrl']
+      @cardTransUrl = acpsdk['acpsdk.cardTransUrl']
+
+      @jfFrontTransUrl = acpsdk['acpsdk.jfFrontTransUrl']
+      @jfSingleQueryUrl = acpsdk['acpsdk.jfSingleQueryUrl']
+      @jfBackTransUrl = acpsdk['acpsdk.jfBackTransUrl']
+      @jfCardTransUrl = acpsdk['acpsdk.jfCardTransUrl']
+      @jfAppTransUrl = acpsdk['acpsdk.jfAppTransUrl']
+
+      @qrcBackTransUrl = acpsdk['acpsdk.qrcBackTransUrl']
+      @qrcB2cIssBackTransUrl = acpsdk['acpsdk.qrcB2cIssBackTransUrl']
+      @qrcB2cMerBackTransUrl = acpsdk['acpsdk.qrcB2cMerBackTransUrl']
+
+      @signMethod = acpsdk['acpsdk.signMethod']
+      @signMethod = @signMethod.to_s unless @signMethod.nil?
+      @version = acpsdk['acpsdk.version']
+      @version = '5.0.0' if @version.nil?
+
+      @ifValidateCNName = acpsdk['acpsdk.ifValidateCNName']
       @ifValidateCNName = true if @ifValidateCNName.nil?
-      @ifValidateRemoteCert = ini["acpsdk"]["acpsdk.ifValidateRemoteCert"]
+      @ifValidateRemoteCert = acpsdk['acpsdk.ifValidateRemoteCert']
       @ifValidateRemoteCert = false if @ifValidateRemoteCert.nil?
 
-      @signCertPath = ini["acpsdk"]["acpsdk.signCert.path"]
-      @signCertPwd = ini["acpsdk"]["acpsdk.signCert.pwd"]
-      @signCertPwd = @signCertPwd.to_s if !@signCertPwd.nil?
+      @signCertPath = acpsdk['acpsdk.signCert.path']
+      @signCertPwd = acpsdk['acpsdk.signCert.pwd']
+      @signCertPwd = @signCertPwd.to_s unless @signCertPwd.nil?
 
-      @validateCertDir = ini["acpsdk"]["acpsdk.validateCert.dir"]
-      @encryptCertPath = ini["acpsdk"]["acpsdk.encryptCert.path"]
-      @rootCertPath = ini["acpsdk"]["acpsdk.rootCert.path"]
-      @middleCertPath = ini["acpsdk"]["acpsdk.middleCert.path"]
+      @validateCertDir = acpsdk['acpsdk.validateCert.dir']
+      @encryptCertPath = acpsdk['acpsdk.encryptCert.path']
+      @rootCertPath = acpsdk['acpsdk.rootCert.path']
+      @middleCertPath = acpsdk['acpsdk.middleCert.path']
 
-      @frontUrl = ini["acpsdk"]["acpsdk.frontUrl"]
-      @backUrl = ini["acpsdk"]["acpsdk.backUrl"]
+      @frontUrl = acpsdk['acpsdk.frontUrl']
+      @backUrl = acpsdk['acpsdk.backUrl']
 
-      @encoding = ini["acpsdk"]["acpsdk.encoding"]
-      @secureKey = ini["acpsdk"]["acpsdk.secureKey"]
-      @secureKey = @secureKey.to_s if !@secureKey.nil?
+      @encoding = acpsdk['acpsdk.encoding']
+      @secureKey = acpsdk['acpsdk.secureKey']
+      @secureKey = @secureKey.to_s unless @secureKey.nil?
 
-      @logFilePath = ini["acpsdk"]["acpsdk.log.file.path"]
-      @logLevel = ini["acpsdk"]["acpsdk.log.level"]
+      @logFilePath = acpsdk['acpsdk.log.file.path']
+      @logLevel = acpsdk['acpsdk.log.level']
 
       @encoding = 'UTF-8'
+    end
 
+    def parse_acpsdk
+      acp_sdk_config_path = ::UnionPei.configuration.acp_sdk_config_path
+      IniParse.parse(File.read(acp_sdk_config_path).force_encoding('UTF-8'))
     end
   end
 end
-
-
-