From 10de85f85ad0874b2d93c851bb4d3eacab24a183 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 21 八月 2024 14:45:25 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 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 9868d190..91f7ab4 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,18 +1,14 @@
package com.ruoyi.auth.controller;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.system.api.RemoteUserService;
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.DeleteMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import com.ruoyi.auth.form.LoginBody;
import com.ruoyi.auth.form.RegisterBody;
import com.ruoyi.auth.service.SysLoginService;
@@ -31,6 +27,7 @@
*
* @author ruoyi
*/
+@Slf4j
@RestController
public class TokenController
{
@@ -39,22 +36,26 @@
@Autowired
private SysLoginService sysLoginService;
- @Autowired
+ @Resource
private SysUserClient userClient;
+
+
+
+
+
@PostMapping("login")
- public R<?> login(@RequestBody LoginBody form)
- {
+ public R<?> login(@RequestBody LoginBody form, HttpServletRequest request) {
// 用户登录
- LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
+ LoginUser userInfo = sysLoginService.login(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("请关联角色!");
- }
+// if(CollectionUtils.isEmpty(roles)){
+// return R.fail("请关联角色!");
+// }
- map.put("roleName",roles.get(0).getRoleName());
+// map.put("roleName",roles.get(0).getRoleName());
map.put("info",userInfo);
// 修改用户最后登录时间
SysUser sysUser = new SysUser();
@@ -62,13 +63,11 @@
sysUser.setLoginDate(new Date());
System.out.println("修改用户登录时间"+sysUser);
userClient.updateSysUser(sysUser);
- // 获取登录token
return R.ok(map);
}
@DeleteMapping("logout")
- public R<?> logout(HttpServletRequest request)
- {
+ public R<?> logout(HttpServletRequest request) {
String token = SecurityUtils.getToken(request);
if (StringUtils.isNotEmpty(token))
{
@@ -76,10 +75,11 @@
// 删除用户缓存记录
AuthUtil.logoutByToken(token);
// 记录用户退出日志
- sysLoginService.logout(username);
+ sysLoginService.logout(username, request);
}
return R.ok();
}
+
@PostMapping("refresh")
public R<?> refresh(HttpServletRequest request)
@@ -95,10 +95,11 @@
}
@PostMapping("register")
- public R<?> register(@RequestBody RegisterBody registerBody)
+ public R<?> register(@RequestBody RegisterBody registerBody, HttpServletRequest request)
{
// 用户注册
- sysLoginService.register(registerBody.getUsername(), registerBody.getPassword());
+ sysLoginService.register(registerBody.getUsername(), registerBody.getPassword(), request);
return R.ok();
}
+
}
--
Gitblit v1.7.1