...
 
Commits (6)
    https://gitcode.net/justauth/JustAuth/-/commit/99c9ba2854da0134f4ebcb61dab3e2f7112a05d7 Using TCK Tested JDK builds of OpenJDK 2021-09-27T14:36:33-04:00 Carl Dea carl.dea@gmail.com 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. https://gitcode.net/justauth/JustAuth/-/commit/f9e3053eccd6b2437968a73b807835a8c2b10f39 Using TCK Tested JDK builds of OpenJDK 2021-09-27T14:37:10-04:00 Carl Dea carl.dea@gmail.com 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. https://gitcode.net/justauth/JustAuth/-/commit/172ba7be55b26d26468706a7e5ac07e44c8c55cc :hankey: 修改用户logo的尺寸 2021-10-16T19:10:24+08:00 yadong.zhang yadong.zhang0415@gmail.com https://gitcode.net/justauth/JustAuth/-/commit/e134dd06b02a03523470f104203d51c5fb0bf68d :arrow_up: 升级alipay-sdk-version的依赖版本 2021-10-16T19:10:50+08:00 yadong.zhang yadong.zhang0415@gmail.com https://gitcode.net/justauth/JustAuth/-/commit/a3108caccf9063adb2832ad63f27cfb4a7f759cb :bug: 修复 alipay 登录失败的 BUG 2021-10-16T19:11:24+08:00 yadong.zhang yadong.zhang0415@gmail.com https://gitcode.net/justauth/JustAuth/-/commit/f1714726f552c8128c2f552e2e2ce67405c3f88c Merge branch 'carldea/master' into dev 2021-10-18T09:55:40+08:00 yadong.zhang yadong.zhang0415@gmail.com
...@@ -16,7 +16,7 @@ jobs: ...@@ -16,7 +16,7 @@ jobs:
uses: actions/setup-java@v2 uses: actions/setup-java@v2
with: with:
java-version: '8' java-version: '8'
distribution: 'adopt' distribution: 'zulu'
- name: Cache m2 package - name: Cache m2 package
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
...@@ -36,7 +36,7 @@ jobs: ...@@ -36,7 +36,7 @@ jobs:
uses: actions/setup-java@v2 uses: actions/setup-java@v2
with: with:
java-version: '8' java-version: '8'
distribution: 'adopt' distribution: 'zulu'
server-id: ossrh server-id: ossrh
server-username: MAVEN_USERNAME server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD server-password: MAVEN_PASSWORD
......
...@@ -15,7 +15,7 @@ jobs: ...@@ -15,7 +15,7 @@ jobs:
uses: actions/setup-java@v2 uses: actions/setup-java@v2
with: with:
java-version: '8' java-version: '8'
distribution: 'adopt' distribution: 'zulu'
- name: Cache m2 package - name: Cache m2 package
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
......
docs/users/bjgyol.png

9.5 KB | W: | H:

docs/users/bjgyol.png

3.2 KB | W: | H:

