From 0cbb1c4bc98c29e5ca73961d040a0ec1ca4333ac Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 22 四月 2025 09:07:53 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 24 ++++++++++++++++++++++++
1 files changed, 24 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 6f86adf..450c2bb 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
@@ -41,7 +41,31 @@
@Resource
private SysUserClient sysUserClient;
+ @PostMapping("loginApp")
+ @ApiOperation(value = "2.0新增登录加盟商切换", tags = "2.0新增登录加盟商切换")
+ public R<?> loginApp(@RequestBody LoginBody form) {
+ // 用户登录
+ LoginUser userInfo = sysLoginService.loginApp(form.getUsername());
+ HashMap<String, Object> map = new HashMap<>(8);
+ map.put("token", tokenService.createToken(userInfo));
+ // 获取登录token
+ String roles = userInfo.getRole();
+ if (null == roles) {
+ return R.fail("请关联角色!");
+ }
+ map.put("roleName", roles);
+ map.put("info", userInfo);
+ // 权限集合
+ map.put("permissions", userInfo.getPermissions());
+ // 修改用户最后登录时间
+ SysUser sysUser = new SysUser();
+ sysUser.setUserId(userInfo.getSysUser().getUserId());
+ sysUser.setLoginDate(new Date());
+ sysUserClient.updateSysUser(sysUser);
+
+ return R.ok(map);
+ }
@PostMapping("login")
@ApiOperation(value = "登录", tags = "后台-登录")
public R<?> login(@RequestBody LoginBody form) {
--
Gitblit v1.7.1