From b68ac80de1daf22142886af16d36479259106065 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 17 三月 2025 18:40:35 +0800
Subject: [PATCH] 新增加管理后台接口和修改809协议中的bug
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 67 ++++++++++-----------------------
1 files changed, 20 insertions(+), 47 deletions(-)
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
index 6b53013..f3674c2 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
@@ -1,17 +1,6 @@
package com.ruoyi.auth.controller;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-import com.ruoyi.system.api.domain.SysRole;
-import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.api.feignClient.SysUserClient;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
import com.ruoyi.auth.form.LoginBody;
-import com.ruoyi.auth.form.RegisterBody;
import com.ruoyi.auth.service.SysLoginService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.JwtUtils;
@@ -19,9 +8,23 @@
import com.ruoyi.common.security.auth.AuthUtil;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.domain.SysRole;
+import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.model.LoginUser;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
/**
* token 控制
@@ -40,9 +43,6 @@
private SysUserClient userClient;
-
-
-
@PostMapping("login")
public R<?> login(@RequestBody LoginBody form, HttpServletRequest request) {
// 用户登录
@@ -50,32 +50,11 @@
HashMap<String, Object> map = new HashMap<>();
map.put("token", tokenService.createToken(userInfo));
List<SysRole> roles = userInfo.getSysUser().getRoles();
- if(CollectionUtils.isEmpty(roles)){
- return R.fail("请关联角色!");
- }
-
- map.put("roleName",roles.get(0).getRoleName());
- map.put("info", userInfo);
- // 修改用户最后登录时间
- SysUser sysUser = new SysUser();
- sysUser.setUserId(userInfo.getSysUser().getUserId());
- sysUser.setLoginDate(new Date());
- System.out.println("修改用户登录时间" + sysUser);
- userClient.updateSysUser(sysUser);
- return R.ok(map);
- }
- @PostMapping("loginShop")
- public R<?> loginShop(@RequestBody LoginBody form, HttpServletRequest request) {
- // 用户登录
- LoginUser userInfo = sysLoginService.loginShop(form.getUsername(), form.getPassword(), request);
- HashMap<String, Object> map = new HashMap<>();
- map.put("token", tokenService.createToken(userInfo));
- List<SysRole> roles = userInfo.getSysUser().getRoles();
- if(CollectionUtils.isEmpty(roles)){
- return R.fail("请关联角色!");
- }
-
- map.put("roleName",roles.get(0).getRoleName());
+ if (CollectionUtils.isEmpty(roles)) {
+ return R.fail("请关联角色!");
+ }
+
+ map.put("roleName", roles.get(0).getRoleName());
map.put("info", userInfo);
// 修改用户最后登录时间
SysUser sysUser = new SysUser();
@@ -111,11 +90,5 @@
return R.ok();
}
- @PostMapping("register")
- public R<?> register(@RequestBody RegisterBody registerBody, HttpServletRequest request) {
- // 用户注册
- sysLoginService.register(registerBody.getUsername(), registerBody.getPassword(), request);
- return R.ok();
- }
}
--
Gitblit v1.7.1