docs/users/bjgyol.png
docs/users/bjgyol.png
docs/users/bjgyol.png
docs/users/bjgyol.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<groupId>me.zhyd.oauth</groupId> <groupId>me.zhyd.oauth</groupId>
<artifactId>JustAuth</artifactId> <artifactId>JustAuth</artifactId>
<version>1.16.4</version> <version>1.16.5</version>
<name>JustAuth</name> <name>JustAuth</name>
<url>https://gitee.com/yadong.zhang/JustAuth</url> <url>https://gitee.com/yadong.zhang/JustAuth</url>
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<lombok-version>1.18.20</lombok-version> <lombok-version>1.18.20</lombok-version>
<junit-version>4.13.2</junit-version> <junit-version>4.13.2</junit-version>
<fastjson-version>1.2.78</fastjson-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> <jacoco-version>0.8.2</jacoco-version>
</properties> </properties>
......
...@@ -41,6 +41,8 @@ public class AuthAlipayRequest extends AuthDefaultRequest { ...@@ -41,6 +41,8 @@ public class AuthAlipayRequest extends AuthDefaultRequest {
private final AlipayClient alipayClient; 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) * @see AuthAlipayRequest#AuthAlipayRequest(me.zhyd.oauth.config.AuthConfig, java.lang.String)
* @deprecated 请使用带有"alipayPublicKey"参数的构造方法 * @deprecated 请使用带有"alipayPublicKey"参数的构造方法
...@@ -78,8 +80,8 @@ public class AuthAlipayRequest extends AuthDefaultRequest { ...@@ -78,8 +80,8 @@ public class AuthAlipayRequest extends AuthDefaultRequest {
public AuthAlipayRequest(AuthConfig config, String alipayPublicKey) { public AuthAlipayRequest(AuthConfig config, String alipayPublicKey) {
super(config, AuthDefaultSource.ALIPAY); super(config, AuthDefaultSource.ALIPAY);
this.alipayPublicKey = determineAlipayPublicKey(alipayPublicKey, config); this.alipayPublicKey = determineAlipayPublicKey(alipayPublicKey, config);
this.alipayClient = new DefaultAlipayClient(AuthDefaultSource.ALIPAY.accessToken(), config.getClientId(), config.getClientSecret(), "json", "UTF-8", alipayPublicKey, "RSA2");
check(config); 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 { ...@@ -92,16 +94,16 @@ public class AuthAlipayRequest extends AuthDefaultRequest {
public AuthAlipayRequest(AuthConfig config, String alipayPublicKey, AuthStateCache authStateCache) { public AuthAlipayRequest(AuthConfig config, String alipayPublicKey, AuthStateCache authStateCache) {
super(config, AuthDefaultSource.ALIPAY, authStateCache); super(config, AuthDefaultSource.ALIPAY, authStateCache);
this.alipayPublicKey = determineAlipayPublicKey(alipayPublicKey, config); this.alipayPublicKey = determineAlipayPublicKey(alipayPublicKey, config);
check(config);
if (config.getHttpConfig() != null && config.getHttpConfig().getProxy() != null if (config.getHttpConfig() != null && config.getHttpConfig().getProxy() != null
&& config.getHttpConfig().getProxy().address() instanceof InetSocketAddress) { && config.getHttpConfig().getProxy().address() instanceof InetSocketAddress) {
InetSocketAddress address = (InetSocketAddress) config.getHttpConfig().getProxy().address(); InetSocketAddress address = (InetSocketAddress) config.getHttpConfig().getProxy().address();
this.alipayClient = new DefaultAlipayClient(AuthDefaultSource.ALIPAY.accessToken(), config.getClientId(), config.getClientSecret(), this.alipayClient = new DefaultAlipayClient(GATEWAY, config.getClientId(), config.getClientSecret(),
"json", "UTF-8", alipayPublicKey, "RSA2", address.getHostName(), address.getPort()); "json", "UTF-8", this.alipayPublicKey, "RSA2", address.getHostName(), address.getPort());
} else { } else {
this.alipayClient = new DefaultAlipayClient(AuthDefaultSource.ALIPAY.accessToken(), config.getClientId(), config.getClientSecret(), this.alipayClient = new DefaultAlipayClient(GATEWAY, config.getClientId(), config.getClientSecret(),
"json", "UTF-8", alipayPublicKey, "RSA2"); "json", "UTF-8", this.alipayPublicKey, "RSA2");
} }
check(config);
} }
/** /**
...@@ -114,9 +116,9 @@ public class AuthAlipayRequest extends AuthDefaultRequest { ...@@ -114,9 +116,9 @@ public class AuthAlipayRequest extends AuthDefaultRequest {
public AuthAlipayRequest(AuthConfig config, String alipayPublicKey, AuthStateCache authStateCache, String proxyHost, Integer proxyPort) { public AuthAlipayRequest(AuthConfig config, String alipayPublicKey, AuthStateCache authStateCache, String proxyHost, Integer proxyPort) {
super(config, AuthDefaultSource.ALIPAY, authStateCache); super(config, AuthDefaultSource.ALIPAY, authStateCache);
this.alipayPublicKey = determineAlipayPublicKey(alipayPublicKey, config); 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); 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) { private String determineAlipayPublicKey(String alipayPublicKey, AuthConfig config) {
......