h5 动态表单，支持多租户

ruoyi-admin/src/main/java/org/dromara/web/config/MybatisPlusAutoConfigTenant.java

@@ -9,8 +9,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ConditionalOnBean(MybatisPlusConfig.class)
-@AutoConfiguration(after = {MybatisPlusConfig.class})
 public class MybatisPlusAutoConfigTenant {
 
     @Bean

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java

@@ -15,7 +15,7 @@ import org.dromara.common.mybatis.handler.InjectionMetaObjectHandler;
 import org.dromara.common.mybatis.handler.MybatisExceptionHandler;
 import org.dromara.common.mybatis.interceptor.PlusDataPermissionInterceptor;
 import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -31,15 +31,18 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @Slf4j
 public class MybatisPlusConfig {
 
+    @Autowired(required = false)
+    private TenantLineInnerInterceptor tenantLineInnerInterceptor;
+
     @Bean
     public MybatisPlusInterceptor mybatisPlusInterceptor() {
         MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
         // 多租户插件 必须放到第一位
-        try {
+        if(tenantLineInnerInterceptor ==  null){
-            TenantLineInnerInterceptor tenant = SpringUtils.getBean(TenantLineInnerInterceptor.class);
-            interceptor.addInnerInterceptor(tenant);
-        } catch (BeansException ignore) {
             log.warn("MybatisPlus 多租户未打开！");
+        }else {
+            log.info("MybatisPlus 多租户打开！");
+            interceptor.addInnerInterceptor(tenantLineInnerInterceptor);
         }
         // 数据权限处理
         interceptor.addInnerInterceptor(dataPermissionInterceptor());

ruoyi-site/ruoyi-h5/doc/http/work.http

@@ -1,3 +1,3 @@
 ### 查询所有H5项目
-GET http://localhost:19200/h5/works/page?page=1&size=10
+GET http://localhost:19200/h5/works/page?page=1&size=10&status=1&isTemplate=true
 Accept: application/json

ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/MallH5Application.java

@@ -10,7 +10,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * @author WeiHongBin
  */
 @EnableDubbo
-@SpringBootApplication(scanBasePackages = {"com.luban","com.dromara.md.form"})
+@SpringBootApplication(scanBasePackages = {"com.luban", "com.dromara.md.form", "org.dromara"})
 public class MallH5Application {
 
     public static void main(String[] args) {

ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/config/MybatisPlusAutoConfigTenant.java

@@ -9,8 +9,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ConditionalOnBean(MybatisPlusConfig.class)
-@AutoConfiguration(after = {MybatisPlusConfig.class})
 public class MybatisPlusAutoConfigTenant {
 
     @Bean

ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/config/PlusTenantLineHandler.java

@@ -24,6 +24,11 @@ public class PlusTenantLineHandler implements TenantLineHandler {
 
     private final TenantProperties tenantProperties;
 
+    @Override
+    public String getTenantIdColumn() {
+        return "td";
+    }
+
     @Override
     public Expression getTenantId() {
         String tenantId = TenantHelper.getTenantId();

ruoyi-site/ruoyi-h5/src/main/resources/application.yml

@@ -53,6 +53,8 @@ springdoc:
 
 # 多租户配置
 tenant:
+  # 是否开启
+  enable: true
   # 排除表
   excludes:
     - sys_menu
@@ -89,3 +91,4 @@ logging:
   config: classpath:logback-plus.xml
   level:
     com.baomidou.mybatisplus: debug
+    org.mybatis.spring.mapper: debug