Merge pull request #28 from luoqiz/master

feat: 发布1.4.1
2025-12-16 03:14:53 +08:00 · 2025-01-13 16:16:18 +08:00 · 2025-01-13 16:10:00 +08:00 · 2025-01-13 16:09:31 +08:00 · 2024-12-14 19:18:11 +08:00 · 2024-12-14 19:18:01 +08:00
6 changed files with 181 additions and 21 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 ## 版本更新记录

+### 【1.4.0】2021-05-10
+
+- 升级 `JustAuth` 版本：1.16.1，新增Amazon、Slack、LINE、Okta、钉钉账号登录，同时修复若干BUG，详细信息请参考参考：https://github.com/justauth/JustAuth/blob/master/CHANGELOGS.md#1161
+- 升级 `hutool-core` 版本：5.6.5
+
+### 【1.3.5】2021-01-04
+
+- 升级 `JustAuth` 版本：1.15.9，新增飞书、京东、阿里云、喜马拉雅、企业微信网页端登录
+- 升级 `hutool-core` 版本：5.5.6
+
+### 【1.3.4】2020-09-12
+
+- 升级 `JustAuth` 版本：1.15.7，更新最新的 GitHub API
+
 ### 【1.3.4.beta】2020-08-29

 - 升级 `JustAuth` 版本：1.15.7-beta.3，支持自定义 http config 以及自定义 scopes
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ https://github.com/xkcoding/justauth-spring-boot-starter-demo
 <dependency>
  <groupId>com.xkcoding.justauth</groupId>
  <artifactId>justauth-spring-boot-starter</artifactId>
-  <version>1.3.4.beta</version>
+  <version>1.4.0</version>
 </dependency>
 ```

@@ -172,6 +172,24 @@ justauth:
      client-id: 10**********6
      client-secret: 1f7d08**********5b7**********29e
      redirect-uri: http://oauth.xkcoding.com/demo/oauth/twitter/callback
+    XMLY:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: http://oauth.xkcoding.com/demo/oauth/xmly/callback
+      # 设备唯一标识ID
+      device-id: xxxxxxxxxxxxxx
+      # 客户端操作系统类型，1-iOS系统，2-Android系统，3-Web
+      client-os-type: 3
+      # 客户端包名，如果 clientOsType 为1或2时必填。对Android客户端是包名，对IOS客户端是Bundle ID
+      #pack-id: xxxx
+    FEISHU:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: http://oauth.xkcoding.com/demo/oauth/feishu/callback
+    JD:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: http://oauth.xkcoding.com/demo/oauth/jd/callback
  cache:
    type: default
 ```
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@

  <groupId>com.xkcoding.justauth</groupId>
  <artifactId>justauth-spring-boot-starter</artifactId>
-  <version>1.3.4.beta</version>
+  <version>1.4.1</version>

  <name>justauth-spring-boot-starter</name>
  <url>https://github.com/xkcoding/justauth-spring-boot-starter</url>
@@ -72,8 +72,8 @@
    <!--SpringBoot版本-->
    <spring-boot.version>2.1.8.RELEASE</spring-boot.version>
    <!--JustAuth版本-->
-    <justauth.version>1.15.7-beta.3</justauth.version>
-    <hutool.version>5.4.0</hutool.version>
+    <justauth.version>1.16.7</justauth.version>
+    <hutool.version>5.8.35</hutool.version>
  </properties>

  <dependencies>
