yl_pay 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e554827d1ea1d0ed21937e0807e456a1d5b2f2ae
-  data.tar.gz: 9ca88d7a339f19b0b3942c1efddeca06ad07145c
+  metadata.gz: '095acc4705d19ce1dde710d46997e44bce982309'
+  data.tar.gz: 5ae7cfe1f7f1cd698a6a7ce93f85cf22aaad9714
 SHA512:
-  metadata.gz: 1e3a88460f38e7fceb9107386b5c85014ef843f479e45240385b6d8c527407fa8066ac5ada6c21a3f711176bdb203d65cf751c3c9c8baf2905dd769998c2eabf
-  data.tar.gz: '0896d2d318d0a0295026c0937fb9b3f16e81420f7a8a962f8c35f59ff296a8a4f46f46d90ac71bee6c7eac136b72c0fd5e232f4d5e26ceb57a8968c4b38a09c1'
+  metadata.gz: 206256b29d9175a0472edf336c8e03cf94fce73329574ae77df7bb8cc777c08a0e6c303d33734523eb00292b059beb09c34df69d7107fc873a9c94291e050da5
+  data.tar.gz: a586e9828b54d33be0b327976be7694861fb860db51a8acad36a0b8d1058f3c1305605220f19207cc3e26d57f5f432a68ca2a276deddf27abc5111d9a793b1cc

data/lib/yl_pay/service.rb

@@ -32,7 +32,7 @@ module YlPay
     def self.check_notify_sign(params)
       sign = params.delete('Sign')
       notify_sign = YlPay::Utils.notify_sign(params)
-      Rails.logger.info "NOTIFY_SIGN: #{notify_sign}&Sign=#{sign}"
+      # Rails.logger.info "NOTIFY_SIGN: #{notify_sign}&Sign=#{sign}"
       YlPay::Sign.verify?(notify_sign, sign)
     end
 
@@ -66,9 +66,10 @@ module YlPay
         "TradeCode=#{trade_code}&" + YlPay::Utils.uri_params(params) + "&Sign=#{rsa_sign}"
       end
 
-      def invoke_remote(url, payload, options = {})
+      def invoke_remote(url, payload)
         remote_url = url + "?#{payload}"
-        Rails.logger.info "REMOTE_URL: #{remote_url}"
+        p remote_url
+        # Rails.logger.info "REMOTE_URL: #{remote_url}"
         Faraday.get(remote_url).body
       end
 

data/lib/yl_pay/utils.rb

@@ -1,44 +1,82 @@
 module YlPay
+  require 'uri'
   require 'base64'
+  require 'active_support/core_ext/string'
 
   class Utils
+    PARAM_SIGN_FIELD = %w(version merchant_id merch_order_id amount order_desc trade_time exp_time notify_url
+                          return_url ext_data misc_data notify_flag client_ip)
+    NOTIFY_SIGN_FIELD = %w(version merchant_id merch_order_id amount ext_data order_id status pay_time settle_date)
+    BACK_SIGN_FIELD = %w(version merchant_id merch_order_id amount trade_time order_id verify_time)
+
     def self.param_sign(params)
-      "Version=#{params[:version]}&MerchantId=#{params[:merchant_id]}&MerchOrderId=#{params[:merch_order_id]}&"\
-      "Amount=#{params[:amount]}&OrderDesc=#{params[:order_desc]}&TradeTime=#{params[:trade_time]}&ExpTime=#{params[:exp_time]}&"\
-      "NotifyUrl=#{params[:notify_url]}&ReturnUrl=#{params[:return_url]}&ExtData=#{params[:ext_data]}&"\
-      "MiscData=#{params[:misc_data]}&NotifyFlag=#{params[:notify_flag]}&ClientIp=#{params[:client_ip]}"
+      hash_params = params_sign_to_hash(params, PARAM_SIGN_FIELD)
+      sign_uri hash_params
     end
 
     def self.back_sign(params)
-      "Version=#{params['Version']}&MerchantId=#{params['MerchantId']}&MerchOrderId=#{params['MerchOrderId']}&"\
-      "Amount=#{params['Amount']}&TradeTime=#{params['TradeTime']}&OrderId=#{params['OrderId']}&VerifyTime=#{params['VerifyTime']}"
+      hash_params = params_to_hash(params, BACK_SIGN_FIELD)
+      sign_uri hash_params
     end
 
     def self.notify_sign(params)
-      "Version=#{params['Version']}&MerchantId=#{params['MerchantId']}&MerchOrderId=#{params['MerchOrderId']}&"\
-      "Amount=#{params['Amount']}&ExtData=#{params['ExtData']}&OrderId=#{params['OrderId']}&Status=#{params['Status']}&"\
-      "PayTime=#{params['PayTime']}&SettleDate=#{params['SettleDate']}"
+      hash_params = params_to_hash(params, NOTIFY_SIGN_FIELD)
+      sign_uri hash_params
+    end
+
+    def self.sign_uri(hash)
+      string_to_uri(stringify_keys(hash))
     end
 
-    # 提交参数中包含中文的需要做base64转码
+    # 提交参数中包含中文的需要做base64转码, 对url进行urlencode处理
     def self.uri_params(params)
-      container = [:order_desc, :ext_data, :misc_data]
-      new_params = params.collect do |param|
-        if container.include? param[0]
-          param[1] = Base64.strict_encode64(param[1])
-        end
-        param
-      end
+      new_params = param_base64_field(params)
       new_params = Hash[new_params]
       new_params[:notify_url] = CGI.escape(new_params[:notify_url]) if new_params.key?(:notify_url)
       new_params[:return_url] = CGI.escape(new_params[:return_url]) if new_params.key?(:return_url)
       param_sign new_params
     end
+
+    PARAM_BASE64_FIELD = [:order_desc, :ext_data, :misc_data]
+    def self.param_base64_field(params)
+      params.collect do |param|
+        if PARAM_BASE64_FIELD.include? param[0]
+          param[1] = Base64.strict_encode64(param[1])
+        end
+        param
+      end
+    end
+
+    # hash的键需要大写, 里面获取值参数也是大写 params['A': 'b']
+    def self.params_to_hash(params, target_params)
+      target_params.collect!(&:camelize)
+      hash = {}
+      target_params.collect do |k|
+        hash.merge!("#{k}": params[k])
+      end
+      hash
+    end
+
+    # 针对param_sign hash的键大写，里面获取值参数小写 params[:A: 'b']
+    def self.params_sign_to_hash(params, target_params)
+      hash = {}
+      target_params.collect do |k|
+        k1 = k.camelize
+        hash.merge!("#{k1}": params[k.to_sym])
+      end
+      hash
+    end
+
+    def self.string_to_uri(params)
+      params.map{|entry| entry * '='} * '&'
+    end
+
+    def self.stringify_keys(hash)
+      new_hash = {}
+      hash.each do |key, value|
+        new_hash[(key.to_s rescue key) || key] = value.to_s
+      end
+      new_hash
+    end
   end
 end
-
-# def self.param_sign_auto(params)
-# return_str = ''
-# params.each { |k, v| return_str << "#{k.to_s.split('_').collect(&:capitalize).join}=#{v}&" }
-# return_str.split.join(' ').chop
-# end

data/lib/yl_pay/version.rb

@@ -1,3 +1,3 @@
 module YlPay
-  VERSION = "1.0.9"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yl_pay
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors:
 - Ricky
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-14 00:00:00.000000000 Z
+date: 2017-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler