From 45ac0f23e12ac2a45c6affe9e39d0897e4fad618 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 16 二月 2023 17:06:10 +0800
Subject: [PATCH] !286 合并 多租户功能 * add 新增 ruoyi-common-tenant 多租户模块 全框架适配多租户改动 * update 优化 隐藏页面主键 * remove 移除 缓存列表功能(多租户缓存功能繁杂多样 没有办法在页面管理) * update 重构 全局缓存KEY 与 常用缓存KEY做区分 * update 重构 OssFactory 加载方式 改为每次比对配置做实例更新 * update 优化 SaTokenDao 改为 Bean 注入 便于扩展 * update 重构 项目初始化数据改为懒加载 不提供热加载 * update 重构 验证码开关使用配置文件(经调查少有动态开启需求) * update 优化 启用 sqlserver 高版本语法 简化sql脚本语法 * update 优化 DataPermissionHelper 增加 开启/关闭 忽略数据权限功能 * update 优化 连接池增加 keepaliveTime 探活参数 * update 优化 调整连接池最长生命周期 防止出现警告 * update 优化 代码生成页面模板 校验不必要的表单数据 * add 新增 StringUtils splitTo 与 splitList 方法 优化业务代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java | 95 ++++++++++++++++++++++++++++++-----------------
1 files changed, 61 insertions(+), 34 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 eb98bf1..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,28 @@
package com.ruoyi.web.controller;
import cn.dev33.satoken.annotation.SaIgnore;
-import com.ruoyi.common.constant.Constants;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.domain.SysMenu;
-import com.ruoyi.system.domain.SysUser;
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.helper.LoginHelper;
+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.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;
import org.springframework.web.bind.annotation.GetMapping;
@@ -20,10 +30,8 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
-import jakarta.validation.constraints.NotBlank;
-import java.util.HashMap;
+import java.net.URL;
import java.util.List;
-import java.util.Map;
/**
* 鐧诲綍楠岃瘉
@@ -38,38 +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) {
- Map<String, Object> ajax = new HashMap<>();
+ public R<LoginVo> login(@Validated @RequestBody LoginBody body) {
+ LoginVo loginVo = new LoginVo();
// 鐢熸垚浠ょ墝
- String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
- loginBody.getUuid());
- ajax.put(Constants.TOKEN, token);
- return R.ok(ajax);
+ 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) {
- Map<String, Object> ajax = new HashMap<>();
+ public R<LoginVo> smsLogin(@Validated @RequestBody SmsLoginBody body) {
+ LoginVo loginVo = new LoginVo();
// 鐢熸垚浠ょ墝
- String token = loginService.smsLogin(smsLoginBody.getPhonenumber(), smsLoginBody.getSmsCode());
- ajax.put(Constants.TOKEN, token);
- return R.ok(ajax);
+ String token = loginService.smsLogin(body.getTenantId(), body.getPhonenumber(), body.getSmsCode());
+ loginVo.setToken(token);
+ return R.ok(loginVo);
}
/**
@@ -80,12 +91,12 @@
*/
@SaIgnore
@PostMapping("/xcxLogin")
- public R<Map<String, Object>> xcxLogin(@NotBlank(message = "{xcx.code.not.blank}") String xcxCode) {
- Map<String, Object> ajax = new HashMap<>();
+ public R<LoginVo> xcxLogin(@NotBlank(message = "{xcx.code.not.blank}") String xcxCode) {
+ LoginVo loginVo = new LoginVo();
// 鐢熸垚浠ょ墝
String token = loginService.xcxLogin(xcxCode);
- ajax.put(Constants.TOKEN, token);
- return R.ok(ajax);
+ loginVo.setToken(token);
+ return R.ok(loginVo);
}
/**
@@ -99,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());
- Map<String, Object> ajax = new HashMap<>();
- ajax.put("user", user);
- ajax.put("roles", loginUser.getRolePermission());
- ajax.put("permissions", loginUser.getMenuPermission());
- return R.ok(ajax);
+ SysUserVo user = userService.selectUserById(loginUser.getUserId());
+ userInfoVo.setUser(user);
+ userInfoVo.setPermissions(loginUser.getMenuPermission());
+ userInfoVo.setRoles(loginUser.getRolePermission());
+ return R.ok(userInfoVo);
}
/**
@@ -121,8 +149,7 @@
*/
@GetMapping("getRouters")
public R<List<RouterVo>> getRouters() {
- Long userId = LoginHelper.getUserId();
- List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
+ List<SysMenu> menus = menuService.selectMenuTreeByUserId(LoginHelper.getUserId());
return R.ok(menuService.buildMenus(menus));
}
}
--
Gitblit v1.9.3