issue #98

jasl
1 parent 687c0ce0
Showing 1 changed file with 5 additions and 1 deletions Show diff stats
lib/wx_pay/sign.rb
@@ -27,7 +27,11 @@ module WxPay
     def self.verify?(params, options = {})
       return true if WxPay.sandbox_mode?
       params = params.dup
-      params = params.merge(options)
+      params = {
+        appid: options.delete(:appid) || WxPay.appid,
+        mch_id: options.delete(:mch_id) || WxPay.mch_id,
+        key: options.delete(:key) || WxPay.key
+      }.merge(params)
       sign = params.delete('sign') || params.delete(:sign)
       generate(params) == sign
     end
...	...	@@ -27,7 +27,11 @@ module WxPay
27	27	def self.verify?(params, options = {})
28	28	return true if WxPay.sandbox_mode?
29	29	params = params.dup
30		- params = params.merge(options)
	30	+ params = {
	31	+ appid: options.delete(:appid) \|\| WxPay.appid,
	32	+ mch_id: options.delete(:mch_id) \|\| WxPay.mch_id,
	33	+ key: options.delete(:key) \|\| WxPay.key
	34	+ }.merge(params)
31	35	sign = params.delete('sign') \|\| params.delete(:sign)
32	36	generate(params) == sign
33	37	end
...	...