refactor: 升级框架

agt-framework/agt-spring-boot-starter-security/pom.xml

@@ -54,13 +54,6 @@
             <optional>true</optional>
         </dependency>
 
-        <!-- 业务组件 -->
-        <dependency>
-            <groupId>org.agt</groupId>
-            <artifactId>agt-module-system-api</artifactId> <!-- 需要使用它，进行 Token 的校验 -->
-            <version>${revision}</version>
-        </dependency>
-
         <!-- 工具类相关 -->
         <dependency>
             <groupId>com.google.guava</groupId>

agt-framework/agt-spring-boot-starter-security/src/main/java/org/agt/framework/operatelog/config/AgtOperateLogRpcAutoConfiguration.java

@@ -1,6 +1,6 @@
 package org.agt.framework.operatelog.config;
 
-import org.agt.module.system.api.logger.OperateLogApi;
+import org.agt.framework.common.biz.system.logger.OperateLogCommonApi;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
@@ -10,6 +10,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * @author 千通源码
  */
 @AutoConfiguration
-@EnableFeignClients(clients = {OperateLogApi.class}) // 主要是引入相关的 API 服务
+@EnableFeignClients(clients = {OperateLogCommonApi.class}) // 主要是引入相关的 API 服务
 public class AgtOperateLogRpcAutoConfiguration {
 }

agt-framework/agt-spring-boot-starter-security/src/main/java/org/agt/framework/operatelog/core/service/LogRecordServiceImpl.java

@@ -1,23 +1,24 @@
 package org.agt.framework.operatelog.core.service;
 
+import org.agt.framework.common.biz.system.logger.OperateLogCommonApi;
 import org.agt.framework.common.util.monitor.TracerUtils;
 import org.agt.framework.common.util.servlet.ServletUtils;
 import org.agt.framework.security.core.LoginUser;
 import org.agt.framework.security.core.util.SecurityFrameworkUtils;
-import org.agt.module.system.api.logger.OperateLogApi;
-import org.agt.module.system.api.logger.dto.OperateLogCreateReqDTO;
+import org.agt.framework.common.biz.system.logger.dto.OperateLogCreateReqDTO;
 import com.mzt.logapi.beans.LogRecord;
 import com.mzt.logapi.service.ILogRecordService;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Qualifier;
 
 import java.util.List;
 
 /**
  * 操作日志 ILogRecordService 实现类
  *
- * 基于 {@link OperateLogApi} 实现，记录操作日志
+ * 基于 {@link OperateLogCommonApi} 实现，记录操作日志
  *
  * @author HUIHUI
  */
