issue #98 round 2

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