wx_pay 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7716b9c31fb5cbf24db64ca0aad7c228ab1dc1f
-  data.tar.gz: ec0a6c208012f09829ff8e2b37238a25b5c07659
+  metadata.gz: dda7cad282f587b4eb9db5afb01d0f55e9b6ae8f
+  data.tar.gz: a8bf70ef43b11678faf05d70496b962ed9df262a
 SHA512:
-  metadata.gz: 4edecc4552ee556a99620920fb3126d09f7ae3d478c7544e6981827375edd35ed8c452037ee9616dcd5bcede35626f434f3e0e41a3e416dda1e95583b2794e94
-  data.tar.gz: 4ac03cae8b014baadad894fe6ef26f528e1f27c41ec12d35414a787f4471fbcb04436d2736616e191d38c5875595bf30f682eb91d927276fe3e1fae2bbb497b6
+  metadata.gz: 9339a3e811c8a4358766f4e79917f92c000718617de351e116f751d92834144f4b9d363b82a72ca0e92b218cb905687dede973254597f8acd5449c5317ef63e0
+  data.tar.gz: 7808f6392ddc96ce95874b1de710121a866e631032ef8bb8b2abade3a0e1c936275eb46d9623c7d8ad404c8e0f9ba875e45171cbb7b7c65976093c76e50fae94

data/lib/wx_pay.rb

@@ -6,9 +6,11 @@ require 'openssl'
 module WxPay
   @extra_rest_client_options = {}
   @debug_mode = true
+  @sandbox_mode = false
 
   class<< self
     attr_accessor :appid, :mch_id, :key, :appsecret, :extra_rest_client_options, :debug_mode
+    attr_accessor :sandbox_mode, :sandbox_key, :sandbox_mch_id
     attr_reader :apiclient_cert, :apiclient_key
 
     def set_apiclient_by_pkcs12(str, pass)
@@ -30,5 +32,9 @@ module WxPay
     def debug_mode?
       @debug_mode
     end
+
+    def sandbox_mode?
+      @sandbox_mode
+    end
   end
 end

data/lib/wx_pay/service.rb

@@ -6,7 +6,8 @@ require 'active_support/core_ext/hash/conversions'
 
 module WxPay
   module Service
-    GATEWAY_URL = 'https://api.mch.weixin.qq.com'
+    GATEWAY_URL = 'https://api.mch.weixin.qq.com'.freeze
+    SANDBOX_GATEWAY_URL = 'https://api.mch.weixin.qq.com/sandboxnew'.freeze
 
     def self.generate_authorize_url(redirect_uri, state = nil)
       state ||= SecureRandom.hex 16
@@ -25,6 +26,16 @@ module WxPay
       ), quirks_mode: true)
     end
 
+    def self.get_sandbox_signkey
+      params = {
+        mch_id: WxPay.mch_id,
+        nonce_str: SecureRandom.uuid.tr('-', '')
+      }
+      r = WxPay::Result.new(Hash.from_xml(invoke_remote("/pay/getsignkey", xmlify_payload(params))))
+      yield r if block_given?
+      r
+    end
+
     def self.authenticate_from_weapp(js_code, options = {})
       options = WxPay.extra_rest_client_options.merge(options)
       url = "https://api.weixin.qq.com/sns/jscode2session?appid=#{WxPay.appid}&secret=#{WxPay.appsecret}&js_code=#{js_code}&grant_type=authorization_code"
@@ -36,7 +47,7 @@ module WxPay
         }.merge(options)
       ), quirks_mode: true)
     end
