From 78947f4258ca2adffe40de9de73692c415687e4a Mon Sep 17 00:00:00 2001 From: lbw Date: Mon, 10 Jul 2023 23:18:54 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20Refactoring=20code.=20druid=20?= =?UTF-8?q?=E9=80=82=E9=85=8D=20springboot=203.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/pig4cloud/pigx/auth/PigxAuthApplication.java | 3 ++- .../pig4cloud/pigx/common/data/mybatis/DruidSqlLogFilter.java | 1 - .../pigx/common/data/mybatis/MybatisPlusConfiguration.java | 1 - .../common/data/{config => mybatis}/PigxMybatisProperties.java | 2 +- ...pringframework.boot.autoconfigure.AutoConfiguration.imports | 1 + 5 files changed, 4 insertions(+), 4 deletions(-) rename pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/{config => mybatis}/PigxMybatisProperties.java (89%) diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/PigxAuthApplication.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/PigxAuthApplication.java index 74e5d3f9c..eeda3d098 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/PigxAuthApplication.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/PigxAuthApplication.java @@ -16,6 +16,7 @@ package com.pig4cloud.pigx.auth; +import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure; import com.pig4cloud.pigx.common.feign.annotation.EnablePigxFeignClients; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -27,7 +28,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient; */ @EnablePigxFeignClients @EnableDiscoveryClient -@SpringBootApplication +@SpringBootApplication(exclude = DruidDataSourceAutoConfigure.class) public class PigxAuthApplication { public static void main(String[] args) { diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/DruidSqlLogFilter.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/DruidSqlLogFilter.java index c6ddcea62..0919bcc3b 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/DruidSqlLogFilter.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/DruidSqlLogFilter.java @@ -25,7 +25,6 @@ import com.alibaba.druid.proxy.jdbc.StatementProxy; import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.util.StringUtils; -import com.pig4cloud.pigx.common.data.config.PigxMybatisProperties; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Import; diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java index b3099e5e6..a43b84955 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java @@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor; import com.pig4cloud.pigx.admin.api.feign.RemoteDataScopeService; -import com.pig4cloud.pigx.common.data.config.PigxMybatisProperties; import com.pig4cloud.pigx.common.data.datascope.DataScopeInnerInterceptor; import com.pig4cloud.pigx.common.data.datascope.DataScopeInterceptor; import com.pig4cloud.pigx.common.data.datascope.DataScopeSqlInjector; diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/config/PigxMybatisProperties.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/PigxMybatisProperties.java similarity index 89% rename from pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/config/PigxMybatisProperties.java rename to pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/PigxMybatisProperties.java index 43f789ace..131871596 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/config/PigxMybatisProperties.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/PigxMybatisProperties.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pigx.common.data.config; +package com.pig4cloud.pigx.common.data.mybatis; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/pigx-common/pigx-common-data/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pigx-common/pigx-common-data/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index adf555324..bed40a558 100644 --- a/pigx-common/pigx-common-data/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/pigx-common/pigx-common-data/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -7,3 +7,4 @@ com.pig4cloud.pigx.common.data.tenant.TenantContextHolderFilter com.pig4cloud.pigx.common.data.tenant.PigxTenantConfiguration com.pig4cloud.pigx.common.data.mybatis.MybatisPlusConfiguration com.pig4cloud.pigx.common.data.resolver.TenantKeyStrResolver +com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure