refactor: 适配 ContiNew Starter 认证模块-JustAuth

continew-org · Nov 25, 2023 · 7ad8d17 · 7ad8d17
1 parent 86ca8f0
commit 7ad8d17
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 197 deletions.
diff --git a/continew-admin-common/pom.xml b/continew-admin-common/pom.xml
@@ -17,6 +17,12 @@
  <description>公共模块（存放公共工具类，公共配置等）</description>
 
  <dependencies>
+ <!-- ContiNew Starter 认证模块 - JustAuth -->
+ <dependency>
+ <groupId>top.charles7c.continew</groupId>
+ <artifactId>continew-starter-auth-justauth</artifactId>
+ </dependency>
+
  <!-- ContiNew Starter 认证模块 - SaToken -->
  <dependency>
  <groupId>top.charles7c.continew</groupId>
@@ -84,16 +90,6 @@
  <artifactId>sms4j-spring-boot-starter</artifactId>
  </dependency>
 
- <!-- Just Auth（开箱即用的整合第三方登录的开源组件，脱离繁琐的第三方登录 SDK，让登录变得 So easy!） -->
- <dependency>
- <groupId>com.xkcoding.justauth</groupId>
- <artifactId>justauth-spring-boot-starter</artifactId>
- </dependency>
- <dependency>
- <groupId>me.zhyd.oauth</groupId>
- <artifactId>JustAuth</artifactId>
- </dependency>
-
  <!-- Easy Excel（一个基于 Java 的、快速、简洁、解决大文件内存溢出的 Excel 处理工具） -->
  <dependency>
  <groupId>com.alibaba</groupId>

diff --git a/...n/src/main/java/top/charles7c/cnadmin/common/config/justauth/JustAuthRedisStateCache.java b/...n/src/main/java/top/charles7c/cnadmin/common/config/justauth/JustAuthRedisStateCache.java
diff --git a/...rc/main/java/top/charles7c/cnadmin/common/config/justauth/JustAuthStateConfiguration.java b/...rc/main/java/top/charles7c/cnadmin/common/config/justauth/JustAuthStateConfiguration.java
diff --git a/...inew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/CacheConstants.java b/...inew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/CacheConstants.java
@@ -67,9 +67,4 @@ public class CacheConstants {
  * 仪表盘缓存键前缀
  */
  public static final String DASHBOARD_KEY_PREFIX = "DASHBOARD";
-
- /**
- * 三方账号认证状态键前缀
- */
- public static final String SOCIAL_AUTH_STATE_KEY_PREFIX = "SOCIAL_AUTH_STATE";
 }
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/continew-admin-webapi/src/main/resources/config/application-dev.yml b/continew-admin-webapi/src/main/resources/config/application-dev.yml
@@ -83,21 +83,6 @@ spring.cache:
  # 是否允许缓存空值（默认 true，表示允许，可以解决缓存穿透问题）
  cache-null-values: true
 
---- ### Just Auth 配置
-justauth:
- enabled: true
- type:
- GITEE:
- client-id: 5d271b7f638941812aaf8bfc2e2f08f06d6235ef934e0e39537e2364eb8452c4
- client-secret: 1f7d08**********5b7**********29e
- redirect-uri: ${project.url}/social/callback?source=gitee
- GITHUB:
- client-id: 38080dad08cfbdfacca9
- client-secret: 1f7d08**********5b7**********29e
- redirect-uri: ${project.url}/social/callback?source=github
- cache:
- type: custom
-
 --- ### 短信配置
 sms:
  # 从 YAML 读取配置
@@ -177,6 +162,21 @@ springdoc:
  swagger-ui:
  enabled: true
 
+--- ### Just Auth 配置
+justauth:
+ enabled: true
+ type:
+ GITEE:
+ client-id: 5d271b7f638941812aaf8bfc2e2f08f06d6235ef934e0e39537e2364eb8452c4
+ client-secret: 1f7d08**********5b7**********29e
+ redirect-uri: ${project.url}/social/callback?source=gitee
+ GITHUB:
+ client-id: 38080dad08cfbdfacca9
+ client-secret: 1f7d08**********5b7**********29e
+ redirect-uri: ${project.url}/social/callback?source=github
+ cache:
+ type: custom
+
 --- ### Sa-Token 扩展配置
 sa-token.extension:
  # 安全配置：排除（放行）路径配置

diff --git a/continew-admin-webapi/src/main/resources/config/application-prod.yml b/continew-admin-webapi/src/main/resources/config/application-prod.yml
@@ -85,21 +85,6 @@ spring.cache:
  # 是否允许缓存空值（默认 true，表示允许，可以解决缓存穿透问题）
  cache-null-values: true
 
---- ### Just Auth 配置
-justauth:
- enabled: true
- type:
- GITEE:
- client-id: 5d271b7f638941812aaf8bfc2e2f08f06d6235ef934e0e39537e2364eb8452c4
- client-secret: 1f7d08**********5b7**********29e
- redirect-uri: ${project.url}/social/callback?source=gitee
- GITHUB:
- client-id: 38080dad08cfbdfacca9
- client-secret: 1f7d08**********5b7**********29e
- redirect-uri: ${project.url}/social/callback?source=github
- cache:
- type: custom
-
 --- ### 短信配置
 sms:
  # 从 YAML 读取配置
@@ -183,6 +168,21 @@ knife4j:
  # 开启生产环境屏蔽
  production: true
 
+--- ### Just Auth 配置
+justauth:
+ enabled: true
+ type:
+ GITEE:
+ client-id: 5d271b7f638941812aaf8bfc2e2f08f06d6235ef934e0e39537e2364eb8452c4
+ client-secret: 1f7d08**********5b7**********29e
+ redirect-uri: ${project.url}/social/callback?source=gitee
+ GITHUB:
+ client-id: 38080dad08cfbdfacca9
+ client-secret: 1f7d08**********5b7**********29e
+ redirect-uri: ${project.url}/social/callback?source=github
+ cache:
+ type: custom
+
 --- ### Sa-Token 扩展配置
 sa-token.extension:
  # 安全配置：排除（放行）路径配置

diff --git a/pom.xml b/pom.xml
@@ -37,7 +37,6 @@
 
  <!-- ### 工具库相关 ### -->
  <sms4j.version>3.0.4</sms4j.version>
- <justauth.version>1.16.5</justauth.version>
  <easyexcel.version>3.3.2</easyexcel.version>
  <ip2region.version>3.1.5.1</ip2region.version>
 
@@ -56,28 +55,6 @@
  <version>${sms4j.version}</version>
  </dependency>
 
- <!-- Just Auth（开箱即用的整合第三方登录的开源组件，脱离繁琐的第三方登录 SDK，让登录变得 So easy!） -->
- <dependency>
- <groupId>com.xkcoding.justauth</groupId>
- <artifactId>justauth-spring-boot-starter</artifactId>
- <version>1.4.0</version>
- <exclusions>
- <exclusion>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>me.zhyd.oauth</groupId>
- <artifactId>JustAuth</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>me.zhyd.oauth</groupId>
- <artifactId>JustAuth</artifactId>
- <version>${justauth.version}</version>
- </dependency>
-
  <!-- Easy Excel（一个基于 Java 的、快速、简洁、解决大文件内存溢出的 Excel 处理工具） -->
  <dependency>
  <groupId>com.alibaba</groupId>