From 2787212362c5a23bf5dd94b1bb9cae4ec3fe4caa Mon Sep 17 00:00:00 2001
From: MichelleChung <1242874891@qq.com>
Date: 星期五, 03 二月 2023 09:47:41 +0800
Subject: [PATCH] !284 更新常量 GenConstants，优化 Map 返回结构 * update 优化返回结构, 将 Map 改为指定 Vo 对象 ; * update GenConstants 扩展数据库数据类型, 更新 BO, VO, ENTITY 字段, 并移动到 generator 模块 ;
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java | 52 +++++++++++++++++++++++++---------------------------
1 files changed, 25 insertions(+), 27 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 121d8b8..f91d55d 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,20 @@
package com.ruoyi.web.controller;
import cn.dev33.satoken.annotation.SaIgnore;
-import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.satoken.utils.LoginHelper;
-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.satoken.utils.LoginHelper;
+import com.ruoyi.system.domain.SysMenu;
+import com.ruoyi.system.domain.SysUser;
import com.ruoyi.system.domain.vo.RouterVo;
import com.ruoyi.system.service.ISysMenuService;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.SysLoginService;
+import com.ruoyi.web.domain.vo.UserInfoVo;
+import com.ruoyi.web.domain.vo.LoginVo;
+import jakarta.validation.constraints.NotBlank;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@@ -20,10 +22,7 @@
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.util.List;
-import java.util.Map;
/**
* 鐧诲綍楠岃瘉
@@ -47,13 +46,13 @@
*/
@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 loginBody) {
+ 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);
+ loginVo.setToken(token);
+ return R.ok(loginVo);
}
/**
@@ -64,12 +63,12 @@
*/
@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 smsLoginBody) {
+ LoginVo loginVo = new LoginVo();
// 鐢熸垚浠ょ墝
String token = loginService.smsLogin(smsLoginBody.getPhonenumber(), smsLoginBody.getSmsCode());
- ajax.put(Constants.TOKEN, token);
- return R.ok(ajax);
+ loginVo.setToken(token);
+ return R.ok(loginVo);
}
/**
@@ -80,12 +79,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);
}
/**
@@ -104,14 +103,14 @@
* @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);
+ userInfoVo.setUser(user);
+ userInfoVo.setPermissions(loginUser.getMenuPermission());
+ userInfoVo.setRoles(loginUser.getRolePermission());
+ return R.ok(userInfoVo);
}
/**
@@ -121,8 +120,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