Bugfix for w7corp#359

overtrue · overtrue · commit 99dbe18b4596 · 2016-03-25T23:27:14.000+08:00
diff --git a/src/Payment/Payment.php b/src/Payment/Payment.php
@@ -187,7 +187,9 @@ public function configForShareAddress($accessToken, $json = true)
             'accesstoken' => $accessToken,
         ];
 
-        $params['addrSign'] = generate_sign($signParams, $this->merchant->key, 'sha1');
+        ksort($signParams);
+
+        $params['addrSign'] = sha1(urldecode(http_build_query($signParams)));
 
         return $json ? json_encode($params) : $params;
     }
diff --git a/src/Payment/helpers.php b/src/Payment/helpers.php
@@ -38,6 +38,7 @@ function generate_sign(array $attributes, $key, $encryptMethod = 'md5')
     return strtoupper(call_user_func_array($encryptMethod, [urldecode(http_build_query($attributes))]));
 }
 
+
 /**
  * Get client ip address.
  *

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,9 @@ public function configForShareAddress($accessToken, $json = true)`
`187`	`187`	`'accesstoken' => $accessToken,`
`188`	`188`	`];`
`189`	`189`
`190`		`- $params['addrSign'] = generate_sign($signParams, $this->merchant->key, 'sha1');`
	`190`	`+ ksort($signParams);`
	`191`	`+`
	`192`	`+ $params['addrSign'] = sha1(urldecode(http_build_query($signParams)));`
`191`	`193`
`192`	`194`	`return $json ? json_encode($params) : $params;`
`193`	`195`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ function generate_sign(array $attributes, $key, $encryptMethod = 'md5')`
`38`	`38`	`return strtoupper(call_user_func_array($encryptMethod, [urldecode(http_build_query($attributes))]));`
`39`	`39`	`}`
`40`	`40`
	`41`	`+`
`41`	`42`	`/**`
`42`	`43`	`* Get client ip address.`
`43`	`44`	`*`