Merge pull request #172 from hogus2037/master

Success Go · web-flow · commit d428c9bab1f9 · 2020-03-20T18:48:52.000+08:00
fixed alipay notify sign validate error
diff --git a/src/Common/Signer.php b/src/Common/Signer.php
@@ -18,7 +18,7 @@ class Signer
     const KEY_TYPE_PUBLIC = 1;
     const KEY_TYPE_PRIVATE = 2;
 
-    protected $ignores = ['sign'];
+    protected $ignores = ['sign', 'sign_type'];
 
     protected $sort = true;
 
diff --git a/tests/AopAppGatewayTest.php b/tests/AopAppGatewayTest.php
@@ -136,7 +136,7 @@ public function testCompletePurchaseNotify()
         }
 
         $this->assertEquals(
-            '{"total_amount":"0.01","buyer_id":"20882025611234567","trade_no":"201609232100100306021234567","refund_fee":"0.00","notify_time":"2016-09-23 19:12:33","subject":"test","sign_type":"RSA","notify_type":"trade_status_sync","out_trade_no":"2016092313071234567","gmt_close":"2016-09-23 19:08:10","trade_status":"TRADE_FINISHED","gmt_payment":"2016-09-23 19:08:10","sign":"Pj9CrLMvcQB5w1wN0ngelHCSonoe3j6zjYcZsU8kqsE3ZqLb9pHxVuStyztHCKB5\/gzRCVIrJpSjLw0XvuWeu3mz47LMLJo3vi+ODhZOGqFqWzlvSpsWuGSyIVWsVtl4b9gTdu0VzjUn+XpHkrdrZr7y517NvT8Deb1MtYVKasM=","gmt_create":"2016-09-23 19:08:09","app_id":"20151128001234567","seller_id":"20880114661234567","notify_id":"da3e56af64bcb163f167240dc0f781agge"}',
+            '{"total_amount":"0.01","buyer_id":"20882025611234567","trade_no":"201609232100100306021234567","refund_fee":"0.00","notify_time":"2016-09-23 19:12:33","subject":"test","sign_type":"RSA","notify_type":"trade_status_sync","out_trade_no":"2016092313071234567","gmt_close":"2016-09-23 19:08:10","trade_status":"TRADE_FINISHED","gmt_payment":"2016-09-23 19:08:10","sign":"Xa2NyOsxOBjW\/q\/RUFZhii2epa4B3ka+2aGsG8knqkiCD8llXrTDm11QtGkSRVw\/hbfcgFPiTkuaKnaaDu\/UfypsVSHToy28PiH5xkBSSd6zHNZCP\/jvjzOa6GPf4tIpfYNVvjaRMRcbn+TRlOFtHOnMMubjsg7K52P+LCugZIA=","gmt_create":"2016-09-23 19:08:09","app_id":"20151128001234567","seller_id":"20880114661234567","notify_id":"da3e56af64bcb163f167240dc0f781agge"}',
             json_encode($response->data())
         );
 
@@ -179,7 +179,7 @@ public function testCompletePurchaseNotifyWithInlineKey()
         }
 
         $this->assertEquals(
-            '{"total_amount":"0.01","buyer_id":"20882025611234567","trade_no":"201609232100100306021234567","refund_fee":"0.00","notify_time":"2016-09-23 19:12:33","subject":"test","sign_type":"RSA","notify_type":"trade_status_sync","out_trade_no":"2016092313071234567","gmt_close":"2016-09-23 19:08:10","trade_status":"TRADE_FINISHED","gmt_payment":"2016-09-23 19:08:10","sign":"Pj9CrLMvcQB5w1wN0ngelHCSonoe3j6zjYcZsU8kqsE3ZqLb9pHxVuStyztHCKB5\/gzRCVIrJpSjLw0XvuWeu3mz47LMLJo3vi+ODhZOGqFqWzlvSpsWuGSyIVWsVtl4b9gTdu0VzjUn+XpHkrdrZr7y517NvT8Deb1MtYVKasM=","gmt_create":"2016-09-23 19:08:09","app_id":"20151128001234567","seller_id":"20880114661234567","notify_id":"da3e56af64bcb163f167240dc0f781agge"}',
+            '{"total_amount":"0.01","buyer_id":"20882025611234567","trade_no":"201609232100100306021234567","refund_fee":"0.00","notify_time":"2016-09-23 19:12:33","subject":"test","sign_type":"RSA","notify_type":"trade_status_sync","out_trade_no":"2016092313071234567","gmt_close":"2016-09-23 19:08:10","trade_status":"TRADE_FINISHED","gmt_payment":"2016-09-23 19:08:10","sign":"Xa2NyOsxOBjW\/q\/RUFZhii2epa4B3ka+2aGsG8knqkiCD8llXrTDm11QtGkSRVw\/hbfcgFPiTkuaKnaaDu\/UfypsVSHToy28PiH5xkBSSd6zHNZCP\/jvjzOa6GPf4tIpfYNVvjaRMRcbn+TRlOFtHOnMMubjsg7K52P+LCugZIA=","gmt_create":"2016-09-23 19:08:09","app_id":"20151128001234567","seller_id":"20880114661234567","notify_id":"da3e56af64bcb163f167240dc0f781agge"}',
             json_encode($response->data())
         );
 
