refactor: 升级框架

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

@@ -61,18 +61,6 @@
             <optional>true</optional>
         </dependency>
 
-        <!-- 业务组件 -->
-        <dependency>
-            <groupId>org.agt</groupId>
-            <artifactId>agt-module-infra-api</artifactId> <!-- 需要使用它，进行操作日志的记录 -->
-            <version>${revision}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.agt</groupId>
-            <artifactId>agt-module-system-api</artifactId> <!-- 需要使用它，进行错误码的记录 -->
-            <version>${revision}</version>
-        </dependency>
-
         <!-- xss -->
         <dependency>
             <groupId>org.jsoup</groupId>

agt-framework/agt-spring-boot-starter-web/src/main/java/org/agt/framework/apilog/config/AgtApiLogAutoConfiguration.java

@@ -2,10 +2,10 @@ package org.agt.framework.apilog.config;
 
 import org.agt.framework.apilog.core.filter.ApiAccessLogFilter;
 import org.agt.framework.apilog.core.interceptor.ApiAccessLogInterceptor;
+import org.agt.framework.common.biz.infra.logger.ApiAccessLogCommonApi;
 import org.agt.framework.common.enums.WebFilterOrderEnum;
 import org.agt.framework.web.config.WebProperties;
 import org.agt.framework.web.config.AgtWebAutoConfiguration;
