From de3adb2230d6531ffaed03c8013cd22dfd385163 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期四, 19 十月 2023 14:14:23 +0800 Subject: [PATCH] fix 修复 powerjob 使用 nginx 部署无法访问的问题 --- ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java b/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java index c8bb25d..b510ad2 100644 --- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java +++ b/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java @@ -1,6 +1,8 @@ package org.dromara.common.tenant.handle; +import cn.hutool.core.collection.ListUtil; import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler; +import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.tenant.helper.TenantHelper; @@ -17,6 +19,7 @@ * * @author Lion Li */ +@Slf4j @AllArgsConstructor public class PlusTenantLineHandler implements TenantLineHandler { @@ -26,6 +29,7 @@ public Expression getTenantId() { String tenantId = LoginHelper.getTenantId(); if (StringUtils.isBlank(tenantId)) { + log.error("鏃犳硶鑾峰彇鏈夋晥鐨勭鎴穒d -> Null"); return new NullValue(); } String dynamicTenantId = TenantHelper.getDynamic(); @@ -45,11 +49,12 @@ // 涓嶉渶瑕佽繃婊ょ鎴风殑琛� List<String> excludes = tenantProperties.getExcludes(); // 闈炰笟鍔¤〃 - excludes.addAll(List.of( - "gen_table", - "gen_table_column" - )); - return excludes.contains(tableName); + List<String> tables = ListUtil.toList( + "gen_table", + "gen_table_column" + ); + tables.addAll(excludes); + return tables.contains(tableName); } return true; } -- Gitblit v1.9.3