add clientId to AlipayClient

Author: ScottWryyyyy

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.25</version>
+    <version>2.0.26</version>
 </dependency>
 ```
 

pom.xml

@@ -4,7 +4,7 @@
     <groupId>com.alipay.global.sdk</groupId>
     <artifactId>global-open-sdk-java</artifactId>
     <packaging>jar</packaging>
-    <version>2.0.25</version>
+    <version>2.0.26</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

@@ -29,6 +29,10 @@ public abstract class BaseAlipayClient implements AlipayClient {
      * alipay public key
      */
     private String alipayPublicKey;
+    /**
+     * client id
+     */
+    private String clientId;
 
     public BaseAlipayClient() {
     }
@@ -39,11 +43,18 @@ public BaseAlipayClient(String gatewayUrl, String merchantPrivateKey, String ali
         this.alipayPublicKey = alipayPublicKey;
     }
 
+    public BaseAlipayClient(String gatewayUrl, String merchantPrivateKey, String alipayPublicKey, String clientId) {
+        this.gatewayUrl = gatewayUrl;
+        this.merchantPrivateKey = merchantPrivateKey;
+        this.alipayPublicKey = alipayPublicKey;
+        this.clientId = clientId;
+    }
+
     public <T extends AlipayResponse> T execute(AlipayRequest<T> alipayRequest) throws AlipayApiException {
 
         checkRequestParam(alipayRequest);
 
-        String clientId = alipayRequest.getClientId();
+        String clientId = alipayRequest.getClientId() == null ? this.clientId : alipayRequest.getClientId();
         String httpMethod = alipayRequest.getHttpMethod();
         String path = alipayRequest.getPath();
         Integer keyVersion = alipayRequest.getKeyVersion();
@@ -115,20 +126,18 @@ private String genSignValue(String httpMethod, String path, String clientId, Str
 
     private boolean checkRspSign(String httpMethod, String path, String clientId, String responseTime, String rspBody, String rspSignValue) throws AlipayApiException {
         try {
-            boolean isVerify = SignatureTool.verify(httpMethod, path, clientId, responseTime, rspBody, rspSignValue, alipayPublicKey);
-            return isVerify;
+            return SignatureTool.verify(httpMethod, path, clientId, responseTime, rspBody, rspSignValue, alipayPublicKey);
         } catch (Exception e) {
             throw new AlipayApiException(e);
         }
-
     }
 
     private void checkRequestParam(AlipayRequest alipayRequest) throws AlipayApiException {
         if (alipayRequest == null) {
             throw new AlipayApiException("alipayRequest can't null");
         }
 
-        String clientId = alipayRequest.getClientId();
+        String clientId = alipayRequest.getClientId() == null ? this.clientId : alipayRequest.getClientId();
         String httpMethod = alipayRequest.getHttpMethod();
         String path = alipayRequest.getPath();
 
@@ -141,7 +150,7 @@ private void checkRequestParam(AlipayRequest alipayRequest) throws AlipayApiExce
         }
 
         if (StringUtils.isBlank(httpMethod)) {
-            throw new AlipayApiException("httpMehod can't null");
+            throw new AlipayApiException("httpMethod can't null");
         }
 
         if (StringUtils.isBlank(path)) {

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

@@ -12,6 +12,10 @@ public DefaultAlipayClient(String gatewayUrl, String merchantPrivateKey, String
         super(gatewayUrl, merchantPrivateKey, alipayPublicKey);
     }
 
+    public DefaultAlipayClient(String gatewayUrl, String merchantPrivateKey, String alipayPublicKey, String clientId) {
+        super(gatewayUrl, merchantPrivateKey, alipayPublicKey, clientId);
+    }
+
     @Override
     public Map<String, String> buildCustomHeader() {
         return null;