📝 更新说明

The AdoptOpenJDK has been discontinued since July 2021. When using Zulu you get all the latest updated (TCK Tested) builds for all versions of OpenJDK included archived major fixed versions.

.github/workflows/deploy-snapshot.yml

@@ -16,7 +16,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           java-version: '8'
-          distribution: 'adopt'
+          distribution: 'zulu'
       - name: Cache m2 package
         uses: actions/cache@v2
         with:
@@ -36,7 +36,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           java-version: '8'
-          distribution: 'adopt'
+          distribution: 'zulu'
           server-id: ossrh
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD

.github/workflows/test-pr.yml

@@ -15,7 +15,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           java-version: '8'
-          distribution: 'adopt'
+          distribution: 'zulu'
       - name: Cache m2 package
         uses: actions/cache@v2
         with:

CHANGELOGS.md

@@ -1,3 +1,13 @@
+## 1.16.5
+
+### 2021/10/18
+
+- 合并 PR [Github #138](https://github.com/justauth/JustAuth/pull/138)
+- 升级alipay-sdk-version的依赖版本
+- 修改用户logo的尺寸
+- 修复 alipay 登录失败的 BUG [Gitee Issue #I4E4ML](https://gitee.com/yadong.zhang/JustAuth/issues/I4E4ML)
+
+
 ## 1.16.4
 
 ### 2021/9/22

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>me.zhyd.oauth</groupId>
   <artifactId>JustAuth</artifactId>
-  <version>1.16.4</version>
+  <version>1.16.5</version>
 
   <name>JustAuth</name>
   <url>https://gitee.com/yadong.zhang/JustAuth</url>
@@ -61,7 +61,7 @@
     <lombok-version>1.18.20</lombok-version>
     <junit-version>4.13.2</junit-version>
     <fastjson-version>1.2.78</fastjson-version>
-    <alipay-sdk-version>4.16.38.ALL</alipay-sdk-version>
+    <alipay-sdk-version>4.17.5.ALL</alipay-sdk-version>
     <jacoco-version>0.8.2</jacoco-version>
   </properties>
 

src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java

@@ -41,6 +41,8 @@ public class AuthAlipayRequest extends AuthDefaultRequest {
 
     private final AlipayClient alipayClient;
 
+    private static final String GATEWAY = "https://openapi.alipay.com/gateway.do";
+
     /**
      * @see AuthAlipayRequest#AuthAlipayRequest(me.zhyd.oauth.config.AuthConfig, java.lang.String)
      * @deprecated 请使用带有"alipayPublicKey"参数的构造方法
@@ -78,8 +80,8 @@ public class AuthAlipayRequest extends AuthDefaultRequest {
     public AuthAlipayRequest(AuthConfig config, String alipayPublicKey) {
         super(config, AuthDefaultSource.ALIPAY);
         this.alipayPublicKey = determineAlipayPublicKey(alipayPublicKey, config);
-        this.alipayClient = new DefaultAlipayClient(AuthDefaultSource.ALIPAY.accessToken(), config.getClientId(), config.getClientSecret(), "json", "UTF-8", alipayPublicKey, "RSA2");
         check(config);
+        this.alipayClient = new DefaultAlipayClient(GATEWAY, config.getClientId(), config.getClientSecret(), "json", "UTF-8", this.alipayPublicKey, "RSA2");
     }
 
     /**
@@ -92,16 +94,16 @@ public class AuthAlipayRequest extends AuthDefaultRequest {
     public AuthAlipayRequest(AuthConfig config, String alipayPublicKey, AuthStateCache authStateCache) {
         super(config, AuthDefaultSource.ALIPAY, authStateCache);
         this.alipayPublicKey = determineAlipayPublicKey(alipayPublicKey, config);
+        check(config);
         if (config.getHttpConfig() != null && config.getHttpConfig().getProxy() != null
             && config.getHttpConfig().getProxy().address() instanceof InetSocketAddress) {
             InetSocketAddress address = (InetSocketAddress) config.getHttpConfig().getProxy().address();
-            this.alipayClient = new DefaultAlipayClient(AuthDefaultSource.ALIPAY.accessToken(), config.getClientId(), config.getClientSecret(),
-                "json", "UTF-8", alipayPublicKey, "RSA2", address.getHostName(), address.getPort());
+            this.alipayClient = new DefaultAlipayClient(GATEWAY, config.getClientId(), config.getClientSecret(),
+                "json", "UTF-8", this.alipayPublicKey, "RSA2", address.getHostName(), address.getPort());
         } else {
-            this.alipayClient = new DefaultAlipayClient(AuthDefaultSource.ALIPAY.accessToken(), config.getClientId(), config.getClientSecret(),
-                "json", "UTF-8", alipayPublicKey, "RSA2");
+            this.alipayClient = new DefaultAlipayClient(GATEWAY, config.getClientId(), config.getClientSecret(),
+                "json", "UTF-8", this.alipayPublicKey, "RSA2");
         }
-        check(config);
     }
 
     /**
@@ -114,9 +116,9 @@ public class AuthAlipayRequest extends AuthDefaultRequest {
     public AuthAlipayRequest(AuthConfig config, String alipayPublicKey, AuthStateCache authStateCache, String proxyHost, Integer proxyPort) {
         super(config, AuthDefaultSource.ALIPAY, authStateCache);
         this.alipayPublicKey = determineAlipayPublicKey(alipayPublicKey, config);
-        this.alipayClient = new DefaultAlipayClient(AuthDefaultSource.ALIPAY.accessToken(), config.getClientId(), config.getClientSecret(),
-            "json", "UTF-8", alipayPublicKey, "RSA2", proxyHost, proxyPort);
         check(config);
+        this.alipayClient = new DefaultAlipayClient(GATEWAY, config.getClientId(), config.getClientSecret(),
+            "json", "UTF-8", this.alipayPublicKey, "RSA2", proxyHost, proxyPort);
     }
 
     private String determineAlipayPublicKey(String alipayPublicKey, AuthConfig config) {