From d04440f0b1e70edc2ecbf3111ff44be3f21eb71d Mon Sep 17 00:00:00 2001 From: meowrain Date: Sun, 14 Dec 2025 15:17:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=81=BF=E5=85=8Dgateway=E4=B8=8D?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=85=B6=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86?= =?UTF-8?q?=E8=80=8C=E5=AF=BC=E8=87=B4=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/dataSources.xml | 10 +++++++++- .idea/db-forest-config.xml | 2 +- .../framework/core/config/WebAutoConfiguration.java | 5 +++++ .../userservice/config/FrameworkConfiguration.java | 4 ---- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index d3dcd6e..15acdd0 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,7 +1,15 @@ - + + mysql.8 + true + true + com.mysql.cj.jdbc.Driver + jdbc:mysql://10.0.0.10/aioj_dev + $ProjectFileDir$ + + mysql.8 true true diff --git a/.idea/db-forest-config.xml b/.idea/db-forest-config.xml index d0a62c0..16a0a56 100644 --- a/.idea/db-forest-config.xml +++ b/.idea/db-forest-config.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/config/WebAutoConfiguration.java b/aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/config/WebAutoConfiguration.java index 7c5e501..c38ef35 100644 --- a/aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/config/WebAutoConfiguration.java +++ b/aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/config/WebAutoConfiguration.java @@ -1,13 +1,18 @@ package cn.meowrain.aioj.backend.framework.core.config; import cn.meowrain.aioj.backend.framework.core.exception.handler.GlobalExceptionHandler; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.context.annotation.Bean; /** * 注册为bean,全局异常拦截器 */ @AutoConfiguration +@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) +@ConditionalOnClass(HttpServletRequest.class) public class WebAutoConfiguration { @Bean diff --git a/aioj-backend-user-service/src/main/java/cn/meowrain/aioj/backend/userservice/config/FrameworkConfiguration.java b/aioj-backend-user-service/src/main/java/cn/meowrain/aioj/backend/userservice/config/FrameworkConfiguration.java index a00a3e5..e6c4689 100644 --- a/aioj-backend-user-service/src/main/java/cn/meowrain/aioj/backend/userservice/config/FrameworkConfiguration.java +++ b/aioj-backend-user-service/src/main/java/cn/meowrain/aioj/backend/userservice/config/FrameworkConfiguration.java @@ -1,12 +1,8 @@ package cn.meowrain.aioj.backend.userservice.config; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.ComponentScans; import org.springframework.context.annotation.Configuration; @Configuration -// @ComponentScans({ -// @ComponentScan("cn.meowrain.aioj.backend.framework.core.banner") }) public class FrameworkConfiguration { }