From d0f8732a1e4c275301b53c49ee8f00727651491e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 九月 2024 19:49:34 +0800
Subject: [PATCH] 修改接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index de9cc1e..f233a45 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -71,7 +71,7 @@
return AjaxResult.error("用户不存在!");
}
if(sysUser.getRoleType() != 1){
- return AjaxResult.error("商家无法登录平台系统!请访问商家平台");
+ return AjaxResult.error("商家账号无权限登录");
}
@@ -128,6 +128,38 @@
}
/**
+ * 商家跳转登录
+ *
+ * @param loginBody 登录信息
+ * @return 结果
+ */
+ @ApiOperation(value = "商家跳转登录",notes = "商家跳转登录")
+ @PostMapping("/reLogin")
+ public AjaxResult<Map<String,Object>> reLogin(@RequestBody LoginBody loginBody)
+ {
+ Map<String,Object> map = new HashMap<>();
+ loginBody.setPassword("123456");
+ // 生成令牌
+ LoginUser loginUser = loginService.reLogin(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+ loginBody.getUuid());
+ map.put(Constants.TOKEN, tokenService.createToken(loginUser));
+ List<SysRole> roles = loginUser.getUser().getRoles();
+ if(CollectionUtils.isEmpty(roles)){
+ return AjaxResult.error("请关联角色!");
+ }
+ if(roles.get(0).getStatus() == 1){
+ return AjaxResult.error("该账号角色已被禁用!");
+ }
+
+ List<SysMenu> menus = roleService.roleInfoFromUserId(loginUser.getUserId());
+
+ map.put("menus",menus);
+ map.put("roleName",roles.get(0).getRoleName());
+ map.put("userInfo",loginUser);
+ return AjaxResult.success(map);
+ }
+
+ /**
* 账号密码登录
*
* @param loginBody 登录信息
--
Gitblit v1.7.1