Merge commit '9b9d1975b853f06f8fb17211dc64683f9fd60173' into feature-add-fields-p2

# Conflicts:
#	example/auth.py
#	example/entry_code_payment_request_test.py
#	example/order_code_payment_request_test.py
#	example/registration.py
#	example/subscription_demo.py
#	example/user_presented_code_payment_test.py
#	example/vaulting_demo.py

Author: ScottWryyyyy

README.md

@@ -11,8 +11,8 @@ Copyright：Ant financial services group
     alipay_pay_request = AlipayPayRequest()
 
     alipay_pay_request.product_code = ProductCodeType.AGREEMENT_PAYMENT
-    alipay_pay_request.payment_notify_url = "https://www.yourNotifyUrl.com/notify"
-    alipay_pay_request.payment_redirect_url = "https://www.yourRedirectUrl.com?param1=sl"
+    alipay_pay_request.payment_notify_url = "https://www.yourNotifyUrl.com"
+    alipay_pay_request.payment_redirect_url = "https://www.yourRedirectUrl.com"
     alipay_pay_request.payment_request_id = "pay_python_test"
 
     payment_method = PaymentMethod()

example/auth.py

@@ -63,7 +63,7 @@ def auth_consult():
     default_alipay_client = DefaultAlipayClient(GATEWAY_HOST, CLIENT_ID, MERCHANT_PRIVATE_KEY, ALIPAY_PUBLIC_KEY)
 
     alipay_auth_consult_request = AlipayAuthConsultRequest()
-    alipay_auth_consult_request.auth_redirect_url = "https://www.yourRedirectUrl.com/?param1=567&param2=123"
+    alipay_auth_consult_request.auth_redirect_url = "https://www.yourRedirectUrl.com"
     alipay_auth_consult_request.auth_state = "663A8FA9-D836-56EE-8AA1-dd1F6F6811f989DC7"
     alipay_auth_consult_request.customer_belongs_to = CustomerBelongsTo.ALIPAY_CN
     alipay_auth_consult_request.auth_client_id = "SM_0001"

example/payment.py

@@ -48,7 +48,7 @@ def pay():
 
     alipay_pay_request.product_code = ProductCodeType.CASHIER_PAYMENT
     alipay_pay_request.payment_notify_url = "https://www.yourNotifyUrl.com"
-    alipay_pay_request.payment_redirect_url = "https://www.yourRedirectUrl.com?param1=sl"
+    alipay_pay_request.payment_redirect_url = "https://www.yourRedirectUrl.com"
     alipay_pay_request.payment_request_id = "pay_python_test" + str(uuid.uuid4())
     payment_method = PaymentMethod()
     payment_method.payment_method_type = "ALIPAY_CN"

example/registration.py

@@ -31,7 +31,7 @@ def register():
     alipay_merchant_registration_request = AlipayMerchantRegistrationRequest()
     alipay_merchant_registration_request.registration_request_id = "reqId107336691327831097346773_test_111"
     alipay_merchant_registration_request.pass_through_info = "{\"acquiringCurrency\":[\"HKD\"],\"settlementType\":\"DOMESTIC_SETTLEMENT\",\"legalRepresentativeName\":\"legalRepresentativeName\"}"
-    alipay_merchant_registration_request.registration_notify_url = "https://xmock.inc.alipay.net/api/Test/yibeiTest/testPayNotify1.htm"
+    alipay_merchant_registration_request.registration_notify_url = "https://www.yourNotifyUrl.com"
     alipay_merchant_registration_request.product_codes = ["AGREEMENT_PAYMENT"]
 
     merchant_info = MerchantRegistrationInfo()

example/subscription_demo.py

@@ -23,10 +23,10 @@
 from com.alipay.ams.api.response.subscription.alipay_subscription_create_response import \
     AlipaySubscriptionCreateResponse
 