diff --git a/tests/AopF2FGatewayTest.php b/tests/AopF2FGatewayTest.php
@@ -227,7 +227,7 @@ public function testCompletePurchase()
         $response = $this->gateway->completePurchase(['params' => $data])->send();
 
         $this->assertEquals(
-            '{"gmt_payment":"2015-06-11 22:33:59","notify_id":"42af7baacd1d3746cf7b56752b91edcj34","seller_email":"testyufabu07@alipay.com","notify_type":"trade_status_sync","sign":"cJfsQ18JD4CfM1x9MlXY+dO1Q4L647giOmVQvtDJ+4QgpxFL7mEcU8InkAySWxr\/fRXuy8+FMtowYoN2Pmy7z3WcaX0qC5u8rr5hiidnKq\/m4\/7Tt6v5T4xDnYde6GWRchexsTFpMEFDVYs3Hy\/7ga+1Fgvs4bt0borNcjKNJNQ=","trade_no":"2015061121001004400068549373","out_trade_no":"21repl2ac2eOutTradeNo322","gmt_create":"2015-06-11 22:33:46","seller_id":"2088211521646673","notify_time":"2015-06-11 22:34:03","subject":"FACE_TO_FACE_PAYMENT_PRECREATE\u4e2d\u6587","trade_status":"TRADE_SUCCESS","sign_type":"RSA"}',
+            '{"gmt_payment":"2015-06-11 22:33:59","notify_id":"42af7baacd1d3746cf7b56752b91edcj34","seller_email":"testyufabu07@alipay.com","notify_type":"trade_status_sync","sign":"T4JCUXoO5sK\/7UjupKEfsSQnjDnw\/1aSJnC6s53SYJyqdjFl+1Lt8dWdNuuXl5yX39leQsYzmk2CDwZx6F\/YIQWCo1LHZME3DYMqH\/F5wT5uiSUk2KYsYbLluW9pi7YHtBXRWKB6jtnn73DWWbC2sN3tDky9KySPizL5jQ1Cd0I=","trade_no":"2015061121001004400068549373","out_trade_no":"21repl2ac2eOutTradeNo322","gmt_create":"2015-06-11 22:33:46","seller_id":"2088211521646673","notify_time":"2015-06-11 22:34:03","subject":"FACE_TO_FACE_PAYMENT_PRECREATE\u4e2d\u6587","trade_status":"TRADE_SUCCESS","sign_type":"RSA"}',
             json_encode($response->data())
         );
 
@@ -265,7 +265,7 @@ public function testCompleteRefund()
         $response = $this->gateway->completeRefund(['params' => $data])->send();
 
         $this->assertEquals(
-            '{"gmt_payment":"2015-06-11 22:33:59","notify_id":"42af7baacd1d3746cf7b56752b91edcj34","seller_email":"testyufabu07@alipay.com","notify_type":"trade_status_sync","sign":"cJfsQ18JD4CfM1x9MlXY+dO1Q4L647giOmVQvtDJ+4QgpxFL7mEcU8InkAySWxr\/fRXuy8+FMtowYoN2Pmy7z3WcaX0qC5u8rr5hiidnKq\/m4\/7Tt6v5T4xDnYde6GWRchexsTFpMEFDVYs3Hy\/7ga+1Fgvs4bt0borNcjKNJNQ=","trade_no":"2015061121001004400068549373","out_trade_no":"21repl2ac2eOutTradeNo322","gmt_create":"2015-06-11 22:33:46","seller_id":"2088211521646673","notify_time":"2015-06-11 22:34:03","subject":"FACE_TO_FACE_PAYMENT_PRECREATE\u4e2d\u6587","trade_status":"TRADE_SUCCESS","sign_type":"RSA"}',
+            '{"gmt_payment":"2015-06-11 22:33:59","notify_id":"42af7baacd1d3746cf7b56752b91edcj34","seller_email":"testyufabu07@alipay.com","notify_type":"trade_status_sync","sign":"T4JCUXoO5sK\/7UjupKEfsSQnjDnw\/1aSJnC6s53SYJyqdjFl+1Lt8dWdNuuXl5yX39leQsYzmk2CDwZx6F\/YIQWCo1LHZME3DYMqH\/F5wT5uiSUk2KYsYbLluW9pi7YHtBXRWKB6jtnn73DWWbC2sN3tDky9KySPizL5jQ1Cd0I=","trade_no":"2015061121001004400068549373","out_trade_no":"21repl2ac2eOutTradeNo322","gmt_create":"2015-06-11 22:33:46","seller_id":"2088211521646673","notify_time":"2015-06-11 22:34:03","subject":"FACE_TO_FACE_PAYMENT_PRECREATE\u4e2d\u6587","trade_status":"TRADE_SUCCESS","sign_type":"RSA"}',
             json_encode($response->data())
         );
 
