소스 검색

update 优化 多租户插件初始化流程

疯狂的狮子Li 1 년 전
부모
커밋
60edc820a8

+ 0 - 6
ruoyi-common/ruoyi-common-tenant/pom.xml

@@ -27,12 +27,6 @@
             <artifactId>ruoyi-common-redis</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-extension</artifactId>
-            <version>${mybatis-plus.version}</version>
-        </dependency>
-
     </dependencies>
 
 </project>

+ 3 - 2
ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/config/TenantConfiguration.java

@@ -17,6 +17,7 @@ import org.redisson.config.SingleServerConfig;
 import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cache.CacheManager;
@@ -33,8 +34,8 @@ import org.springframework.context.annotation.Primary;
 @ConditionalOnProperty(value = "tenant.enable", havingValue = "true")
 public class TenantConfiguration {
 
-    @ConditionalOnBean(MybatisPlusConfiguration.class)
-    @AutoConfiguration(after = {MybatisPlusConfiguration.class})
+    @ConditionalOnClass(TenantLineInnerInterceptor.class)
+    @AutoConfiguration
     static class MybatisPlusConfig {
 
         /**