From 2aabdb83ad578b0c9213a18d1fb1257349e2bc3f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 17 二月 2023 10:47:32 +0800
Subject: [PATCH] fix 修复 管理员登出动态租户未清理导致二次无法登录
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java | 79 ++++++++++++++++++++++++++++-----------
1 files changed, 57 insertions(+), 22 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 5f54f0f..f55b5c8 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,18 +1,27 @@
package com.ruoyi.web.controller;
import cn.dev33.satoken.annotation.SaIgnore;
-import com.ruoyi.common.core.constant.Constants;
+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.system.domain.SysMenu;
-import com.ruoyi.system.domain.SysUser;
+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;
@@ -21,8 +30,8 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
+import java.net.URL;
import java.util.List;
-import java.util.Map;
/**
* 鐧诲綍楠岃瘉
@@ -37,34 +46,41 @@
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<Map<String, Object>> 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());
- return R.ok(Map.of(Constants.TOKEN, token));
+ String token = loginService.login(
+ body.getTenantId(),
+ body.getUsername(), body.getPassword(),
+ body.getCode(), body.getUuid());
+ loginVo.setToken(token);
+ return R.ok(loginVo);
}
/**
* 鐭俊鐧诲綍(绀轰緥)
*
- * @param smsLoginBody 鐧诲綍淇℃伅
+ * @param body 鐧诲綍淇℃伅
* @return 缁撴灉
*/
@SaIgnore
@PostMapping("/smsLogin")
- public R<Map<String, Object>> 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());
- return R.ok(Map.of(Constants.TOKEN, token));
+ String token = loginService.smsLogin(body.getTenantId(), body.getPhonenumber(), body.getSmsCode());
+ loginVo.setToken(token);
+ return R.ok(loginVo);
}
/**
@@ -75,10 +91,12 @@
*/
@SaIgnore
@PostMapping("/xcxLogin")
- public R<Map<String, Object>> xcxLogin(@NotBlank(message = "{xcx.code.not.blank}") String xcxCode) {
+ public R<LoginVo> xcxLogin(@NotBlank(message = "{xcx.code.not.blank}") String xcxCode) {
+ LoginVo loginVo = new LoginVo();
// 鐢熸垚浠ょ墝
String token = loginService.xcxLogin(xcxCode);
- return R.ok(Map.of(Constants.TOKEN, token));
+ loginVo.setToken(token);
+ return R.ok(loginVo);
}
/**
@@ -92,19 +110,36 @@
}
/**
+ * 鐧诲綍椤甸潰绉熸埛涓嬫媺妗�
+ *
+ * @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 鐢ㄦ埛淇℃伅
*/
@GetMapping("getInfo")
- public R<Map<String, Object>> getInfo() {
+ public R<UserInfoVo> getInfo() {
+ UserInfoVo userInfoVo = new UserInfoVo();
LoginUser loginUser = LoginHelper.getLoginUser();
- SysUser user = userService.selectUserById(loginUser.getUserId());
- return R.ok(Map.of(
- "user", user,
- "roles", loginUser.getRolePermission(),
- "permissions", loginUser.getMenuPermission()
- ));
+ SysUserVo user = userService.selectUserById(loginUser.getUserId());
+ userInfoVo.setUser(user);
+ userInfoVo.setPermissions(loginUser.getMenuPermission());
+ userInfoVo.setRoles(loginUser.getRolePermission());
+ return R.ok(userInfoVo);
}
/**
--
Gitblit v1.9.3