From 6381034b1f5d63e28051303e6cfebb2b826956be Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 12 九月 2023 10:45:27 +0800
Subject: [PATCH] update 优化 登录接口租户id被强制校验问题
---
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java | 6 ++----
ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java | 8 ++++----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
index 3a19f8c..7e07e20 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
@@ -15,10 +15,7 @@
import org.dromara.common.core.enums.LoginType;
import org.dromara.common.core.enums.TenantStatus;
import org.dromara.common.core.exception.user.UserException;
-import org.dromara.common.core.utils.DateUtils;
-import org.dromara.common.core.utils.MessageUtils;
-import org.dromara.common.core.utils.ServletUtils;
-import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.*;
import org.dromara.common.log.event.LogininforEvent;
import org.dromara.common.redis.utils.RedisUtils;
import org.dromara.common.satoken.utils.LoginHelper;
@@ -210,6 +207,9 @@
if (TenantConstants.DEFAULT_TENANT_ID.equals(tenantId)) {
return;
}
+ if (StringUtils.isBlank(tenantId)) {
+ throw new TenantException("tenant.number.not.blank");
+ }
SysTenantVo tenant = tenantService.queryByTenantId(tenantId);
if (ObjectUtil.isNull(tenant)) {
log.info("鐧诲綍绉熸埛锛歿} 涓嶅瓨鍦�.", tenantId);
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java
index cdff773..71e4991 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java
@@ -1,12 +1,11 @@
package org.dromara.common.core.domain.model;
import jakarta.validation.constraints.Email;
-import org.dromara.common.core.constant.UserConstants;
+import jakarta.validation.constraints.NotBlank;
import lombok.Data;
+import org.dromara.common.core.constant.UserConstants;
import org.dromara.common.core.validate.auth.*;
import org.hibernate.validator.constraints.Length;
-
-import jakarta.validation.constraints.NotBlank;
/**
* 鐢ㄦ埛鐧诲綍瀵硅薄
@@ -42,7 +41,6 @@
/**
* 绉熸埛ID
*/
- @NotBlank(message = "{tenant.number.not.blank}")
private String tenantId;
/**
--
Gitblit v1.9.3