♻️ Refactoring code. druid 适配 springboot 3.0

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) {

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;

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;

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;

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