diff --git a/tests/Common/SignerTest.php b/tests/Common/SignerTest.php
@@ -61,7 +61,7 @@ public function testSort()
 
     public function testIgnore()
     {
-        $this->assertSame(['sign'], (new Signer())->getIgnores());
+        $this->assertSame(['sign', 'sign_type'], (new Signer())->getIgnores());
 
         $params1 = [
             'aaa'   => '111',
diff --git a/tests/LegacyAppGatewayTest.php b/tests/LegacyAppGatewayTest.php
@@ -53,6 +53,6 @@ public function testCreateOrder()
          * @var LegacyAppPurchaseResponse $response
          */
         $response = $this->gateway->purchase($this->options)->send();
-        $this->assertEquals('29e66f48d681c68d70164028aeb22b33', md5($response->getOrderString()));
+        $this->assertEquals('e16fdd8098c197201986cd9c3a8fb276', md5($response->getOrderString()));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ public function testCompletePurchaseNotify()`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`$this->assertEquals(`
`139`		- '{"total_amount":"0.01","buyer_id":"20882025611234567","trade_no":"201609232100100306021234567","refund_fee":"0.00","notify_time":"2016-09-23 19:12:33","subject":"test","sign_type":"RSA","notify_type":"trade_status_sync","out_trade_no":"2016092313071234567","gmt_close":"2016-09-23 19:08:10","trade_status":"TRADE_FINISHED","gmt_payment":"2016-09-23 19:08:10","sign":"Pj9CrLMvcQB5w1wN0ngelHCSonoe3j6zjYcZsU8kqsE3ZqLb9pHxVuStyztHCKB5\/gzRCVIrJpSjLw0XvuWeu3mz47LMLJo3vi+ODhZOGqFqWzlvSpsWuGSyIVWsVtl4b9gTdu0VzjUn+XpHkrdrZr7y517NvT8Deb1MtYVKasM=","gmt_create":"2016-09-23 19:08:09","app_id":"20151128001234567","seller_id":"20880114661234567","notify_id":"da3e56af64bcb163f167240dc0f781agge"}',
	`139`	+ '{"total_amount":"0.01","buyer_id":"20882025611234567","trade_no":"201609232100100306021234567","refund_fee":"0.00","notify_time":"2016-09-23 19:12:33","subject":"test","sign_type":"RSA","notify_type":"trade_status_sync","out_trade_no":"2016092313071234567","gmt_close":"2016-09-23 19:08:10","trade_status":"TRADE_FINISHED","gmt_payment":"2016-09-23 19:08:10","sign":"Xa2NyOsxOBjW\/q\/RUFZhii2epa4B3ka+2aGsG8knqkiCD8llXrTDm11QtGkSRVw\/hbfcgFPiTkuaKnaaDu\/UfypsVSHToy28PiH5xkBSSd6zHNZCP\/jvjzOa6GPf4tIpfYNVvjaRMRcbn+TRlOFtHOnMMubjsg7K52P+LCugZIA=","gmt_create":"2016-09-23 19:08:09","app_id":"20151128001234567","seller_id":"20880114661234567","notify_id":"da3e56af64bcb163f167240dc0f781agge"}',
`140`	`140`	`json_encode($response->data())`
`141`	`141`	`);`
`142`	`142`
`@@ -179,7 +179,7 @@ public function testCompletePurchaseNotifyWithInlineKey()`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`$this->assertEquals(`
`182`		- '{"total_amount":"0.01","buyer_id":"20882025611234567","trade_no":"201609232100100306021234567","refund_fee":"0.00","notify_time":"2016-09-23 19:12:33","subject":"test","sign_type":"RSA","notify_type":"trade_status_sync","out_trade_no":"2016092313071234567","gmt_close":"2016-09-23 19:08:10","trade_status":"TRADE_FINISHED","gmt_payment":"2016-09-23 19:08:10","sign":"Pj9CrLMvcQB5w1wN0ngelHCSonoe3j6zjYcZsU8kqsE3ZqLb9pHxVuStyztHCKB5\/gzRCVIrJpSjLw0XvuWeu3mz47LMLJo3vi+ODhZOGqFqWzlvSpsWuGSyIVWsVtl4b9gTdu0VzjUn+XpHkrdrZr7y517NvT8Deb1MtYVKasM=","gmt_create":"2016-09-23 19:08:09","app_id":"20151128001234567","seller_id":"20880114661234567","notify_id":"da3e56af64bcb163f167240dc0f781agge"}',
	`182`	+ '{"total_amount":"0.01","buyer_id":"20882025611234567","trade_no":"201609232100100306021234567","refund_fee":"0.00","notify_time":"2016-09-23 19:12:33","subject":"test","sign_type":"RSA","notify_type":"trade_status_sync","out_trade_no":"2016092313071234567","gmt_close":"2016-09-23 19:08:10","trade_status":"TRADE_FINISHED","gmt_payment":"2016-09-23 19:08:10","sign":"Xa2NyOsxOBjW\/q\/RUFZhii2epa4B3ka+2aGsG8knqkiCD8llXrTDm11QtGkSRVw\/hbfcgFPiTkuaKnaaDu\/UfypsVSHToy28PiH5xkBSSd6zHNZCP\/jvjzOa6GPf4tIpfYNVvjaRMRcbn+TRlOFtHOnMMubjsg7K52P+LCugZIA=","gmt_create":"2016-09-23 19:08:09","app_id":"20151128001234567","seller_id":"20880114661234567","notify_id":"da3e56af64bcb163f167240dc0f781agge"}',
`183`	`183`	`json_encode($response->data())`
`184`	`184`	`);`
`185`	`185`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function testSort()`
`61`	`61`
`62`	`62`	`public function testIgnore()`
`63`	`63`	`{`
`64`		`- $this->assertSame(['sign'], (new Signer())->getIgnores());`
	`64`	`+ $this->assertSame(['sign', 'sign_type'], (new Signer())->getIgnores());`
`65`	`65`
`66`	`66`	`$params1 = [`
`67`	`67`	`'aaa' => '111',`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,6 @@ public function testCreateOrder()`
`53`	`53`	`* @var LegacyAppPurchaseResponse $response`
`54`	`54`	`*/`
`55`	`55`	`$response = $this->gateway->purchase($this->options)->send();`
`56`		`- $this->assertEquals('29e66f48d681c68d70164028aeb22b33', md5($response->getOrderString()));`
	`56`	`+ $this->assertEquals('e16fdd8098c197201986cd9c3a8fb276', md5($response->getOrderString()));`
`57`	`57`	`}`
`58`	`58`	`}`