From 0fc796b90d3f44b81ef30285edb897223df439f7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 13 一月 2023 23:04:09 +0800
Subject: [PATCH] update 适配 javax.servlet 替换为 jakarta.servlet 更新所有代码 update 适配 ServletUtils 更换继承 JakartaServletUtil
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 48 +++++++++++++++---------------------------------
1 files changed, 15 insertions(+), 33 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index cdb1d6c..5fd0667 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -1,22 +1,18 @@
package com.ruoyi.web.controller.system;
-import cn.dev33.satoken.exception.NotLoginException;
-import cn.dev33.satoken.stp.StpUtil;
-import com.ruoyi.common.annotation.Anonymous;
+import cn.dev33.satoken.annotation.SaIgnore;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.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.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.system.service.SysPermissionService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@@ -24,11 +20,10 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
/**
* 鐧诲綍楠岃瘉
@@ -36,7 +31,6 @@
* @author Lion Li
*/
@Validated
-@Api(value = "鐧诲綍楠岃瘉鎺у埗鍣�", tags = {"鐧诲綍楠岃瘉绠＄悊"})
@RequiredArgsConstructor
@RestController
public class SysLoginController {
@@ -44,7 +38,6 @@
private final SysLoginService loginService;
private final ISysMenuService menuService;
private final ISysUserService userService;
- private final SysPermissionService permissionService;
/**
* 鐧诲綍鏂规硶
@@ -52,8 +45,7 @@
* @param loginBody 鐧诲綍淇℃伅
* @return 缁撴灉
*/
- @Anonymous
- @ApiOperation("鐧诲綍鏂规硶")
+ @SaIgnore
@PostMapping("/login")
public R<Map<String, Object>> login(@Validated @RequestBody LoginBody loginBody) {
Map<String, Object> ajax = new HashMap<>();
@@ -70,8 +62,7 @@
* @param smsLoginBody 鐧诲綍淇℃伅
* @return 缁撴灉
*/
- @Anonymous
- @ApiOperation("鐭俊鐧诲綍(绀轰緥)")
+ @SaIgnore
@PostMapping("/smsLogin")
public R<Map<String, Object>> smsLogin(@Validated @RequestBody SmsLoginBody smsLoginBody) {
Map<String, Object> ajax = new HashMap<>();
@@ -87,8 +78,7 @@
* @param xcxCode 灏忕▼搴廲ode
* @return 缁撴灉
*/
- @Anonymous
- @ApiOperation("灏忕▼搴忕櫥褰�(绀轰緥)")
+ @SaIgnore
@PostMapping("/xcxLogin")
public R<Map<String, Object>> xcxLogin(@NotBlank(message = "{xcx.code.not.blank}") String xcxCode) {
Map<String, Object> ajax = new HashMap<>();
@@ -98,16 +88,13 @@
return R.ok(ajax);
}
- @Anonymous
- @ApiOperation("鐧诲嚭鏂规硶")
+ /**
+ * 閫�鍑虹櫥褰�
+ */
+ @SaIgnore
@PostMapping("/logout")
public R<Void> logout() {
- try {
- String username = LoginHelper.getUsername();
- StpUtil.logout();
- loginService.logout(username);
- } catch (NotLoginException e) {
- }
+ loginService.logout();
return R.ok("閫�鍑烘垚鍔�");
}
@@ -116,18 +103,14 @@
*
* @return 鐢ㄦ埛淇℃伅
*/
- @ApiOperation("鑾峰彇鐢ㄦ埛淇℃伅")
@GetMapping("getInfo")
public R<Map<String, Object>> getInfo() {
- SysUser user = userService.selectUserById(LoginHelper.getUserId());
- // 瑙掕壊闆嗗悎
- Set<String> roles = permissionService.getRolePermission(user);
- // 鏉冮檺闆嗗悎
- Set<String> permissions = permissionService.getMenuPermission(user);
+ LoginUser loginUser = LoginHelper.getLoginUser();
+ SysUser user = userService.selectUserById(loginUser.getUserId());
Map<String, Object> ajax = new HashMap<>();
ajax.put("user", user);
- ajax.put("roles", roles);
- ajax.put("permissions", permissions);
+ ajax.put("roles", loginUser.getRolePermission());
+ ajax.put("permissions", loginUser.getMenuPermission());
return R.ok(ajax);
}
@@ -136,7 +119,6 @@
*
* @return 璺敱淇℃伅
*/
- @ApiOperation("鑾峰彇璺敱淇℃伅")
@GetMapping("getRouters")
public R<List<RouterVo>> getRouters() {
Long userId = LoginHelper.getUserId();
--
Gitblit v1.9.3