Merge pull request #31 from alipay/adding_url_to_request

为请求对象设置path；使用lombok改写ams接口对象；

Author: ScottWryyyyy

CHANGE.log

@@ -99,4 +99,7 @@ add subscription params and constants
 add lombok support
 
 29、Version:2.0.27
-add Checkout Payment Page support
+add Checkout Payment Page support
+
+30、Version:2.0.29
+adding path to request, using lombok for ams api, update sample code

README.md

@@ -12,7 +12,7 @@ https://mvnrepository.com/artifact/com.alipay.global.sdk/global-open-sdk-java
 <dependency>
     <groupId>com.alipay.global.sdk</groupId>
     <artifactId>global-open-sdk-java</artifactId>
-    <version>2.0.28</version>
+    <version>2.0.29</version>
 </dependency>
 ```
 
@@ -38,11 +38,10 @@ public static boolean verify(String httpMethod, String path, String clientId, St
 AMS:
 
 ```
-AlipayClient defaultAlipayClient = new DefaultAlipayClient("https://open-na.alipay.com", merchantPrivateKey, alipayPublicKey);
+AlipayClient CLIENT = new DefaultAlipayClient("https://open-na.alipay.com", merchantPrivateKey, alipayPublicKey, clientid);
 
 AlipayPayRequest alipayPayRequest = new AlipayPayRequest();
 alipayPayRequest.setClientId("clientId");
-alipayPayRequest.setPath("/ams/api/v1/payments/pay");
 alipayPayRequest.setProductCode(ProductCodeType.CASHIER_PAYMENT);
 alipayPayRequest.setPaymentRequestId("pay_test_99");
 
@@ -92,34 +91,32 @@ SettlementStrategy settlementStrategy  = new SettlementStrategy();
 settlementStrategy.setSettlementCurrency("USD");
 alipayPayRequest.setSettlementStrategy(settlementStrategy);
 
-AlipayPayResponse alipayPayResponse = defaultAlipayClient.execute(alipayPayRequest);
+AlipayPayResponse alipayPayResponse = CLIENT.execute(alipayPayRequest);
   
 ```  
 
 APS:
 
 ```  
-AlipayClient defaultAlipayClient = new DefaultAlipayClient("https://open-na.alipay.com", merchantPrivateKey, alipayPublicKey);
+AlipayClient CLIENT = new DefaultAlipayClient("https://open-na.alipay.com", merchantPrivateKey, alipayPublicKey, clientid);
  
 AlipayApsInquiryPaymentRequest inquiryPaymentRequest = new AlipayApsInquiryPaymentRequest();
  
-inquiryPaymentRequest.setPath("/aps/api/v1/payments/inquiryPayment");
 inquiryPaymentRequest.setClientId("clientId");
 inquiryPaymentRequest.setPaymentId("20210518190796060008A0001628707");
 inquiryPaymentRequest.setPaymentRequestId("rtanhU9au6F3VEbvbVWRz");
  
-AlipayApsInquiryPaymentResponse alipayResponse = defaultAlipayClient.execute(inquiryPaymentRequest);
+AlipayApsInquiryPaymentResponse alipayResponse = CLIENT.execute(inquiryPaymentRequest);
 
 ```  
 
 RISK:
 
 ```
-AlipayClient defaultAlipayClient = new DefaultAlipayClient("https://open-sea-global.alipay.com", merchantPrivateKey, alipayPublicKey);
+AlipayClient CLIENT = new DefaultAlipayClient("https://open-sea-global.alipay.com", merchantPrivateKey, alipayPublicKey, clientid);
 
 RiskDecideRequest riskDecideRequest = new RiskDecideRequest();
 riskDecideRequest.setClientId("clietId");
-riskDecideRequest.setPath("/ams/api/v1/risk/payments/decide");
 riskDecideRequest.setReferenceTransactionId("test_referenceTransactionId");
 riskDecideRequest.setAuthorizationPhase(AuthorizationPhase.PRE_AUTHORIZATION);
 
@@ -171,7 +168,7 @@ env.setTerminalType(TerminalType.APP);
 env.setOsType(OsType.IOS);
 riskDecideRequest.setEnv(env);
 
-RiskDecideResponse response = defaultAlipayClient.execute(riskDecideRequest);
+RiskDecideResponse response = CLIENT.execute(riskDecideRequest);
 ```
 
 The execute method contains the HTTP request to the gateway. 

pom.xml

@@ -4,7 +4,7 @@
     <groupId>com.alipay.global.sdk</groupId>
     <artifactId>global-open-sdk-java</artifactId>
     <packaging>jar</packaging>
-    <version>2.0.28</version>
+    <version>2.0.29</version>
     <name>global-open-sdk-java</name>
     <url>https://github.com/alipay/global-open-sdk-java</url>
     <description>

src/main/java/com/alipay/global/api/BaseAlipayClient.java

@@ -1,6 +1,12 @@
 package com.alipay.global.api;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.alipay.global.api.exception.AlipayApiException;
 import com.alipay.global.api.model.Result;
 import com.alipay.global.api.net.HttpRpcResult;
@@ -9,10 +15,6 @@
 import com.alipay.global.api.tools.Constants;
 import com.alipay.global.api.tools.DateTool;
 import com.alipay.global.api.tools.SignatureTool;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.HashMap;
-import java.util.Map;
 
 public abstract class BaseAlipayClient implements AlipayClient {
 
@@ -75,7 +77,7 @@ public <T extends AlipayResponse> T execute(AlipayRequest<T> alipayRequest) thro
         String path = alipayRequest.getPath();
         Integer keyVersion = alipayRequest.getKeyVersion();
         String reqTime = DateTool.getCurrentTimeMillis();
-        String reqBody = JSON.toJSONString(alipayRequest);
+        String reqBody = JSON.toJSONString(alipayRequest, SerializerFeature.DisableCircularReferenceDetect);
 
         /**
          * 对内容加签(Sign the content)
@@ -197,7 +199,7 @@ private String genRequestUrl(String path) {
      * @param alipayRequest
      */
     private void adjustSandboxUrl(AlipayRequest alipayRequest) {
-        if (isSandboxMode) {
+        if (isSandboxMode && alipayRequest.usingSandboxUrl()) {
             String originPath = alipayRequest.getPath();
             alipayRequest.setPath(originPath.replaceFirst("/ams/api", "/ams/sandbox/api"));
         }