Skip to content

Commit 6b97209

Browse files
wangzunjiaowangzunjiao
committed
Merge branch 'refs/heads/master' into feature-update-composer
# Conflicts: # README.md # model/ScopeType.php
2 parents d94e954 + 6ad6976 commit 6b97209

File tree

115 files changed

+5259
-4964
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+5259
-4964
lines changed

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ $alipayPayResponse = $yourAlipayClient->execute($aliPayRequest);
160160
```
161161

162162
#### 3 If you don't care about HTTP calls,the sample for sign and verify
163+
163164
```
164165
$signReqValue = SignatureTool::sign($httpMethod, $path, $clientId, $reqTime, $reqBody, $merchantPrivateKey);
165166
$isVerifyPass = SignatureTool::verify($httpMethod, $path, $clientId, $rspTime, $rspBody, $rspSignValue, $alipayPublicKey);

‎client/BaseAlipayClient.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
abstract class BaseAlipayClient
77
{
88

9-
const DEFULT_KEY_VERSION = 1;
9+
const DEFAULT_KEY_VERSION = 1;
1010
private $gatewayUrl;
1111
private $merchantPrivateKey;
1212
private $alipayPublicKey;
@@ -159,7 +159,7 @@ private function buildBaseHeader($requestTime, $clientId, $keyVersion, $signValu
159159
$baseHeader[] = "client-id:" . $clientId;
160160

161161
if (!isset($keyVersion)) {
162-
$keyVersion = self::DEFULT_KEY_VERSION;
162+
$keyVersion = self::DEFAULT_KEY_VERSION;
163163
}
164164
$signatureHeader = "algorithm=RSA256,keyVersion=" . $keyVersion . ",signature=" . $signValue;
165165
$baseHeader[] = "Signature:" . $signatureHeader;

‎client/DefaultAlipayClient.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
class DefaultAlipayClient extends \Client\BaseAlipayClient
66
{
77

8-
function __construct(){
9-
$a=func_get_args();
10-
$i=func_num_args() - 2;
11-
if(method_exists($this,$f='__construct'.$i)){
12-
call_user_func_array(array($this,$f),$a);
8+
function __construct()
9+
{
10+
$a = func_get_args();
11+
$i = func_num_args() - 2;
12+
if (method_exists($this, $f = '__construct' . $i)) {
13+
call_user_func_array(array($this, $f), $a);
1314
}
1415
}
1516

‎client/SignatureTool.php

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,30 @@
22

33
namespace Client;
44

5-
class SignatureTool{
5+
class SignatureTool
6+
{
67

7-
static public function sign($httpMethod, $path, $clientId, $reqTime, $content, $merchantPrivateKey){
8+
static public function sign($httpMethod, $path, $clientId, $reqTime, $content, $merchantPrivateKey)
9+
{
810
$signContent = self::genSignContent($httpMethod, $path, $clientId, $reqTime, $content);
9-
$signValue = self::signWithSHA256RSA($signContent, $merchantPrivateKey);
11+
$signValue = self::signWithSHA256RSA($signContent, $merchantPrivateKey);
1012
return urlencode($signValue);
1113
}
1214

13-
static public function verify($httpMethod, $path, $clientId, $rspTime, $rspBody, $signature, $alipayPublicKey){
15+
static public function verify($httpMethod, $path, $clientId, $rspTime, $rspBody, $signature, $alipayPublicKey)
16+
{
1417
$rspContent = self::genSignContent($httpMethod, $path, $clientId, $rspTime, $rspBody);
1518
return self::verifySignatureWithSHA256RSA($rspContent, $signature, $alipayPublicKey);
1619
}
1720

18-
static private function genSignContent($httpMethod, $path, $clientId, $timeString, $content){
21+
static private function genSignContent($httpMethod, $path, $clientId, $timeString, $content)
22+
{
1923
$payload = $httpMethod . " " . $path . "\n" . $clientId . "." . $timeString . "." . $content;
2024
return $payload;
2125
}
2226

23-
static private function signWithSHA256RSA($signContent, $merchantPrivateKey){
27+
static private function signWithSHA256RSA($signContent, $merchantPrivateKey)
28+
{
2429
$priKey = "-----BEGIN RSA PRIVATE KEY-----\n" .
2530
wordwrap($merchantPrivateKey, 64, "\n", true) .
2631
"\n-----END RSA PRIVATE KEY-----";
@@ -29,14 +34,15 @@ static private function signWithSHA256RSA($signContent, $merchantPrivateKey){
2934
return base64_encode($signValue);
3035
}
3136

32-
static private function verifySignatureWithSHA256RSA($rspContent, $rspSignValue, $alipayPublicKey){
37+
static private function verifySignatureWithSHA256RSA($rspContent, $rspSignValue, $alipayPublicKey)
38+
{
3339
$pubKey = "-----BEGIN PUBLIC KEY-----\n" .
3440
wordwrap($alipayPublicKey, 64, "\n", true) .
3541
"\n-----END PUBLIC KEY-----";
36-
if(strstr($rspSignValue, "=")
42+
if (strstr($rspSignValue, "=")
3743
|| strstr($rspSignValue, "+")
3844
|| strstr($rspSignValue, "/")
39-
|| $rspSignValue == base64_encode(base64_decode($rspSignValue))){
45+
|| $rspSignValue == base64_encode(base64_decode($rspSignValue))) {
4046
$originalRspSignValue = base64_decode($rspSignValue);
4147
} else {
4248
$originalRspSignValue = base64_decode(urldecode($rspSignValue));

‎example/AuthTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@
22

33

44
require '../init.php';
5-
use \Request\auth\AlipayAuthConsultRequest;
6-
use \Request\auth\AlipayAuthApplyTokenRequest;
7-
use \Model\GrantType;
8-
use \MOdel\CustomerBelongsTo;
9-
use \Client\DefaultAlipayClient;
5+
6+
use Client\DefaultAlipayClient;
7+
use MOdel\CustomerBelongsTo;
8+
use Model\GrantType;
9+
use Request\auth\AlipayAuthApplyTokenRequest;
10+
use Request\auth\AlipayAuthConsultRequest;
1011

1112

1213
const clientId = "";
13-
const merchantPrivateKey = "";
14-
const alipayPublicKey = "";
14+
const merchantPrivateKey = "";
15+
const alipayPublicKey = "";
1516
const gatewayUrl = "";
1617

1718

@@ -30,7 +31,6 @@ function applyToken($authCode)
3031
}
3132

3233

33-
3434
function authConsult()
3535
{
3636
$request = new AlipayAuthConsultRequest();

‎example/CustomsTest.php

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
<?php
22
require '../init.php';
33

4-
use \Request\customs\AlipayCustomsDeclareRequest;
5-
use \Client\DefaultAlipayClient;
6-
use \Model\Amount;
7-
use \Model\MerchantCustomsInfo;
8-
use \Model\CustomsInfo;
9-
use \Model\Certificate;
10-
use \model\UserName;
11-
use \model\CertificateType;
12-
4+
use Client\DefaultAlipayClient;
5+
use Model\Amount;
6+
use Model\Certificate;
7+
use model\CertificateType;
8+
use Model\CustomsInfo;
9+
use Model\MerchantCustomsInfo;
10+
use model\UserName;
11+
use Request\customs\AlipayCustomsDeclareRequest;
1312

1413

1514
const clientId = "";
16-
const merchantPrivateKey = "";
17-
const alipayPublicKey = "";
15+
const merchantPrivateKey = "";
16+
const alipayPublicKey = "";
1817
const gatewayUrl = "";
1918

2019

@@ -51,7 +50,7 @@ function declares($paymentId)
5150
$alipayResponse = $alipayClient->execute($request);
5251

5352
print(json_encode($alipayResponse));
54-
print("\n".$requestId);
53+
print("\n" . $requestId);
5554

5655
}
5756

‎example/EntryCodePaymentTest.php

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?php
22
require '../init.php';
33

4-
use \Model\PaymentMethod;
5-
use \Request\pay\EntryCodePaymentRequest;
6-
use \Model\ProductCodeType;
7-
use \Model\Order;
8-
use \Model\Merchant;
9-
use \Model\Store;
10-
use \Model\Amount;
11-
use \Model\Env;
12-
use \Client\DefaultAlipayClient;
13-
use \model\TerminalType;
14-
use \Model\OsType;
15-
use \Model\WalletPaymentMethodType;
4+
use Client\DefaultAlipayClient;
5+
use Model\Amount;
6+
use Model\Env;
7+
use Model\Merchant;
8+
use Model\Order;
9+
use Model\OsType;
10+
use Model\PaymentMethod;
11+
use Model\ProductCodeType;
12+
use Model\Store;
13+
use model\TerminalType;
14+
use Model\WalletPaymentMethodType;
15+
use Request\pay\EntryCodePaymentRequest;
1616

1717

1818
$clientId = "SANDBOX_5YBZ1G2ZHUPS06086";
@@ -65,11 +65,11 @@
6565
$request->setProductCode(ProductCodeType::CASHIER_PAYMENT);
6666

6767

68-
$merchantPrivateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDvd0h55/WfbUrXfBkc0+X3H5RpD0b0T4yEVwnqUcFea7epULNstd5ItZXkV5UdkRiOqwUXGqTw2jLFbo/Qdgss+yXiUiIvB2ynncBNWNw9pCuzS+GUMw4ZARSwASPbb5hB0iK3ASl7BXOEncRuybm4gn3tD975hCGHpMeSTx0Z8rCHBqaterpyCPs68Op5kzoTYHiMCGozLeMUEand1O6OPZNQxM5c+ME+YaA6g4VbN6CjtxEihU/lhpruGN5yD+/zBRSdqrD0qxIyq3bxhTYzIXjImR4FBfqz5CoSwu7jFZdxTMyIW4lr/dXzqIvCcjrDP4R8aRB4Dy81vPTP0vnfAgMBAAECggEAIBW+az8OJP9S0M562ub1YAgmLXFzk1Z5QF4dIP01SH5sTE5YzA8OKnXSEJc/joebX7pAY1kZkn/Z36Qxtr+qPauk5s8Ub3KyNz8mvfZTBBtUE6DuJ5ozoFwJto9gi41HPEJ4jkaklSwkzzcIU8PJk5RAZRwERzBSAcetScg54PjmG424dn6fBE+0HTMtJc1l6WPzcJOm7F8X7VOpL7dZJBFQXFh/gagjz9a/WXb0BIeOyJ35PMh1Ta6ZMB1bmCRYHL/Z4JEp4OE1Wz6f20h1kLtEKr4EbN6DDylM5/f9rmpB+6THdNVuPVaKTm5g47mKDWt/XsT6qNrxAHYRpMH4qQKBgQD8bWXt4dz5Ao33Aohuv/PrLSNxnB7Q+v1fUmhza55n09jaNJOX95BzECBXHpxZxVnRnScHhPIAEjGcH8h5ahLTmbblBHzS9VivWqgDwsVFS/kS1iWLfqVAK2N1TM81X8kiwudfAN0h5SFzuiJrCqdu/X1QlBVs3hMO8MjN8u7xhQKBgQDy2uxCTs5ejC0TaY2WBcGZ+gmxLic+jOGHNqrcB2+dGyvF6yjZgeasdwG5hSO85z9KQP56Ar+JI03MUd6WJBDPs1zcd/FNN9HIFPmI4DM4RBrunr7QRq2yaKgA6k9WFh6G4EkO6DrD7A9xRNhGJgKpSOBpivdEY8yq8Ue0JcHpEwKBgBYgvOuyff1yJOG/XhhfSVGXXmEKL4VgSy+8+J0NlRBC+OJ/82RB9m6vvjYE3+3ap/oBDbfSBqjM735hJuDF1Kqp8ed3kj2n9kNA7jOOMl7VvxrQnO/yhSfv5cMVnaBvKiGa9k9Usw3SmTEc4wGBKJZJMGAM6yfk+8S2hNPQ9PNFAoGAM3tvXDsiim6C27ujlSsROJgF1/alwR/Sa3yOSeiVo6Nv6xwH49wiz2rHBdIQmmoXQ6F1kN3mRqciRe8RFZj9q1ollGMk1y6/HQA9SePlV8cwQmeKodJp3glLnC4PtXso64S+WBeo5YG0YFms02oZZFObpyQbePcDGzXc8naSndsCgYEAu35IqER+dxQNQxrgT83lzYDjtiEFTsyuyjKSvYNrhCJcgzNiGQSs55k1LEWuxNzvNuHaT3djcLINz9WrzZkShJBUZO50cTUcCjqw1C9fBGiqU7zQBvCb3rdNzAZwmEqjjjrT1dYH4gGdYc1dSc6XHwWWbduqbT91DaENxd4wIuY=";
68+
$merchantPrivateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDvd0h55/WfbUrXfBkc0+X3H5RpD0b0T4yEVwnqUcFea7epULNstd5ItZXkV5UdkRiOqwUXGqTw2jLFbo/Qdgss+yXiUiIvB2ynncBNWNw9pCuzS+GUMw4ZARSwASPbb5hB0iK3ASl7BXOEncRuybm4gn3tD975hCGHpMeSTx0Z8rCHBqaterpyCPs68Op5kzoTYHiMCGozLeMUEand1O6OPZNQxM5c+ME+YaA6g4VbN6CjtxEihU/lhpruGN5yD+/zBRSdqrD0qxIyq3bxhTYzIXjImR4FBfqz5CoSwu7jFZdxTMyIW4lr/dXzqIvCcjrDP4R8aRB4Dy81vPTP0vnfAgMBAAECggEAIBW+az8OJP9S0M562ub1YAgmLXFzk1Z5QF4dIP01SH5sTE5YzA8OKnXSEJc/joebX7pAY1kZkn/Z36Qxtr+qPauk5s8Ub3KyNz8mvfZTBBtUE6DuJ5ozoFwJto9gi41HPEJ4jkaklSwkzzcIU8PJk5RAZRwERzBSAcetScg54PjmG424dn6fBE+0HTMtJc1l6WPzcJOm7F8X7VOpL7dZJBFQXFh/gagjz9a/WXb0BIeOyJ35PMh1Ta6ZMB1bmCRYHL/Z4JEp4OE1Wz6f20h1kLtEKr4EbN6DDylM5/f9rmpB+6THdNVuPVaKTm5g47mKDWt/XsT6qNrxAHYRpMH4qQKBgQD8bWXt4dz5Ao33Aohuv/PrLSNxnB7Q+v1fUmhza55n09jaNJOX95BzECBXHpxZxVnRnScHhPIAEjGcH8h5ahLTmbblBHzS9VivWqgDwsVFS/kS1iWLfqVAK2N1TM81X8kiwudfAN0h5SFzuiJrCqdu/X1QlBVs3hMO8MjN8u7xhQKBgQDy2uxCTs5ejC0TaY2WBcGZ+gmxLic+jOGHNqrcB2+dGyvF6yjZgeasdwG5hSO85z9KQP56Ar+JI03MUd6WJBDPs1zcd/FNN9HIFPmI4DM4RBrunr7QRq2yaKgA6k9WFh6G4EkO6DrD7A9xRNhGJgKpSOBpivdEY8yq8Ue0JcHpEwKBgBYgvOuyff1yJOG/XhhfSVGXXmEKL4VgSy+8+J0NlRBC+OJ/82RB9m6vvjYE3+3ap/oBDbfSBqjM735hJuDF1Kqp8ed3kj2n9kNA7jOOMl7VvxrQnO/yhSfv5cMVnaBvKiGa9k9Usw3SmTEc4wGBKJZJMGAM6yfk+8S2hNPQ9PNFAoGAM3tvXDsiim6C27ujlSsROJgF1/alwR/Sa3yOSeiVo6Nv6xwH49wiz2rHBdIQmmoXQ6F1kN3mRqciRe8RFZj9q1ollGMk1y6/HQA9SePlV8cwQmeKodJp3glLnC4PtXso64S+WBeo5YG0YFms02oZZFObpyQbePcDGzXc8naSndsCgYEAu35IqER+dxQNQxrgT83lzYDjtiEFTsyuyjKSvYNrhCJcgzNiGQSs55k1LEWuxNzvNuHaT3djcLINz9WrzZkShJBUZO50cTUcCjqw1C9fBGiqU7zQBvCb3rdNzAZwmEqjjjrT1dYH4gGdYc1dSc6XHwWWbduqbT91DaENxd4wIuY=";
6969

70-
$alipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkJIL3C7NSzSQxP1DNK0Grktr5G5bMEj4ndEIBnSyFv8+e6ytS+G1+ch7EdZ4Lt7KYUGoFW1wJKyTS8V5UBMJTWxAkdc2uX3GrQiWbPvReMl3sNa3SC9Kmi8ofVKQdpAt8aZZaTLxmti0YyCh8zUTddE9AOeMZi8xvzC8chcGbfx4FA5meFGkPEBeYfxZgQzCjXnMJ/A2JFeh5g2443pfAq/caoIamcnTcA9qhJCMaqDyXb2pxXmg/VOClhqhaOjj4dnxzYKln1YNJw02SaVT9zjkNJkbY2QzCjEV0NdG/QLCQ/xBkFlDvlJ+nyCiTySqVOuJXGCos1cljMoYJGZLXQIDAQAB";
70+
$alipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkJIL3C7NSzSQxP1DNK0Grktr5G5bMEj4ndEIBnSyFv8+e6ytS+G1+ch7EdZ4Lt7KYUGoFW1wJKyTS8V5UBMJTWxAkdc2uX3GrQiWbPvReMl3sNa3SC9Kmi8ofVKQdpAt8aZZaTLxmti0YyCh8zUTddE9AOeMZi8xvzC8chcGbfx4FA5meFGkPEBeYfxZgQzCjXnMJ/A2JFeh5g2443pfAq/caoIamcnTcA9qhJCMaqDyXb2pxXmg/VOClhqhaOjj4dnxzYKln1YNJw02SaVT9zjkNJkbY2QzCjEV0NdG/QLCQ/xBkFlDvlJ+nyCiTySqVOuJXGCos1cljMoYJGZLXQIDAQAB";
7171

72-
$alipayClient = new DefaultAlipayClient("https://open-sea-global.alipay.com", $merchantPrivateKey, $alipayPublicKey);
72+
$alipayClient = new DefaultAlipayClient("https://open-sea-global.alipay.com", $merchantPrivateKey, $alipayPublicKey);
7373
$alipayResponse = $alipayClient->execute($request);
7474

7575
//print(json_encode($request));

‎example/OrderCodePaymentTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?php
22
require '../init.php';
33

4-
use \Request\pay\OrderCodePaymentRequest;
5-
use \Model\Order;
6-
use \Model\Merchant;
7-
use \Model\Store;
8-
use \Model\Amount;
9-
use \Client\DefaultAlipayClient;
4+
use Client\DefaultAlipayClient;
5+
use Model\Amount;
6+
use Model\Merchant;
7+
use Model\Order;
8+
use Model\Store;
9+
use Request\pay\OrderCodePaymentRequest;
1010

1111

1212
$clientId = "T_385XSM502Y108602A";

‎example/PayTest.php

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,33 @@
11
<?php
22
require '../init.php';
33

4-
use \Model\ProductCodeType;
5-
use \Model\Order;
6-
use \Model\Merchant;
7-
use \Model\Store;
8-
use \Model\Amount;
9-
use \Model\Env;
10-
use \Client\DefaultAlipayClient;
11-
use \Model\TerminalType;
12-
use \Model\OsType;
13-
use \Model\WalletPaymentMethodType;
14-
use \Model\SettlementStrategy;
15-
use \Request\pay\AlipayPayQueryRequest;
16-
use \Request\pay\AlipayPayRequest;
17-
use \Model\PaymentMethod;
18-
use \Request\pay\AlipayRefundRequest;
19-
use \Request\pay\AlipayInquiryRefundRequest;
20-
use \Request\pay\AlipayPayCancelRequest;
21-
use \Request\pay\AlipayPaymentSessionRequest;
22-
use \Model\Buyer;
23-
use \Request\pay\AlipayPayConsultRequest;
24-
use \Model\PaymentFactor;
25-
use \Model\PresentmentMode;
26-
4+
use Client\DefaultAlipayClient;
5+
use Model\Amount;
6+
use Model\Buyer;
7+
use Model\Env;
8+
use Model\Merchant;
9+
use Model\Order;
10+
use Model\OsType;
11+
use Model\PaymentFactor;
12+
use Model\PaymentMethod;
13+
use Model\PresentmentMode;
14+
use Model\ProductCodeType;
15+
use Model\SettlementStrategy;
16+
use Model\Store;
17+
use Model\TerminalType;
18+
use Model\WalletPaymentMethodType;
19+
use Request\pay\AlipayInquiryRefundRequest;
20+
use Request\pay\AlipayPayCancelRequest;
21+
use Request\pay\AlipayPayConsultRequest;
22+
use Request\pay\AlipayPaymentSessionRequest;
23+
use Request\pay\AlipayPayQueryRequest;
24+
use Request\pay\AlipayPayRequest;
25+
use Request\pay\AlipayRefundRequest;
2726

2827

2928
const clientId = "";
30-
const merchantPrivateKey = "";
31-
const alipayPublicKey = "";
29+
const merchantPrivateKey = "";
30+
const alipayPublicKey = "";
3231
const gatewayUrl = "";
3332

3433

0 commit comments

Comments
 (0)