@@ -25,7 +26,7 @@ import java.util.List;
 public class LogRecordServiceImpl implements ILogRecordService {
 
     @Resource
-    private OperateLogApi operateLogApi;
+    private OperateLogCommonApi operateLogApi;
 
     @Override
     public void record(LogRecord logRecord) {

agt-framework/agt-spring-boot-starter-security/src/main/java/org/agt/framework/security/config/AgtSecurityAutoConfiguration.java

@@ -1,5 +1,6 @@
 package org.agt.framework.security.config;
 
+import org.agt.framework.common.biz.system.permission.PermissionCommonApi;
 import org.agt.framework.security.core.context.TransmittableThreadLocalSecurityContextHolderStrategy;
 import org.agt.framework.security.core.filter.TokenAuthenticationFilter;
 import org.agt.framework.security.core.handler.AccessDeniedHandlerImpl;
@@ -7,8 +8,7 @@ import org.agt.framework.security.core.handler.AuthenticationEntryPointImpl;
 import org.agt.framework.security.core.service.SecurityFrameworkService;
 import org.agt.framework.security.core.service.SecurityFrameworkServiceImpl;
 import org.agt.framework.web.core.handler.GlobalExceptionHandler;
-import org.agt.module.system.api.oauth2.OAuth2TokenApi;
-import org.agt.module.system.api.permission.PermissionApi;
+import org.agt.framework.common.biz.system.oauth2.OAuth2TokenCommonApi;
 import jakarta.annotation.Resource;
 import org.springframework.beans.factory.config.MethodInvokingFactoryBean;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -69,12 +69,12 @@ public class AgtSecurityAutoConfiguration {
      */
     @Bean
     public TokenAuthenticationFilter authenticationTokenFilter(GlobalExceptionHandler globalExceptionHandler,
-                                                               OAuth2TokenApi oauth2TokenApi) {
+                                                               OAuth2TokenCommonApi oauth2TokenApi) {
         return new TokenAuthenticationFilter(securityProperties, globalExceptionHandler, oauth2TokenApi);
     }
 
     @Bean("ss") // 使用 Spring Security 的缩写，方便使用
-    public SecurityFrameworkService securityFrameworkService(PermissionApi permissionApi) {
+    public SecurityFrameworkService securityFrameworkService(PermissionCommonApi permissionApi) {
         return new SecurityFrameworkServiceImpl(permissionApi);
     }
 

agt-framework/agt-spring-boot-starter-security/src/main/java/org/agt/framework/security/config/AgtSecurityRpcAutoConfiguration.java

@@ -1,8 +1,8 @@
 package org.agt.framework.security.config;
 
+import org.agt.framework.common.biz.system.permission.PermissionCommonApi;
 import org.agt.framework.security.core.rpc.LoginUserRequestInterceptor;
-import org.agt.module.system.api.oauth2.OAuth2TokenApi;
-import org.agt.module.system.api.permission.PermissionApi;
+import org.agt.framework.common.biz.system.oauth2.OAuth2TokenCommonApi;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
@@ -13,8 +13,8 @@ import org.springframework.context.annotation.Bean;
  * @author 千通源码
  */
 @AutoConfiguration
-@EnableFeignClients(clients = {OAuth2TokenApi.class, // 主要是引入相关的 API 服务
-        PermissionApi.class})
+@EnableFeignClients(clients = {OAuth2TokenCommonApi.class, // 主要是引入相关的 API 服务
+        PermissionCommonApi.class})
 public class AgtSecurityRpcAutoConfiguration {
 
     @Bean

agt-framework/agt-spring-boot-starter-security/src/main/java/org/agt/framework/security/core/filter/TokenAuthenticationFilter.java

@@ -11,8 +11,8 @@ import org.agt.framework.security.core.LoginUser;
 import org.agt.framework.security.core.util.SecurityFrameworkUtils;
 import org.agt.framework.web.core.handler.GlobalExceptionHandler;
 import org.agt.framework.web.core.util.WebFrameworkUtils;
-import org.agt.module.system.api.oauth2.OAuth2TokenApi;
-import org.agt.module.system.api.oauth2.dto.OAuth2AccessTokenCheckRespDTO;
+import org.agt.framework.common.biz.system.oauth2.OAuth2TokenCommonApi;
+import org.agt.framework.common.biz.system.oauth2.dto.OAuth2AccessTokenCheckRespDTO;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
@@ -40,7 +40,7 @@ public class TokenAuthenticationFilter extends OncePerRequestFilter {
 
     private final GlobalExceptionHandler globalExceptionHandler;
 
-    private final OAuth2TokenApi oauth2TokenApi;
+    private final OAuth2TokenCommonApi oauth2TokenApi;
 
     @Override
     @SuppressWarnings("NullableProblems")

agt-framework/agt-spring-boot-starter-security/src/main/java/org/agt/framework/security/core/service/SecurityFrameworkServiceImpl.java

@@ -1,10 +1,10 @@
 package org.agt.framework.security.core.service;
 
 import cn.hutool.core.collection.CollUtil;
+import org.agt.framework.common.biz.system.permission.PermissionCommonApi;
 import org.agt.framework.common.core.KeyValue;
 import org.agt.framework.security.core.LoginUser;
 import org.agt.framework.security.core.util.SecurityFrameworkUtils;
-import org.agt.module.system.api.permission.PermissionApi;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import lombok.AllArgsConstructor;
@@ -26,7 +26,7 @@ import static org.agt.framework.security.core.util.SecurityFrameworkUtils.skipPe
 @AllArgsConstructor
 public class SecurityFrameworkServiceImpl implements SecurityFrameworkService {
 
-    private final PermissionApi permissionApi;
+    private final PermissionCommonApi permissionApi;
 
     /**
      * 针对 {@link #hasAnyRoles(String...)} 的缓存