admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 优化 增加租户ID为Null错误日志

Browse Source
This commit is contained in:
疯狂的狮子Li 2023-10-10 09:48:00 +08:00
parent 905637d70f
commit ee5fc9507a
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java
View File

@ -2,6 +2,7 @@ package org.dromara.common.tenant.handle;
import cn.hutool.core.collection.ListUtil; import cn.hutool.core.collection.ListUtil;
import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler; import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.common.tenant.helper.TenantHelper;
@ -18,6 +19,7 @@ import java.util.List;
* *
* @author Lion Li * @author Lion Li
*/ */
@Slf4j
@AllArgsConstructor @AllArgsConstructor
public class PlusTenantLineHandler implements TenantLineHandler { public class PlusTenantLineHandler implements TenantLineHandler {
@ -27,6 +29,7 @@ public class PlusTenantLineHandler implements TenantLineHandler {
public Expression getTenantId() { public Expression getTenantId() {
String tenantId = LoginHelper.getTenantId(); String tenantId = LoginHelper.getTenantId();
if (StringUtils.isBlank(tenantId)) { if (StringUtils.isBlank(tenantId)) {
log.error("无法获取有效的租户id -> Null");
return new NullValue(); return new NullValue();
} }
String dynamicTenantId = TenantHelper.getDynamic(); String dynamicTenantId = TenantHelper.getDynamic();

8
ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java
View File

@ -1,5 +1,6 @@
package org.dromara.common.tenant.handle; package org.dromara.common.tenant.handle;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.constant.GlobalConstants; import org.dromara.common.core.constant.GlobalConstants;
import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.redis.handler.KeyPrefixHandler; import org.dromara.common.redis.handler.KeyPrefixHandler;
@ -10,6 +11,7 @@ import org.dromara.common.tenant.helper.TenantHelper;
* *
* @author Lion Li * @author Lion Li
*/ */
@Slf4j
public class TenantKeyPrefixHandler extends KeyPrefixHandler { public class TenantKeyPrefixHandler extends KeyPrefixHandler {
public TenantKeyPrefixHandler(String keyPrefix) { public TenantKeyPrefixHandler(String keyPrefix) {
@ -28,6 +30,9 @@ public class TenantKeyPrefixHandler extends KeyPrefixHandler {
return super.map(name); return super.map(name);
} }
String tenantId = TenantHelper.getTenantId(); String tenantId = TenantHelper.getTenantId();
if (StringUtils.isBlank(tenantId)) {
log.error("无法获取有效的租户id -> Null");
}
if (StringUtils.startsWith(name, tenantId)) { if (StringUtils.startsWith(name, tenantId)) {
// 如果存在则直接返回 // 如果存在则直接返回
return super.map(name); return super.map(name);
@ -48,6 +53,9 @@ public class TenantKeyPrefixHandler extends KeyPrefixHandler {
return super.unmap(name); return super.unmap(name);
} }
String tenantId = TenantHelper.getTenantId(); String tenantId = TenantHelper.getTenantId();
if (StringUtils.isBlank(tenantId)) {
log.error("无法获取有效的租户id -> Null");
}
if (StringUtils.startsWith(unmap, tenantId)) { if (StringUtils.startsWith(unmap, tenantId)) {
// 如果存在则删除 // 如果存在则删除
return unmap.substring((tenantId + ":").length()); return unmap.substring((tenantId + ":").length());