-    
+
     INVOKE_UNIFIEDORDER_REQUIRED_FIELDS = [:body, :out_trade_no, :total_fee, :spbill_create_ip, :notify_url, :trade_type]
     def self.invoke_unifiedorder(params, options = {})
       params = {
@@ -48,7 +59,7 @@ module WxPay
 
       check_required_options(params, INVOKE_UNIFIEDORDER_REQUIRED_FIELDS)
 
-      r = WxPay::Result.new(Hash.from_xml(invoke_remote("#{GATEWAY_URL}/pay/unifiedorder", make_payload(params), options)))
+      r = WxPay::Result.new(Hash.from_xml(invoke_remote("/pay/unifiedorder", make_payload(params), options)))
 
       yield r if block_given?
 
@@ -66,7 +77,7 @@ module WxPay
 
       check_required_options(params, INVOKE_CLOSEORDER_REQUIRED_FIELDS)
 
-      r = WxPay::Result.new(Hash.from_xml(invoke_remote("#{GATEWAY_URL}/pay/closeorder", make_payload(params), options)))
+      r = WxPay::Result.new(Hash.from_xml(invoke_remote("/pay/closeorder", make_payload(params), options)))
 
       yield r if block_given?
 
@@ -127,7 +138,7 @@ module WxPay
         verify_ssl: OpenSSL::SSL::VERIFY_NONE
       }.merge(options)
 
-      r = WxPay::Result.new(Hash.from_xml(invoke_remote("#{GATEWAY_URL}/secapi/pay/refund", make_payload(params), options)))
+      r = WxPay::Result.new(Hash.from_xml(invoke_remote("/secapi/pay/refund", make_payload(params), options)))
 
       yield r if block_given?
 
@@ -144,7 +155,7 @@ module WxPay
 
       check_required_options(params, ORDER_QUERY_REQUIRED_FIELDS)
 
-      r = WxPay::Result.new(Hash.from_xml(invoke_remote("#{GATEWAY_URL}/pay/refundquery", make_payload(params), options)))
+      r = WxPay::Result.new(Hash.from_xml(invoke_remote("/pay/refundquery", make_payload(params), options)))
 
       yield r if block_given?
 
@@ -167,7 +178,7 @@ module WxPay
         verify_ssl: OpenSSL::SSL::VERIFY_NONE
       }.merge(options)
 
-      r = WxPay::Result.new(Hash.from_xml(invoke_remote("#{GATEWAY_URL}/mmpaymkttransfers/promotion/transfers", make_payload(params), options)))
+      r = WxPay::Result.new(Hash.from_xml(invoke_remote("/mmpaymkttransfers/promotion/transfers", make_payload(params), options)))
 
       yield r if block_given?
 
@@ -190,7 +201,7 @@ module WxPay
         verify_ssl: OpenSSL::SSL::VERIFY_NONE
       }.merge(options)
 
-      r = WxPay::Result.new(Hash.from_xml(invoke_remote("#{GATEWAY_URL}/mmpaymkttransfers/gettransferinfo", make_payload(params), options)))
+      r = WxPay::Result.new(Hash.from_xml(invoke_remote("/mmpaymkttransfers/gettransferinfo", make_payload(params), options)))
 
       yield r if block_given?
 
@@ -213,7 +224,7 @@ module WxPay
         verify_ssl: OpenSSL::SSL::VERIFY_NONE
       }.merge(options)
 
-      r = WxPay::Result.new(Hash.from_xml(invoke_remote("#{GATEWAY_URL}/secapi/pay/reverse", make_payload(params), options)))
+      r = WxPay::Result.new(Hash.from_xml(invoke_remote("/secapi/pay/reverse", make_payload(params), options)))
 
       yield r if block_given?
 
@@ -236,7 +247,7 @@ module WxPay
         verify_ssl: OpenSSL::SSL::VERIFY_NONE
       }.merge(options)
 
-      r = WxPay::Result.new(Hash.from_xml(invoke_remote("#{GATEWAY_URL}/pay/micropay", make_payload(params), options)))
+      r = WxPay::Result.new(Hash.from_xml(invoke_remote("/pay/micropay", make_payload(params), options)))
 
       yield r if block_given?
 
@@ -252,7 +263,7 @@ module WxPay
       }.merge(params)
 
 
-      r = WxPay::Result.new(Hash.from_xml(invoke_remote("#{GATEWAY_URL}/pay/orderquery", make_payload(params), options)))
+      r = WxPay::Result.new(Hash.from_xml(invoke_remote("/pay/orderquery", make_payload(params), options)))
       check_required_options(params, ORDER_QUERY_REQUIRED_FIELDS)
 
       yield r if block_given?
