kubaninc / wx_pay

Download as
Browse Code »

Commit c742d559bb26b2ecd8adbb48bc1849f190ed29e3

Authored by Jun Jiang
2 parents 4fe3eed2 ab6304cd
Exists in master

Merge pull request #23 from yuc-zhu/master 

修复多账号情况下 生成 appkey bug
Showing 1 changed file with 2 additions and 0 deletions   Show diff stats
lib/wx_pay/service.rb
  Diff comments   View file @c742d55
@@ -10,6 +10,7 @@ module WxPay @@ -10,6 +10,7 @@ module WxPay
10 params = { 10 params = {
11 appid: options.delete(:appid) || WxPay.appid, 11 appid: options.delete(:appid) || WxPay.appid,
12 mch_id: options.delete(:mch_id) || WxPay.mch_id, 12 mch_id: options.delete(:mch_id) || WxPay.mch_id,
  13 + key: options.delete(:key) || WxPay.key,
13 nonce_str: SecureRandom.uuid.tr('-', '') 14 nonce_str: SecureRandom.uuid.tr('-', '')
14 }.merge(params) 15 }.merge(params)
15 16
@@ -27,6 +28,7 @@ module WxPay @@ -27,6 +28,7 @@ module WxPay
27 params = { 28 params = {
28 appid: options.delete(:appid) || WxPay.appid, 29 appid: options.delete(:appid) || WxPay.appid,
29 partnerid: options.delete(:mch_id) || WxPay.mch_id, 30 partnerid: options.delete(:mch_id) || WxPay.mch_id,
  31 + key: options.delete(:key) || WxPay.key,
30 package: 'Sign=WXPay', 32 package: 'Sign=WXPay',
31 timestamp: Time.now.to_i.to_s 33 timestamp: Time.now.to_i.to_s
32 }.merge(params) 34 }.merge(params)