-import org.agt.module.infra.api.logger.ApiAccessLogApi;
 import jakarta.servlet.Filter;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -23,10 +23,9 @@ public class AgtApiLogAutoConfiguration implements WebMvcConfigurer {
      */
     @Bean
     @ConditionalOnProperty(prefix = "agt.access-log", value = "enable", matchIfMissing = true) // 允许使用 agt.access-log.enable=false 禁用访问日志
-    @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
     public FilterRegistrationBean<ApiAccessLogFilter> apiAccessLogFilter(WebProperties webProperties,
                                                                          @Value("${spring.application.name}") String applicationName,
-                                                                         ApiAccessLogApi apiAccessLogApi) {
+                                                                         ApiAccessLogCommonApi apiAccessLogApi) {
         ApiAccessLogFilter filter = new ApiAccessLogFilter(webProperties, applicationName, apiAccessLogApi);
         return createFilterBean(filter, WebFilterOrderEnum.API_ACCESS_LOG_FILTER);
     }

agt-framework/agt-spring-boot-starter-web/src/main/java/org/agt/framework/apilog/config/AgtApiLogRpcAutoConfiguration.java

@@ -1,7 +1,7 @@
 package org.agt.framework.apilog.config;
 
-import org.agt.module.infra.api.logger.ApiAccessLogApi;
-import org.agt.module.infra.api.logger.ApiErrorLogApi;
+import org.agt.framework.common.biz.infra.logger.ApiAccessLogCommonApi;
+import org.agt.framework.common.biz.infra.logger.ApiErrorLogCommonApi;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
@@ -11,6 +11,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * @author 千通源码
  */
 @AutoConfiguration
-@EnableFeignClients(clients = {ApiAccessLogApi.class, ApiErrorLogApi.class}) // 主要是引入相关的 API 服务
+@EnableFeignClients(clients = {ApiAccessLogCommonApi.class, ApiErrorLogCommonApi.class}) // 主要是引入相关的 API 服务
 public class AgtApiLogRpcAutoConfiguration {
 }

agt-framework/agt-spring-boot-starter-web/src/main/java/org/agt/framework/apilog/core/filter/ApiAccessLogFilter.java

@@ -9,6 +9,8 @@ import cn.hutool.core.util.BooleanUtil;
 import cn.hutool.core.util.StrUtil;
 import org.agt.framework.apilog.core.annotation.ApiAccessLog;
 import org.agt.framework.apilog.core.enums.OperateTypeEnum;
+import org.agt.framework.common.biz.infra.logger.ApiAccessLogCommonApi;
+import org.agt.framework.common.biz.infra.logger.dto.ApiAccessLogCreateReqDTO;
 import org.agt.framework.common.exception.enums.GlobalErrorCodeConstants;
 import org.agt.framework.common.pojo.CommonResult;
 import org.agt.framework.common.util.json.JsonUtils;
@@ -17,8 +19,6 @@ import org.agt.framework.common.util.servlet.ServletUtils;
 import org.agt.framework.web.config.WebProperties;
 import org.agt.framework.web.core.filter.ApiRequestFilter;
 import org.agt.framework.web.core.util.WebFrameworkUtils;
-import org.agt.module.infra.api.logger.ApiAccessLogApi;
-import org.agt.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO;
 import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -53,9 +53,9 @@ public class ApiAccessLogFilter extends ApiRequestFilter {
 
     private final String applicationName;
 
-    private final ApiAccessLogApi apiAccessLogApi;
+    private final ApiAccessLogCommonApi apiAccessLogApi;
 
-    public ApiAccessLogFilter(WebProperties webProperties, String applicationName, ApiAccessLogApi apiAccessLogApi) {
+    public ApiAccessLogFilter(WebProperties webProperties, String applicationName, ApiAccessLogCommonApi apiAccessLogApi) {
         super(webProperties);
         this.applicationName = applicationName;
         this.apiAccessLogApi = apiAccessLogApi;

agt-framework/agt-spring-boot-starter-web/src/main/java/org/agt/framework/web/config/AgtWebAutoConfiguration.java

@@ -1,12 +1,12 @@
 package org.agt.framework.web.config;
 
+import org.agt.framework.common.biz.infra.logger.ApiErrorLogCommonApi;
 import org.agt.framework.common.enums.WebFilterOrderEnum;
 import org.agt.framework.web.core.filter.CacheRequestBodyFilter;
 import org.agt.framework.web.core.filter.DemoFilter;
 import org.agt.framework.web.core.handler.GlobalExceptionHandler;
 import org.agt.framework.web.core.handler.GlobalResponseBodyHandler;
 import org.agt.framework.web.core.util.WebFrameworkUtils;
-import org.agt.module.infra.api.logger.ApiErrorLogApi;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -59,8 +59,7 @@ public class AgtWebAutoConfiguration implements WebMvcConfigurer {
     }
 
     @Bean
-    @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
-    public GlobalExceptionHandler globalExceptionHandler(ApiErrorLogApi apiErrorLogApi) {
+    public GlobalExceptionHandler globalExceptionHandler(ApiErrorLogCommonApi apiErrorLogApi) {
         return new GlobalExceptionHandler(applicationName, apiErrorLogApi);
     }
 

agt-framework/agt-spring-boot-starter-web/src/main/java/org/agt/framework/web/core/handler/GlobalExceptionHandler.java

@@ -6,6 +6,8 @@ import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.servlet.JakartaServletUtil;
+import org.agt.framework.common.biz.infra.logger.ApiErrorLogCommonApi;
+import org.agt.framework.common.biz.infra.logger.dto.ApiErrorLogCreateReqDTO;
 import org.agt.framework.common.exception.ServiceException;
 import org.agt.framework.common.exception.util.ServiceExceptionUtil;
 import org.agt.framework.common.pojo.CommonResult;
@@ -14,8 +16,6 @@ import org.agt.framework.common.util.json.JsonUtils;
 import org.agt.framework.common.util.monitor.TracerUtils;
 import org.agt.framework.common.util.servlet.ServletUtils;
 import org.agt.framework.web.core.util.WebFrameworkUtils;
-import org.agt.module.infra.api.logger.ApiErrorLogApi;
-import org.agt.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO;
 import com.fasterxml.jackson.databind.exc.InvalidFormatException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.ConstraintViolation;
@@ -63,7 +63,7 @@ public class GlobalExceptionHandler {
     @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
     private final String applicationName;
 
-    private final ApiErrorLogApi apiErrorLogApi;
+    private final ApiErrorLogCommonApi apiErrorLogApi;
 
     /**
      * 处理所有异常，主要是提供给 Filter 使用