wx_pay 0.20.1 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6002fb825ade5ece7fe4ab8c7ea70b31f662cfdf107c9c8b03fb031a7a25eec6
-  data.tar.gz: e583207a3e07b6cbc5a890e5ad6a8245901aa01224a087db9e280b2399b72854
+  metadata.gz: e472765b251f44ad368e4738c8593e8b47e349892cec1d39017ec466243edfbf
+  data.tar.gz: bb4338988b511b4573b2a40acdb0e1d95131cee04fa8e776d455a9602b87b5e5
 SHA512:
-  metadata.gz: fdcb90371cdd18136299337abd6f9d7ac9d87b10c937513b429c381cdd4e6de87e54ac206936563f157302b9d638ab0dd63a1f560033734aae2a5f02a8e583b6
-  data.tar.gz: 59cee9aee519fbe24e9e8e1199d7858a30e720d5d867a3161404581cba5d7cb3b25fb54f5d481fb734d5e246d936944491cbc8a76300d8f21cdcdd0d1c22a59f
+  metadata.gz: a313ebc9905ea19414c3e3d58e0b512941052707ea3fc2a4f5d3b194e20d72ffd40035e1fbf951dc3b4ad789a901b9c4a73b763c6c21fe221eee484815f044df
+  data.tar.gz: faa85e84cd7c78ce8be986039d7bd56ea0061d2a7e284130cf37ceef3cd03918eee06872dee2e42640ea9ca29f1049d107e86f02495e8a3572fd25484e04e086

data/lib/wx_pay/service.rb

@@ -476,6 +476,72 @@ module WxPay
       r
     end
 
+    PROFITSHARINGADDRECEIVER = [:nonce_str, :receiver]
+
+    # 添加分账接收方
+    def self.profitsharingaddreceiver(params, options = {})
+      params = {
+        appid: options.delete(:appid) || WxPay.appid,
+        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, PROFITSHARINGADDRECEIVER)
+
+      r = WxPay::Result.new(Hash.from_xml(invoke_remote("/pay/profitsharingaddreceiver", make_payload(params, WxPay::Sign::SIGN_TYPE_HMAC_SHA256), options)))
+
+      yield r if block_given?
+
+      r
+    end
+
+    PROFITSHARINGREMOVERECEIVER = [:nonce_str, :receiver]
+    # 删除分账接收方
+    def self.profitsharingremovereceiver(params, options = {})
+      params = {
+        appid: options.delete(:appid) || WxPay.appid,
+        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, PROFITSHARINGADDRECEIVER)
+
+      r = WxPay::Result.new(Hash.from_xml(invoke_remote("/pay/profitsharingremovereceiver", make_payload(params, WxPay::Sign::SIGN_TYPE_HMAC_SHA256), options)))
+
+      yield r if block_given?
+
+      r
+    end
+
+    # 单次分账
+
+    PROFITSHARING = [:nonce_str, :receivers, :transaction_id, :out_order_no]
+
+    def self.profitsharing(params, options = {})
+      params = {
+        appid: options.delete(:appid) || WxPay.appid,
+        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, PROFITSHARING)
+
+      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("/secapi/pay/profitsharing", make_payload(params, WxPay::Sign::SIGN_TYPE_HMAC_SHA256), options)))
+
+      yield r if block_given?
+
+      r
+    end
+
     class << self
       private
 

data/lib/wx_pay/sign.rb

@@ -36,7 +36,8 @@ module WxPay
       params["key"] = options[:key] if options[:key]
 
       sign = params.delete('sign') || params.delete(:sign)
-      generate(params) == sign
+
+      generate(params, options[:sign_type] || SIGN_TYPE_MD5) == sign
     end
   end
 end

data/lib/wx_pay/version.rb

@@ -1,3 +1,3 @@
 module WxPay
-  VERSION = '0.20.1'.freeze
+  VERSION = '0.21.0'.freeze
 end

data/test/wx_pay/sign_test.rb

@@ -44,4 +44,10 @@ class WxPay::SignTest < MiniTest::Test
 
     assert_equal "1454C32E885B8D9E4A05E976D1C45B88", WxPay::Sign.generate(@params)
   end
+
+  def test_verify_sign_when_use_hmac_sha256
+    opts = { key: "key", sign_type: WxPay::Sign::SIGN_TYPE_HMAC_SHA256 }
+
+    assert WxPay::Sign.verify?(@params.merge(:sign => @sign_hmac_sha256), opts)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wx_pay
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.21.0
 platform: ruby
 authors:
 - Jasl
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-06 00:00:00.000000000 Z
+date: 2020-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -42,16 +42,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -102,7 +102,7 @@ homepage: https://github.com/jasl/wx_pay
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -117,8 +117,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: An unofficial simple wechat pay gem
 test_files: