From 771a1045ee3ef382d02b08afb620ef0b34d9d13a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 31 一月 2023 22:13:58 +0800
Subject: [PATCH] update 重构 抽取 jackson 功能 ruoyi-common-json 成为独立模块
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java | 36 ++++++++++++++----------------------
1 files changed, 14 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 eb98bf1..5f54f0f 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,19 @@
package com.ruoyi.web.controller;
import cn.dev33.satoken.annotation.SaIgnore;
-import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.constant.Constants;
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.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 jakarta.validation.constraints.NotBlank;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@@ -20,8 +21,6 @@
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;
@@ -48,12 +47,10 @@
@SaIgnore
@PostMapping("/login")
public R<Map<String, Object>> login(@Validated @RequestBody LoginBody loginBody) {
- Map<String, Object> ajax = new HashMap<>();
// 鐢熸垚浠ょ墝
String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
loginBody.getUuid());
- ajax.put(Constants.TOKEN, token);
- return R.ok(ajax);
+ return R.ok(Map.of(Constants.TOKEN, token));
}
/**
@@ -65,11 +62,9 @@
@SaIgnore
@PostMapping("/smsLogin")
public R<Map<String, Object>> smsLogin(@Validated @RequestBody SmsLoginBody smsLoginBody) {
- Map<String, Object> ajax = new HashMap<>();
// 鐢熸垚浠ょ墝
String token = loginService.smsLogin(smsLoginBody.getPhonenumber(), smsLoginBody.getSmsCode());
- ajax.put(Constants.TOKEN, token);
- return R.ok(ajax);
+ return R.ok(Map.of(Constants.TOKEN, token));
}
/**
@@ -81,11 +76,9 @@
@SaIgnore
@PostMapping("/xcxLogin")
public R<Map<String, Object>> xcxLogin(@NotBlank(message = "{xcx.code.not.blank}") String xcxCode) {
- Map<String, Object> ajax = new HashMap<>();
// 鐢熸垚浠ょ墝
String token = loginService.xcxLogin(xcxCode);
- ajax.put(Constants.TOKEN, token);
- return R.ok(ajax);
+ return R.ok(Map.of(Constants.TOKEN, token));
}
/**
@@ -107,11 +100,11 @@
public R<Map<String, Object>> getInfo() {
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);
+ return R.ok(Map.of(
+ "user", user,
+ "roles", loginUser.getRolePermission(),
+ "permissions", loginUser.getMenuPermission()
+ ));
}
/**
@@ -121,8 +114,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