From 0af7c94ae6816e2f59e0c3589f662430401df624 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 17 二月 2023 16:05:40 +0800
Subject: [PATCH] fix 修复 超管切换租户后 刷新浏览器重新加载用户信息接口导致租户id错乱问题
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java | 50 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java
index 73e6a24..cfc993d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java
@@ -1,19 +1,28 @@
package com.ruoyi.web.controller;
import cn.dev33.satoken.annotation.SaIgnore;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.model.LoginBody;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.domain.model.SmsLoginBody;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.satoken.utils.LoginHelper;
+import com.ruoyi.common.tenant.helper.TenantHelper;
import com.ruoyi.system.domain.SysMenu;
+import com.ruoyi.system.domain.bo.SysTenantBo;
import com.ruoyi.system.domain.vo.RouterVo;
+import com.ruoyi.system.domain.vo.SysTenantVo;
import com.ruoyi.system.domain.vo.SysUserVo;
import com.ruoyi.system.service.ISysMenuService;
+import com.ruoyi.system.service.ISysTenantService;
import com.ruoyi.system.service.ISysUserService;
-import com.ruoyi.system.service.SysLoginService;
import com.ruoyi.web.domain.vo.LoginVo;
+import com.ruoyi.web.domain.vo.TenantListVo;
import com.ruoyi.web.domain.vo.UserInfoVo;
+import com.ruoyi.web.service.SysLoginService;
+import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.constraints.NotBlank;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -22,6 +31,7 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
+import java.net.URL;
import java.util.List;
/**
@@ -37,20 +47,23 @@
private final SysLoginService loginService;
private final ISysMenuService menuService;
private final ISysUserService userService;
+ private final ISysTenantService tenantService;
/**
* 鐧诲綍鏂规硶
*
- * @param loginBody 鐧诲綍淇℃伅
+ * @param body 鐧诲綍淇℃伅
* @return 缁撴灉
*/
@SaIgnore
@PostMapping("/login")
- public R<LoginVo> login(@Validated @RequestBody LoginBody loginBody) {
+ public R<LoginVo> login(@Validated @RequestBody LoginBody body) {
LoginVo loginVo = new LoginVo();
// 鐢熸垚浠ょ墝
- String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
- loginBody.getUuid());
+ String token = loginService.login(
+ body.getTenantId(),
+ body.getUsername(), body.getPassword(),
+ body.getCode(), body.getUuid());
loginVo.setToken(token);
return R.ok(loginVo);
}
@@ -58,15 +71,15 @@
/**
* 鐭俊鐧诲綍(绀轰緥)
*
- * @param smsLoginBody 鐧诲綍淇℃伅
+ * @param body 鐧诲綍淇℃伅
* @return 缁撴灉
*/
@SaIgnore
@PostMapping("/smsLogin")
- public R<LoginVo> smsLogin(@Validated @RequestBody SmsLoginBody smsLoginBody) {
+ public R<LoginVo> smsLogin(@Validated @RequestBody SmsLoginBody body) {
LoginVo loginVo = new LoginVo();
// 鐢熸垚浠ょ墝
- String token = loginService.smsLogin(smsLoginBody.getPhonenumber(), smsLoginBody.getSmsCode());
+ String token = loginService.smsLogin(body.getTenantId(), body.getPhonenumber(), body.getSmsCode());
loginVo.setToken(token);
return R.ok(loginVo);
}
@@ -98,6 +111,23 @@
}
/**
+ * 鐧诲綍椤甸潰绉熸埛涓嬫媺妗�
+ *
+ * @return 绉熸埛鍒楄〃
+ */
+ @SaIgnore
+ @GetMapping("/tenant/list")
+ public R<List<TenantListVo>> tenantList(HttpServletRequest request) throws Exception {
+ List<SysTenantVo> tenantList = tenantService.queryList(new SysTenantBo());
+ List<TenantListVo> voList = BeanUtil.copyToList(tenantList, TenantListVo.class);
+ // 鑾峰彇鍩熷悕
+ String host = new URL(request.getRequestURL().toString()).getHost();
+ // 鏍规嵁鍩熷悕杩涜绛涢��
+ List<TenantListVo> list = voList.stream().filter(vo -> StringUtils.equals(vo.getDomain(), host)).toList();
+ return R.ok(CollUtil.isNotEmpty(list) ? list : voList);
+ }
+
+ /**
* 鑾峰彇鐢ㄦ埛淇℃伅
*
* @return 鐢ㄦ埛淇℃伅
@@ -106,6 +136,10 @@
public R<UserInfoVo> getInfo() {
UserInfoVo userInfoVo = new UserInfoVo();
LoginUser loginUser = LoginHelper.getLoginUser();
+ if (TenantHelper.isEnable() && LoginHelper.isSuperAdmin()) {
+ // 瓒呯骇绠＄悊鍛� 濡傛灉閲嶆柊鍔犺浇鐢ㄦ埛淇℃伅闇�娓呴櫎鍔ㄦ�佺鎴�
+ TenantHelper.clearDynamic();
+ }
SysUserVo user = userService.selectUserById(loginUser.getUserId());
userInfoVo.setUser(user);
userInfoVo.setPermissions(loginUser.getMenuPermission());
--
Gitblit v1.9.3