wx_pay 0.16.1 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f85be563ed14a79b9df0c89c73f238233e83c0eb
-  data.tar.gz: 5ee268829b56d4b6fb7a0d23f7dec8705537b684
+SHA256:
+  metadata.gz: 161782a3a1d52339e8ff2e0f3bfc408071fca7452e0390832e78af0294154f19
+  data.tar.gz: b8251fb2072d5dda662e27e7f2e27d88a785f5cb0737dca9c1f955817ad1f07c
 SHA512:
-  metadata.gz: ba30f0f28856fc9ccd4f02029ca17f956959412055853ed5cdde818108440642fac8a4cb891bc80af242abf954e9829711c396dbe899029b2e6da3bd972bd1da
-  data.tar.gz: d63ba4e6dfd25ed38f80cb3257a5f8c9960400597179f1003aae9a916f37e5d9ce4ec0a5567f9302769d55c548751d025c431987566dcfaa7a0e18d93cc6ad4b
+  metadata.gz: f14c5ff39a759e960b3578f68a94a6120cef8b69fc9ed5349b40182f493b733999064fdb0105e1f525283146fbf3ea96e90381b38d1f2fbf5eca018dd3a88d26
+  data.tar.gz: aad7882af734bafc4e3bca5a91f49dd1442726a42ca31e041cdc6b005b9d4d7bde6e9feba91b13b37ce0532692b17a8419feb64e03bff3239ead289694a7d97d

data/lib/wx_pay/service.rb

@@ -8,6 +8,7 @@ module WxPay
   module Service
     GATEWAY_URL = 'https://api.mch.weixin.qq.com'.freeze
     SANDBOX_GATEWAY_URL = 'https://api.mch.weixin.qq.com/sandboxnew'.freeze
+    FRAUD_GATEWAY_URL = 'https://fraud.mch.weixin.qq.com'.freeze
 
     def self.generate_authorize_url(redirect_uri, state = nil)
       state ||= SecureRandom.hex 16
@@ -124,6 +125,7 @@ module WxPay
       params = {
         appid: options.delete(:appid) || WxPay.appid,
         mch_id: options.delete(:mch_id) || WxPay.mch_id,
+        key: options.delete(:key) || WxPay.key,
         nonce_str: SecureRandom.uuid.tr('-', ''),
       }.merge(params)
 
@@ -167,7 +169,8 @@ module WxPay
       params = {
         mch_appid: options.delete(:appid) || WxPay.appid,
         mchid: options.delete(:mch_id) || WxPay.mch_id,
-        nonce_str: SecureRandom.uuid.tr('-', '')
+        nonce_str: SecureRandom.uuid.tr('-', ''),
+        key: options.delete(:key) || WxPay.key
       }.merge(params)
 
       check_required_options(params, INVOKE_TRANSFER_REQUIRED_FIELDS)
@@ -190,7 +193,8 @@ module WxPay
       params = {
         appid: options.delete(:appid) || WxPay.appid,
         mch_id: options.delete(:mch_id) || WxPay.mch_id,
-        nonce_str: SecureRandom.uuid.tr('-', '')
+        nonce_str: SecureRandom.uuid.tr('-', ''),
+        key: options.delete(:key) || WxPay.key
       }.merge(params)
 
       check_required_options(params, GETTRANSFERINFO_FIELDS)
@@ -208,6 +212,75 @@ module WxPay
       r
     end
 
+    # 获取加密银行卡号和收款方用户名的RSA公钥
+    def self.risk_get_public_key(options = {})
+      params = {
+        mch_id: options.delete(:mch_id) || WxPay.mch_id,
+        nonce_str: SecureRandom.uuid.tr('-', ''),
+        key: options.delete(:key) || WxPay.key,
+        sign_type: 'MD5'
+      }
+
+      options = {
+        ssl_client_cert: options.delete(:apiclient_cert) || WxPay.apiclient_cert,
+        ssl_client_key: options.delete(:apiclient_key) || WxPay.apiclient_key,
+        verify_ssl: OpenSSL::SSL::VERIFY_NONE,
+        gateway_url: FRAUD_GATEWAY_URL
+      }.merge(options)
+
+      r = WxPay::Result.new(Hash.from_xml(invoke_remote("/risk/getpublickey", make_payload(params), options)))
+
+      yield r if block_given?
+
+      r
+    end
+
+    PAY_BANK_FIELDS = [:enc_bank_no, :enc_true_name, :bank_code, :amount, :desc]
+    def self.pay_bank(params, options = {})
+      params = {
+        mch_id: options.delete(:mch_id) || WxPay.mch_id,
+        nonce_str: SecureRandom.uuid.tr('-', ''),
+        key: options.delete(:key) || WxPay.key,
+      }.merge(params)
+
+      check_required_options(params, PAY_BANK_FIELDS)
+
+      options = {
+        ssl_client_cert: options.delete(:apiclient_cert) || WxPay.apiclient_cert,
+        ssl_client_key: options.delete(:apiclient_key) || WxPay.apiclient_key,
+        verify_ssl: OpenSSL::SSL::VERIFY_NONE
+      }.merge(options)
+
+      r = WxPay::Result.new(Hash.from_xml(invoke_remote("/mmpaysptrans/pay_bank", make_payload(params), options)))
+
+      yield r if block_given?
+
+      r
+    end
+
+    QUERY_BANK_FIELDS = [:partner_trade_no]
+    def self.query_bank(params, options = {})
+      params = {
+        mch_id: options.delete(:mch_id) || WxPay.mch_id,
+        nonce_str: SecureRandom.uuid.tr('-', ''),
+        key: options.delete(:key) || WxPay.key,
+      }.merge(params)
+
+      check_required_options(params, QUERY_BANK_FIELDS)
+
+      options = {
+        ssl_client_cert: options.delete(:apiclient_cert) || WxPay.apiclient_cert,
+        ssl_client_key: options.delete(:apiclient_key) || WxPay.apiclient_key,
+        verify_ssl: OpenSSL::SSL::VERIFY_NONE
+      }.merge(options)
+
+      r = WxPay::Result.new(Hash.from_xml(invoke_remote("/mmpaysptrans/query_bank", make_payload(params), options)))
+
+      yield r if block_given?
+
+      r
+    end
+
     INVOKE_REVERSE_REQUIRED_FIELDS = [:out_trade_no]
     def self.invoke_reverse(params, options = {})
       params = {
@@ -371,11 +444,13 @@ module WxPay
 
       def invoke_remote(url, payload, options = {})
         options = WxPay.extra_rest_client_options.merge(options)
+        gateway_url = options.delete(:gateway_url) || get_gateway_url
+        url = "#{gateway_url}#{url}"
 
         RestClient::Request.execute(
           {
             method: :post,
-            url: "#{get_gateway_url}#{url}",
+            url: url,
             payload: payload,
             headers: { content_type: 'application/xml' }
           }.merge(options)

data/lib/wx_pay/version.rb

@@ -1,3 +1,3 @@
 module WxPay
-  VERSION = '0.16.1'
+  VERSION = '0.17.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wx_pay
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.17.0
 platform: ruby
 authors:
 - Jasl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-07 00:00:00.000000000 Z
+date: 2018-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -132,12 +132,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: An unofficial simple wechat pay gem
 test_files:
 - test/test_helper.rb
+- test/wx_pay/sign_test.rb
 - test/wx_pay/result_test.rb
 - test/wx_pay/service_test.rb
-- test/wx_pay/sign_test.rb