From 6f91919a81c92766cb6a119dfe099b83a22ef446 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 15 八月 2024 11:59:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 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..ccab699 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,9 +1,8 @@
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;
@@ -39,14 +38,18 @@
@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();
@@ -62,13 +65,15 @@
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,7 +81,7 @@
// 删除用户缓存记录
AuthUtil.logoutByToken(token);
// 记录用户退出日志
- sysLoginService.logout(username);
+ sysLoginService.logout(username, request);
}
return R.ok();
}
@@ -95,10 +100,10 @@
}
@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