-GATEWAY_HOST = "https://open-sea-global.alipay.com"
-CLIENT_ID = "SANDBOX_5YBZ1G2ZHUPS06086"
-MERCHANT_PRIVATE_KEY = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC/PqnrI3zdRMIAqIFzOlNkop2o/jMVva22j05W7/Sv78PU7SMmwQGObmw9COcm2nX0N1ix0dlqH2lmXRmoE69hElXcWnDEzcSHpNe1HtM0eWgOLozrwpa0PXue0O0cxvEhZxuWqKUMrwf3cV9dziTzbmmK70wP5PcIstjqy8SK/LyMZ/W5q1xRrBlRmXQvAOnx79A9ok0m8H99ziwOye9aDr8Tb0LEVBxeUVB+XwniiHYDbxRjY1awsYOaK66W+gZcx4ORXx8xDjDPX6q45RNIuJRgSXdqsQQxEk5tKSHpSj8LSqz67Dr/Jyq8MVJn30VXL+uX+yHyeCNKe5tf+2IHAgMBAAECggEATw+DxU5tbzfej9EZet5Q3ViQnu0/hyxb5Q3HUA9w807GgX7rOjkuAIjLvEuy65AClUxQIWrkW4fS1duFIMPKi/G9hxPobKO4LG9MMXclzxqllr9NyKUwEiEcuuIaM/xWcP2kHRto6B5vx66ZwzjWc8BgZ2xX4HZCXdk57Y8BmIb9IejKgIYtyUWrYuGkvQsh+SHWX5CZVEgGlCy3uYOMDj0BkSJOrLc3yW6octGuVQLEgFx3EEB0ZJMThUB+gxInj/pl06iwCuWbZXxkRkXHrllz1gOvfGwhtccwPHrKGJDHDY+OIIgsd4eEDJjySdMjx2hydmCbxbRBxEIK5iW/kQKBgQD10ReS5F6T+QDgc2VdscZo/64PLldXtH71sTJoIat8XK0oPNSbkzJzPpuWwj6hpSKO1/8Hsq52gM2IjJBSx2q7nD9azVrBevl/aLhAmM4OX7ahSDaQZx3yHwL40onXAZIVDECyi1zRLtBDgKaGgLJdIZ2lzgo7Jhcw8J3S/Np52QKBgQDHKtTAl43dKuTV5QZ7PwItrgcjOvm6LzhuI+xbM5YnAOLcp7g9UP6LLI5kB00UkB9fDnoePVbwEgl0ShIKHCWBU++F4mjPoayoTQCKBzNuvK5wKklVPoVDsnwhGXIS8fkBmU5VtjArB0kCAoIpR5HEzIaCiaZZGWMiZ0kfBdBu3wKBgQC+ZRJ2Qw4CXMZSEu87b/u2zfq6ZXFfTD1d/b6GKzYQ4BN6bAtc6NkVrDOExLUQLMCklSZChyJcRQ1tKzqJ8013POFRamdWHvLqvWihF/nZ5kalizJADK6EH4MEyMXc06mbRd9Cq3Db0P+cmSPiYAJG4keh6gHAqJMj4+rKRfDOmQKBgCbdp9jRemCffzpyT/p7CDzLyh7I4nS/xD5SCkyd235PAPZYUG6+wH1+O2cvuY36tfSBybje9Xkxu+CSl8SbS4JaU9KHpTZncV8Cb8l/sDy62zuONPNKmQzl5q063vTtfU8fkJbPT8UFzexzetz9V2fVFaahn/GhL6RGDZHdO5h3AoGALV6PDVsB6VjJtE8RA8Bpsmwl6ytLDiEljFImkzXQzq4/gTz2NJXjKGnUC70pae1Z1OWMHoZWqFgg1YAxVHeFZBqLQ88HwmCwwRjLkUyFxPRlJ7y4V8olBsDY57E1j03MNENaal88bRpvKUoZRTh8HCbk6BV8e6o+2vMf3HUe2Ss="
-ALIPAY_PUBLIC_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkJIL3C7NSzSQxP1DNK0Grktr5G5bMEj4ndEIBnSyFv8+e6ytS+G1+ch7EdZ4Lt7KYUGoFW1wJKyTS8V5UBMJTWxAkdc2uX3GrQiWbPvReMl3sNa3SC9Kmi8ofVKQdpAt8aZZaTLxmti0YyCh8zUTddE9AOeMZi8xvzC8chcGbfx4FA5meFGkPEBeYfxZgQzCjXnMJ/A2JFeh5g2443pfAq/caoIamcnTcA9qhJCMaqDyXb2pxXmg/VOClhqhaOjj4dnxzYKln1YNJw02SaVT9zjkNJkbY2QzCjEV0NdG/QLCQ/xBkFlDvlJ+nyCiTySqVOuJXGCos1cljMoYJGZLXQIDAQAB"
+MERCHANT_PRIVATE_KEY = ""
+ALIPAY_PUBLIC_KEY = ""
+CLIENT_ID = ""
+GATEWAY_HOST = ""
 
 
 def subscriptionsCreate():

example/vaulting_demo.py

@@ -46,7 +46,7 @@ def vaultPaymentMethod():
     alipayV_vaulting_payment_method_request = AlipayVaultingPaymentMethodRequest()
     alipayV_vaulting_payment_method_request.vaulting_request_id = str(uuid.uuid4())
     alipayV_vaulting_payment_method_request.vaulting_notification_url = "https://www.yourNotifyUrl.com"
-    alipayV_vaulting_payment_method_request.redirect_url = "https://www.your_redirect_url.com"
+    alipayV_vaulting_payment_method_request.redirect_url = "https://www.yourRedirectUrl.com"
     alipayV_vaulting_payment_method_request.merchant_region = "BR"
 
     paymentMethodDetail = PaymentMethodDetail()