ly
/
Stwzhj-Cloud-Plus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update 优化 登录接口租户id被强制校验问题

2.X
疯狂的狮子Li 2023-09-12 10:47:32 +08:00
parent 71bc7a4c99
commit 3d6badb748
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-auth/src/main/java/org/dromara/auth/service/SysLoginService.java
View File

@ -21,6 +21,7 @@ import org.dromara.common.core.exception.user.UserException;
import org.dromara.common.core.utils.MessageUtils; import org.dromara.common.core.utils.MessageUtils;
import org.dromara.common.core.utils.ServletUtils; import org.dromara.common.core.utils.ServletUtils;
import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.log.event.LogininforEvent; import org.dromara.common.log.event.LogininforEvent;
import org.dromara.common.redis.utils.RedisUtils; import org.dromara.common.redis.utils.RedisUtils;
import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.satoken.utils.LoginHelper;
@ -198,6 +199,9 @@ public class SysLoginService {
if (TenantConstants.DEFAULT_TENANT_ID.equals(tenantId)) { if (TenantConstants.DEFAULT_TENANT_ID.equals(tenantId)) {
return; return;
} }
if (StringUtils.isBlank(tenantId)) {
throw new TenantException("tenant.number.not.blank");
}
RemoteTenantVo tenant = remoteTenantService.queryByTenantId(tenantId); RemoteTenantVo tenant = remoteTenantService.queryByTenantId(tenantId);
if (ObjectUtil.isNull(tenant)) { if (ObjectUtil.isNull(tenant)) {
log.info("登录租户：{} 不存在.", tenantId); log.info("登录租户：{} 不存在.", tenantId);

1
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java
View File

@ -43,7 +43,6 @@ public class LoginBody {
/** /**
* 租户ID * 租户ID
*/ */
@NotBlank(message = "{tenant.number.not.blank}")
private String tenantId; private String tenantId;
/** /**