issue #98 round 4

jasl
1 parent ce26768d
Showing 1 changed file with 4 additions and 2 deletions Show diff stats
lib/wx_pay/sign.rb
@@ -8,13 +8,15 @@ module WxPay
  
     def self.generate(params, sign_type = SIGN_TYPE_MD5)
       key = params.delete(:key)
-      key = params.delete("key") if params["key"]
+
+      new_key = params["key"] #after
+      key = params.delete("key") if params["key"] #after
  
       query = params.sort.map do |k, v|
         "#{k}=#{v}" if v.to_s != ''
       end.compact.join('&')
  
-      string_sign_temp = "#{query}&key=#{key || WxPay.key}"
+      string_sign_temp = "#{query}&key=#{key || new_key || WxPay.key}" #after
  
       if sign_type == SIGN_TYPE_MD5
         Digest::MD5.hexdigest(string_sign_temp).upcase
...	...	@@ -8,13 +8,15 @@ module WxPay
8	8
9	9	def self.generate(params, sign_type = SIGN_TYPE_MD5)
10	10	key = params.delete(:key)
11		- key = params.delete("key") if params["key"]
	11	+
	12	+ new_key = params["key"] #after
	13	+ key = params.delete("key") if params["key"] #after
12	14
13	15	query = params.sort.map do \|k, v\|
14	16	"#{k}=#{v}" if v.to_s != ''
15	17	end.compact.join('&')
16	18
17		- string_sign_temp = "#{query}&key=#{key \|\| WxPay.key}"
	19	+ string_sign_temp = "#{query}&key=#{key \|\| new_key \|\| WxPay.key}" #after
18	20
19	21	if sign_type == SIGN_TYPE_MD5
20	22	Digest::MD5.hexdigest(string_sign_temp).upcase
...	...