--- a/src/main/java/com/xkcoding/justauth/AuthRequestFactory.java
+++ b/src/main/java/com/xkcoding/justauth/AuthRequestFactory.java
@@ -186,6 +186,10 @@ public class AuthRequestFactory {
                return new AuthGiteeRequest(config, authStateCache);
            case DINGTALK:
                return new AuthDingTalkRequest(config, authStateCache);
+            case DINGTALK_V2:
+                return new AuthDingTalkV2Request(config, authStateCache);
+            case DINGTALK_ACCOUNT:
+                return new AuthDingTalkAccountRequest(config, authStateCache);
            case BAIDU:
                return new AuthBaiduRequest(config, authStateCache);
            case CSDN:
@@ -198,12 +202,10 @@ public class AuthRequestFactory {
                return new AuthAlipayRequest(config, authStateCache);
            case QQ:
                return new AuthQqRequest(config, authStateCache);
-            case WECHAT_MP:
-                return new AuthWeChatMpRequest(config, authStateCache);
            case WECHAT_OPEN:
                return new AuthWeChatOpenRequest(config, authStateCache);
-            case WECHAT_ENTERPRISE:
-                return new AuthWeChatEnterpriseRequest(config, authStateCache);
+            case WECHAT_MP:
+                return new AuthWeChatMpRequest(config, authStateCache);
            case TAOBAO:
                return new AuthTaobaoRequest(config, authStateCache);
            case GOOGLE:
@@ -216,6 +218,9 @@ public class AuthRequestFactory {
                return new AuthLinkedinRequest(config, authStateCache);
            case MICROSOFT:
                return new AuthMicrosoftRequest(config, authStateCache);
+            case MICROSOFT_CN:
+                return new AuthMicrosoftCnRequest(config, authStateCache);
+
            case MI:
                return new AuthMiRequest(config, authStateCache);
            case TOUTIAO:
@@ -230,16 +235,58 @@ public class AuthRequestFactory {
                return new AuthStackOverflowRequest(config, authStateCache);
            case HUAWEI:
                return new AuthHuaweiRequest(config, authStateCache);
-            case GITLAB:
-                return new AuthGitlabRequest(config, authStateCache);
+            case HUAWEI_V3:
+                return new AuthHuaweiV3Request(config, authStateCache);
+            case WECHAT_ENTERPRISE:
+                return new AuthWeChatEnterpriseQrcodeRequest(config, authStateCache);
+            case WECHAT_ENTERPRISE_V2:
+                return new AuthWeChatEnterpriseQrcodeV2Request(config, authStateCache);
+            case WECHAT_ENTERPRISE_QRCODE_THIRD:
+                return new AuthWeChatEnterpriseThirdQrcodeRequest(config, authStateCache);
+            case WECHAT_ENTERPRISE_WEB:
+                return new AuthWeChatEnterpriseWebRequest(config, authStateCache);
            case KUJIALE:
                return new AuthKujialeRequest(config, authStateCache);
-            case ELEME:
-                return new AuthElemeRequest(config, authStateCache);
+            case GITLAB:
+                return new AuthGitlabRequest(config, authStateCache);
            case MEITUAN:
                return new AuthMeituanRequest(config, authStateCache);
-            case TWITTER:
+            case ELEME:
+                return new AuthElemeRequest(config, authStateCache);
+           case TWITTER:
                return new AuthTwitterRequest(config, authStateCache);
+            case FEISHU:
+                return new AuthFeishuRequest(config, authStateCache);
+            case JD:
+                return new AuthJdRequest(config, authStateCache);
+            case ALIYUN:
+                return new AuthAliyunRequest(config, authStateCache);
+            case XMLY:
+                return new AuthXmlyRequest(config, authStateCache);
+            case AMAZON:
+                return new AuthAmazonRequest(config, authStateCache);
+            case SLACK:
+                return new AuthSlackRequest(config, authStateCache);
+            case LINE:
+                return new AuthLineRequest(config, authStateCache);
+            case OKTA:
+                return new AuthOktaRequest(config, authStateCache);
+            case PROGINN:
+                return new AuthProginnRequest(config,authStateCache);
+            case AFDIAN:
+                return new AuthAfDianRequest(config,authStateCache);
+            case APPLE:
+                return new AuthAppleRequest(config,authStateCache);
+            case FIGMA:
+                return new AuthFigmaRequest(config,authStateCache);
+            case WECHAT_MINI_PROGRAM:
+                config.setIgnoreCheckRedirectUri(true);
+                config.setIgnoreCheckState(true);
+                return new AuthWechatMiniProgramRequest(config, authStateCache);
+            case QQ_MINI_PROGRAM:
+                config.setIgnoreCheckRedirectUri(true);
+                config.setIgnoreCheckState(true);
+                return new AuthQQMiniProgramRequest(config, authStateCache);
            default:
                return null;
        }
--- a/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -19,6 +19,14 @@
          "value": "DINGTALK",
          "description": "DINGTALK."
        },
+        {
+          "value": "DINGTALK_V2",
+          "description": "DINGTALK_V2."
+        },
+        {
+          "value": "DINGTALK_ACCOUNT",
+          "description": "DINGTALK_ACCOUNT."
+        },
        {
          "value": "BAIDU",
          "description": "BAIDU."
@@ -43,6 +51,14 @@
          "value": "QQ",
          "description": "QQ."
        },
+        {
+          "value": "WECHAT_OPEN",
+          "description": "WeChat open platform."
+        },
+        {
+          "value": "WECHAT_MP",
+          "description": "WeChat Official Platform."
+        },
        {
          "value": "TAOBAO",
          "description": "TAOBAO."
@@ -67,6 +83,10 @@
          "value": "MICROSOFT",
          "description": "MICROSOFT."
        },
+        {
+          "value": "MICROSOFT_CN",
+          "description": "MICROSOFT_CN."
+        },
        {
          "value": "MI",
          "description": "MI."
@@ -96,16 +116,24 @@
          "description": "HUAWEI."
        },
        {
-          "value": "WECHAT_OPEN",
-          "description": "WeChat open platform."
+          "value": "HUAWEI_V3",
+          "description": "HUAWEI_V3."
        },
        {
          "value": "WECHAT_ENTERPRISE",
          "description": "WeChat enterprise platform."
        },
        {
-          "value": "WECHAT_MP",
-          "description": "WeChat Official Platform."
+          "value": "WECHAT_ENTERPRISE_V2",
+          "description": "WeChat enterprise platform v2."
+        },
+        {
+          "value": "WECHAT_ENTERPRISE_QRCODE_THIRD",
+          "description": "WeChat enterprise qrcode third."
+        },
+        {
+          "value": "WECHAT_ENTERPRISE_WEB",
+          "description": "WeChat enterprise web."
        },
        {
          "value": "KUJIALE",
@@ -123,17 +151,69 @@
          "value": "ELEME",
          "description": "ELEME."
        },
-        {
-          "value": "GITLAB",
-          "description": "GITLAB."
-        },
        {
          "value": "TWITTER",
          "description": "TWITTER."
        },
+        {
+          "value": "FEISHU",
+          "description": "FEISHU."
+        },
+        {
+          "value": "GITLAB",
+          "description": "GITLAB."
+        },
+        {
+          "value": "JD",
+          "description": "JD."
+        },
        {
          "value": "ALIYUN",
          "description": "ALIYUN."
+        },
+        {
+          "value": "XMLY",
+          "description": "XMLY."
+        },
+        {
+          "value": "AMAZON",
+          "description": "AMAZON."
+        },
+        {
+          "value": "SLACK",
+          "description": "SLACK."
+        },
+        {
+          "value": "LINE",
+          "description": "LINE."
+        },
+        {
+          "value": "OKTA",
+          "description": "OKTA."
+        },
+        {
+          "value": "PROGINN",
+          "description": "PROGINN."
+        },
+        {
+          "value": "AFDIAN",
+          "description": "AFDIAN."
+        },
+        {
+          "value": "APPLE",
+          "description": "APPLE."
+        },
+        {
+          "value": "FIGMA",
+          "description": "FIGMA."
+        },
+        {
+          "value": "WECHAT_MINI_PROGRAM",
+          "description": "WECHAT_MINI_PROGRAM."
+        },
+        {
+          "value": "QQ_MINI_PROGRAM",
+          "description": "QQ_MINI_PROGRAM."
        }
      ]
    },
--- a/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.xkcoding.justauth.autoconfigure.JustAuthAutoConfiguration
Author	SHA1	Message	Date
yadong.zhang	613579f432	Merge pull request #28 from luoqiz/master feat: 发布1.4.1	2025-01-13 16:16:18 +08:00
luoqiz	64a3a32e5a	feat: 发布1.4.1	2025-01-13 16:10:00 +08:00
luoqiz	0f6322d850	feat: 升级hutool	2025-01-13 16:09:31 +08:00
yadong.zhang	8f007ca121	Merge pull request #21 from justauth/dependabot/maven/cn.hutool-hutool-core-5.8.19 ⬆️ Bump hutool-core from 5.6.5 to 5.8.19	2024-12-14 19:18:11 +08:00
yadong.zhang	fb8a8b2132	Merge branch 'master' into dependabot/maven/cn.hutool-hutool-core-5.8.19	2024-12-14 19:18:01 +08:00
yadong.zhang	b39f515ecd	Merge pull request #24 from zzzgr/master ⬆️springboot3支持	2024-12-14 19:16:52 +08:00
yadong.zhang	b043116d3c	Merge pull request #26 from luoqiz/feat-update-justauth feat: 升级justauth 1.16.7	2024-12-14 19:16:22 +08:00
luoqiz	500a79b3e6	feat: 升级justauth 1.16.7	2024-12-14 18:57:45 +08:00
yiidii	41e7b958a0	⬆️springboot3支持	2024-04-16 10:29:10 +08:00
dependabot[bot]	c1dc04d4ef	⬆️ Bump hutool-core from 5.6.5 to 5.8.19 Bumps [hutool-core](https://github.com/dromara/hutool) from 5.6.5 to 5.8.19. - [Release notes](https://github.com/dromara/hutool/releases) - [Changelog](https://github.com/dromara/hutool/blob/v5-master/CHANGELOG.md) - [Commits](https://github.com/dromara/hutool/compare/5.6.5...5.8.19) --- updated-dependencies: - dependency-name: cn.hutool:hutool-core dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2023-06-14 16:39:36 +00:00
Yangkai.Shen	4233902219	🔖 发布 1.4.0	2021-05-10 15:55:28 +08:00
Yangkai.Shen	7f04dd3bfd	📝 编写更新记录	2021-01-04 18:50:43 +08:00
yadong.zhang	b24d490024	⬆️ 升级 `JustAuth` 版本：1.15.9，新增飞书、京东、阿里云、喜马拉雅、企业微信网页端登录	2021-01-04 11:12:32 +08:00
Yangkai.Shen	4250bdcf0c	📝 编写文档	2020-09-12 08:12:23 +08:00
Yangkai.Shen	be41025184	🔖 发布 1.3.4	2020-09-12 08:11:35 +08:00
Yangkai.Shen	e283b4731a	📝 更新记录	2020-09-12 08:11:09 +08:00
Yangkai.Shen	155786d42d	⬆️ 依赖升级，JustAuth 1.15.7.beta3 -> 1.15.7	2020-09-12 08:09:42 +08:00
				`@@ -0,0 +1 @@`
				`com.xkcoding.justauth.autoconfigure.JustAuthAutoConfiguration`