From 399e8cbaee5dc7ed7c3166105a5383afa758754c Mon Sep 17 00:00:00 2001 From: lizhengwei <171332584@qq.com> Date: Fri, 20 Feb 2026 00:12:48 +0800 Subject: [PATCH] =?UTF-8?q?h5=20=E5=8A=A8=E6=80=81=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=EF=BC=8C=E6=94=AF=E6=8C=81=E5=A4=9A=E7=A7=9F=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/config/MybatisPlusAutoConfigTenant.java | 2 -- .../common/mybatis/config/MybatisPlusConfig.java | 13 ++++++++----- ruoyi-site/ruoyi-h5/doc/http/work.http | 2 +- .../main/java/com/luban/api/MallH5Application.java | 2 +- .../api/config/MybatisPlusAutoConfigTenant.java | 2 -- .../com/luban/api/config/PlusTenantLineHandler.java | 5 +++++ .../ruoyi-h5/src/main/resources/application.yml | 3 +++ 7 files changed, 18 insertions(+), 11 deletions(-) diff --git a/ruoyi-admin/src/main/java/org/dromara/web/config/MybatisPlusAutoConfigTenant.java b/ruoyi-admin/src/main/java/org/dromara/web/config/MybatisPlusAutoConfigTenant.java index ea2c69ea7..ebc2c0ec8 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/config/MybatisPlusAutoConfigTenant.java +++ b/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 diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java index 2c55893bf..1aa6e62d0 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java +++ b/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 { - TenantLineInnerInterceptor tenant = SpringUtils.getBean(TenantLineInnerInterceptor.class); - interceptor.addInnerInterceptor(tenant); - } catch (BeansException ignore) { + if(tenantLineInnerInterceptor == null){ log.warn("MybatisPlus 多租户未打开！"); + }else { + log.info("MybatisPlus 多租户打开！"); + interceptor.addInnerInterceptor(tenantLineInnerInterceptor); } // 数据权限处理 interceptor.addInnerInterceptor(dataPermissionInterceptor()); diff --git a/ruoyi-site/ruoyi-h5/doc/http/work.http b/ruoyi-site/ruoyi-h5/doc/http/work.http index 7e72f8b73..8404e36e5 100644 --- a/ruoyi-site/ruoyi-h5/doc/http/work.http +++ b/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 diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/MallH5Application.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/MallH5Application.java index 9a1d9cfc8..3770b98a3 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/MallH5Application.java +++ b/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) { diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/config/MybatisPlusAutoConfigTenant.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/config/MybatisPlusAutoConfigTenant.java index acc0d5d73..76b497bdc 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/config/MybatisPlusAutoConfigTenant.java +++ b/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 diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/config/PlusTenantLineHandler.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/config/PlusTenantLineHandler.java index f661c163e..3dce83eac 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/config/PlusTenantLineHandler.java +++ b/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(); diff --git a/ruoyi-site/ruoyi-h5/src/main/resources/application.yml b/ruoyi-site/ruoyi-h5/src/main/resources/application.yml index 11c4d6d53..af53fb042 100644 --- a/ruoyi-site/ruoyi-h5/src/main/resources/application.yml +++ b/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