Skip to content

Commit 8af91ef

Browse files
committed
Merge remote-tracking branch 'origin/feature_align_doc_fields' into feature_align_doc_fields
2 parents 528633f + 40381db commit 8af91ef

9 files changed

+276
-283
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Copyright:Ant financial services group
66

77
#### 1 The sample for pay
88
```
9-
default_alipay_client = DefaultAlipayClient("https://open-na.alipay.com", client_id, MERCHANT_PRIVATE_KEY, ALIPAY_PUBLICK_KEY)
9+
default_alipay_client = DefaultAlipayClient("https://open-na.alipay.com", client_id, MERCHANT_PRIVATE_KEY, ALIPAY_PUBLIC_KEY)
1010
1111
alipay_pay_request = AlipayPayRequest()
1212
alipay_pay_request.path = "/ams/sandbox/api/v1/payments/pay"

example/auth.py

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
from com.alipay.ams.api.request.auth.alipay_auth_revoke_token_request import AlipayAuthRevokeTokenRequest
1717
from com.alipay.ams.api.response.auth.alipay_auth_revoke_token_response import AlipayAuthRevokeTokenResponse
1818

19-
2019
MERCHANT_PRIVATE_KEY = ""
21-
ALIPAY_PUBLICK_KEY = ""
20+
ALIPAY_PUBLIC_KEY = ""
2221
CLIENT_ID = ""
2322
GATEWAY_HOST = ""
2423

24+
2525
def apply_token(authCode):
26-
default_alipay_client = DefaultAlipayClient(GATEWAY_HOST, CLIENT_ID, MERCHANT_PRIVATE_KEY, ALIPAY_PUBLICK_KEY)
26+
default_alipay_client = DefaultAlipayClient(GATEWAY_HOST, CLIENT_ID, MERCHANT_PRIVATE_KEY, ALIPAY_PUBLIC_KEY)
2727
# 申请token
2828
alipay_auth_apply_token_request = AlipayAuthApplyTokenRequest()
2929

@@ -44,7 +44,7 @@ def apply_token(authCode):
4444

4545

4646
def query_token():
47-
default_alipay_client = DefaultAlipayClient(GATEWAY_HOST, CLIENT_ID, MERCHANT_PRIVATE_KEY, ALIPAY_PUBLICK_KEY)
47+
default_alipay_client = DefaultAlipayClient(GATEWAY_HOST, CLIENT_ID, MERCHANT_PRIVATE_KEY, ALIPAY_PUBLIC_KEY)
4848

4949
# 查询token
5050
alipay_auth_query_token_request = AlipayAuthQueryTokenRequest()
@@ -62,7 +62,7 @@ def query_token():
6262

6363

6464
def auth_consult():
65-
default_alipay_client = DefaultAlipayClient(GATEWAY_HOST, CLIENT_ID, MERCHANT_PRIVATE_KEY, ALIPAY_PUBLICK_KEY)
65+
default_alipay_client = DefaultAlipayClient(GATEWAY_HOST, CLIENT_ID, MERCHANT_PRIVATE_KEY, ALIPAY_PUBLIC_KEY)
6666

6767
alipay_auth_consult_request = AlipayAuthConsultRequest()
6868
alipay_auth_consult_request.path = "/ams/sandbox/api/v1/authorizations/consult"
@@ -92,7 +92,7 @@ def auth_consult():
9292

9393
def revoke_token(accessToken):
9494
default_alipay_client = DefaultAlipayClient(GATEWAY_HOST, CLIENT_ID, MERCHANT_PRIVATE_KEY,
95-
ALIPAY_PUBLICK_KEY)
95+
ALIPAY_PUBLIC_KEY)
9696
alipay_revoke_token_request = AlipayAuthRevokeTokenRequest()
9797
alipay_revoke_token_request.path = "/ams/sandbox/api/v1/authorizations/revoke"
9898
alipay_revoke_token_request.access_token = accessToken
@@ -107,9 +107,6 @@ def revoke_token(accessToken):
107107
print(alipay_auth_revoke_token_response.result.result_message)
108108

109109

110-
111-
112-
113110
# auth_consult()
114111
# apply_token("281001139396884133901370")
115-
revoke_token("28288803001156671722394041000cUJRjjdzzo171000759")
112+
revoke_token("28288803001156671722394041000cUJRjjdzzo171000759")

example/customsDeclare.py

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,18 @@
1111
from com.alipay.ams.api.response.declare.alipay_customs_query_response import AlipayCustomsQueryResponse
1212

1313
MERCHANT_PRIVATE_KEY = ""
14-
ALIPAY_PUBLICK_KEY = ""
14+
ALIPAY_PUBLIC_KEY = ""
1515
CLIENT_ID = ""
1616
GATEWAY_HOST = ""
1717

1818

19-
2019
def declare(paymentId):
21-
default_alipay_client = DefaultAlipayClient(GATEWAY_HOST, CLIENT_ID, MERCHANT_PRIVATE_KEY, ALIPAY_PUBLICK_KEY)
22-
alipayCustomsDeclareRequest = AlipayCustomsDeclareRequest()
20+
default_alipay_client = DefaultAlipayClient(GATEWAY_HOST, CLIENT_ID, MERCHANT_PRIVATE_KEY, ALIPAY_PUBLIC_KEY)
21+
alipayCustomsDeclareRequest = AlipayCustomsDeclareRequest()
2322
alipayCustomsDeclareRequest.path = "/ams/sandbox/api/v1/customs/declare"
2423
alipayCustomsDeclareRequest.declaration_request_id = "declaration_test_00001"
2524
alipayCustomsDeclareRequest.payment_id = paymentId
26-
alipayCustomsDeclareRequest.declaration_amount = Amount("CNY",100)
25+
alipayCustomsDeclareRequest.declaration_amount = Amount("CNY", 100)
2726
merchantCustomsInfo = MerchantCustomsInfo()
2827
merchantCustomsInfo.merchant_customs_code = "amsdemoskr"
2928
merchantCustomsInfo.merchant_customs_name = "amsdemo"
@@ -52,20 +51,22 @@ def declare(paymentId):
5251
else:
5352
print(alipayCustomsDeclareResponse.result.result_message)
5453

54+
5555
def inquiryDeclaration(declarationRequestIds):
56-
default_alipay_client = DefaultAlipayClient(GATEWAY_HOST, CLIENT_ID, MERCHANT_PRIVATE_KEY,
57-
ALIPAY_PUBLICK_KEY)
58-
alipayCustomsQueryRequest = AlipayCustomsQueryRequest()
59-
alipayCustomsQueryRequest.path = "/ams/sandbox/api/v1/customs/inquiryDeclarationRequests"
60-
alipayCustomsQueryRequest.declaration_request_ids = declarationRequestIds
56+
default_alipay_client = DefaultAlipayClient(GATEWAY_HOST, CLIENT_ID, MERCHANT_PRIVATE_KEY,
57+
ALIPAY_PUBLIC_KEY)
58+
alipayCustomsQueryRequest = AlipayCustomsQueryRequest()
59+
alipayCustomsQueryRequest.path = "/ams/sandbox/api/v1/customs/inquiryDeclarationRequests"
60+
alipayCustomsQueryRequest.declaration_request_ids = declarationRequestIds
6161

62-
rsp_body = default_alipay_client.execute(alipayCustomsQueryRequest)
62+
rsp_body = default_alipay_client.execute(alipayCustomsQueryRequest)
63+
64+
alipayCustomsQueryResponse = AlipayCustomsQueryResponse(rsp_body)
65+
if alipayCustomsQueryResponse.result.result_status.name == ResultStatusType.S.name:
66+
print(alipayCustomsQueryResponse.result.result_status)
67+
else:
68+
print(alipayCustomsQueryResponse.result.result_message)
6369

64-
alipayCustomsQueryResponse = AlipayCustomsQueryResponse(rsp_body)
65-
if alipayCustomsQueryResponse.result.result_status.name == ResultStatusType.S.name:
66-
print(alipayCustomsQueryResponse.result.result_status)
67-
else:
68-
print(alipayCustomsQueryResponse.result.result_message)
6970

7071
declare("202407311940108001001887A0209760494")
71-
# inquiryDeclaration(["declaration_test_00001"])
72+
# inquiryDeclaration(["declaration_test_00001"])

example/entry_code_payment_request_test.py

Lines changed: 75 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -15,82 +15,80 @@
1515
from com.alipay.ams.api.response.pay.alipay_pay_response import AlipayPayResponse
1616
from com.alipay.ams.api.default_alipay_client import DefaultAlipayClient
1717

18-
class EntryCodePaymentRequestTest(unittest.TestCase):
19-
20-
def test_entry_code(self):
21-
TEST_CLIENT_ID = 'T_385XSM502Y108602A'
22-
script_dir = os.path.dirname(__file__)
23-
with io.open(os.path.join(script_dir, '../private-pkcs1.pem'), encoding = 'utf-8') as pri, io.open(os.path.join(script_dir, '../public.pem'), encoding = 'utf-8') as pub:
24-
PRIVATE_KEY = pri.read()
25-
alipay_public_key = pub.read()
26-
27-
28-
29-
30-
order = Order()
31-
order.order_description = 'This is an order.'
32-
order.order_amount = Amount('USD', 1231)
33-
34-
merchant = Merchant()
35-
merchant.reference_merchant_id = 'seller2322174590000'
36-
merchant.merchant_mcc = '7011'
37-
merchant.merchant_name = 'Some_Mer'
38-
39-
store = Store()
40-
store.store_mcc = '7011'
41-
store.store_name = 'Some_Store'
42-
store.reference_store_id = 'store232217459000011'
43-
44-
merchant.store = store
45-
order.merchant = merchant
46-
47-
order.env = Env()
48-
order.env.user_agent = "Mozilla/5.0 (iPhone; CPU iPhone OS 11_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15G77 NebulaSDK/1.8.100112 Nebula PSDType(1) AlipayDefined(nt:4G,ws:320|504|2.0) AliApp(AP/10.1.32.600) AlipayClient/10.1.32.600 Alipay Language/zh-Hans AlipayConnect"
49-
50-
orderCodeReq = EntryCodePaymentRequest(payment_request_id=int(time.time()), order=order, currency="USD", amount_in_cents=1231, payment_notify_url='http://alipay.com/test')
51-
52-
body = orderCodeReq.to_ams_json()
53-
#print(body)
54-
#print('-' * 120)
55-
#
56-
#DATA = body.encode('utf-8')
57-
#requestTime = get_cur_iso8601_time()
58-
#
59-
#req = urllib.request.Request(url='https://open-na.alipay.com/ams/api/v1/payments/pay', data=DATA,method='POST')
60-
#req.add_header("content-type","application/json; charset=UTF-8")
61-
#req.add_header("client-id",TEST_CLIENT_ID)
62-
#req.add_header("request-time",requestTime)
63-
#req.add_header("signature","algorithm=RSA256,keyVersion=1,signature=" + sign(orderCodeReq.http_method.value, orderCodeReq.path, TEST_CLIENT_ID, requestTime, body, PRIVATE_KEY))
64-
#
65-
#with urllib.request.urlopen(req) as f:
66-
# #print(f.status)
67-
# print(f.read().decode('utf-8'))
68-
# print(f.headers)
69-
70-
default_alipay_client = DefaultAlipayClient("https://open-na.alipay.com", TEST_CLIENT_ID, PRIVATE_KEY, alipay_public_key)
71-
72-
rsp_body = default_alipay_client.execute(orderCodeReq)
73-
74-
response = AlipayPayResponse(rsp_body)
75-
76-
#print(rsp_body)
77-
#print('-' * 120)
78-
79-
def onF(response):
80-
print('onF: ' + response.result.result_code)
81-
82-
def onU(response):
83-
print('onU: ' + response.result.result_code)
84-
85-
def onS(response):
86-
print("%s, %s" % (response.payment_id, response.redirect_action_form.redirect_url))
87-
self.assertIsNotNone(response.redirect_action_form.redirect_url)
88-
89-
{
90-
'F': onF,
91-
'U': onU,
92-
'S': onS
93-
}.get(response.result.result_status.value)(response)
94-
9518

19+
class EntryCodePaymentRequestTest(unittest.TestCase):
9620

21+
def test_entry_code(self):
22+
TEST_CLIENT_ID = 'T_385XSM502Y108602A'
23+
script_dir = os.path.dirname(__file__)
24+
with io.open(os.path.join(script_dir, '../private-pkcs1.pem'), encoding='utf-8') as pri, io.open(
25+
os.path.join(script_dir, '../public.pem'), encoding='utf-8') as pub:
26+
PRIVATE_KEY = pri.read()
27+
alipay_public_key = pub.read()
28+
29+
order = Order()
30+
order.order_description = 'This is an order.'
31+
order.order_amount = Amount('USD', 1231)
32+
33+
merchant = Merchant()
34+
merchant.reference_merchant_id = 'seller2322174590000'
35+
merchant.merchant_mcc = '7011'
36+
merchant.merchant_name = 'Some_Mer'
37+
38+
store = Store()
39+
store.store_mcc = '7011'
40+
store.store_name = 'Some_Store'
41+
store.reference_store_id = 'store232217459000011'
42+
43+
merchant.store = store
44+
order.merchant = merchant
45+
46+
order.env = Env()
47+
order.env.user_agent = "Mozilla/5.0 (iPhone; CPU iPhone OS 11_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15G77 NebulaSDK/1.8.100112 Nebula PSDType(1) AlipayDefined(nt:4G,ws:320|504|2.0) AliApp(AP/10.1.32.600) AlipayClient/10.1.32.600 Alipay Language/zh-Hans AlipayConnect"
48+
49+
orderCodeReq = EntryCodePaymentRequest(payment_request_id=int(time.time()), order=order, currency="USD",
50+
amount_in_cents=1231, payment_notify_url='http://alipay.com/test')
51+
52+
body = orderCodeReq.to_ams_json()
53+
# print(body)
54+
# print('-' * 120)
55+
#
56+
# DATA = body.encode('utf-8')
57+
# requestTime = get_cur_iso8601_time()
58+
#
59+
# req = urllib.request.Request(url='https://open-na.alipay.com/ams/api/v1/payments/pay', data=DATA,method='POST')
60+
# req.add_header("content-type","application/json; charset=UTF-8")
61+
# req.add_header("client-id",TEST_CLIENT_ID)
62+
# req.add_header("request-time",requestTime)
63+
# req.add_header("signature","algorithm=RSA256,keyVersion=1,signature=" + sign(orderCodeReq.http_method.value, orderCodeReq.path, TEST_CLIENT_ID, requestTime, body, PRIVATE_KEY))
64+
#
65+
# with urllib.request.urlopen(req) as f:
66+
# #print(f.status)
67+
# print(f.read().decode('utf-8'))
68+
# print(f.headers)
69+
70+
default_alipay_client = DefaultAlipayClient("https://open-na.alipay.com", TEST_CLIENT_ID, PRIVATE_KEY,
71+
alipay_public_key)
72+
73+
rsp_body = default_alipay_client.execute(orderCodeReq)
74+
75+
response = AlipayPayResponse(rsp_body)
76+
77+
# print(rsp_body)
78+
# print('-' * 120)
79+
80+
def onF(response):
81+
print('onF: ' + response.result.result_code)
82+
83+
def onU(response):
84+
print('onU: ' + response.result.result_code)
85+
86+
def onS(response):
87+
print("%s, %s" % (response.payment_id, response.redirect_action_form.redirect_url))
88+
self.assertIsNotNone(response.redirect_action_form.redirect_url)
89+
90+
{
91+
'F': onF,
92+
'U': onU,
93+
'S': onS
94+
}.get(response.result.result_status.value)(response)

0 commit comments

Comments
 (0)