@@ -270,7 +281,7 @@ module WxPay
 
       check_required_options(params, DOWNLOAD_BILL_REQUIRED_FIELDS)
 
-      r = invoke_remote("#{GATEWAY_URL}/pay/downloadbill", make_payload(params), options)
+      r = invoke_remote("/pay/downloadbill", make_payload(params), options)
 
       yield r if block_given?
 
@@ -292,7 +303,7 @@ module WxPay
         verify_ssl: OpenSSL::SSL::VERIFY_NONE
       }.merge(options)
 
-      r = WxPay::Result.new(Hash.from_xml(invoke_remote("#{GATEWAY_URL}/mmpaymkttransfers/sendgroupredpack", make_payload(params), options)))
+      r = WxPay::Result.new(Hash.from_xml(invoke_remote("/mmpaymkttransfers/sendgroupredpack", make_payload(params), options)))
 
       yield r if block_given?
 
@@ -314,7 +325,7 @@ module WxPay
         verify_ssl: OpenSSL::SSL::VERIFY_NONE
       }.merge(options)
 
-      r = WxPay::Result.new(Hash.from_xml(invoke_remote("#{GATEWAY_URL}/mmpaymkttransfers/sendredpack", make_payload(params), options)))
+      r = WxPay::Result.new(Hash.from_xml(invoke_remote("/mmpaymkttransfers/sendredpack", make_payload(params), options)))
 
       yield r if block_given?
 
@@ -324,6 +335,11 @@ module WxPay
     class << self
       private
 
+      def get_gateway_url
+        return SANDBOX_GATEWAY_URL if WxPay.sandbox_mode?
+        GATEWAY_URL
+      end
+
       def check_required_options(options, names)
         return unless WxPay.debug_mode?
         names.each do |name|
@@ -331,19 +347,36 @@ module WxPay
         end
       end
 
-      def make_payload(params)
+      def xmlify_payload(params)
         sign = WxPay::Sign.generate(params)
         params.delete(:key) if params[:key]
         "<xml>#{params.map { |k, v| "<#{k}>#{v}</#{k}>" }.join}<sign>#{sign}</sign></xml>"
       end
 
+      def make_payload(params)
+        if WxPay.sandbox_mode?
+          r = get_sandbox_signkey
+          if r['return_code'] == WxPay::Result::SUCCESS_FLAG
+            params = params.merge({
+              :mch_id => r['mch_id'] || WxPay.mch_id,
+              :key => r['sandbox_signkey']
+            })
+            WxPay.sandbox_key = r['sandbox_signkey']
+            WxPay.sandbox_mch_id = r['mch_id']
+          else
+            warn("WxPay Warn: fetch sandbox sign key failed #{r['return_msg']}")
+          end
+        end
+        xmlify_payload(params)
+      end
+
       def invoke_remote(url, payload, options = {})
         options = WxPay.extra_rest_client_options.merge(options)
 
         RestClient::Request.execute(
           {
             method: :post,
-            url: url,
+            url: "#{get_gateway_url}#{url}",
             payload: payload,
             headers: { content_type: 'application/xml' }
           }.merge(options)

data/lib/wx_pay/sign.rb

@@ -12,8 +12,13 @@ module WxPay
       Digest::MD5.hexdigest("#{query}&key=#{key || WxPay.key}").upcase
     end
 
-    def self.verify?(params)
+    def self.verify?(params, options = {})
       params = params.dup
+      params = params.merge(options)
+      if WxPay.sandbox_mode?
+        params = params.merge({:mch_id => WxPay.sandbox_mch_id, :key => WxPay.sandbox_key})
+      end
+
       sign = params.delete('sign') || params.delete(:sign)
 
       generate(params) == sign

data/lib/wx_pay/version.rb

@@ -1,3 +1,3 @@
 module WxPay
-  VERSION = '0.15.0'
+  VERSION = '0.16.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wx_pay
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Jasl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2017-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: An unofficial simple wechat pay gem