From 3c8f4a2fd4d826979ca233da9cd909321f9faded Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 17 一月 2025 10:14:34 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 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 a678d16..6b53013 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
@@ -5,6 +5,7 @@
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;
@@ -63,6 +64,27 @@
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());
+ 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);
+ }
@DeleteMapping("logout")
public R<?> logout(HttpServletRequest request) {
--
Gitblit v1.7.1