From f95c4b7c798da30b2c35306691ebf15e989870c7 Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期五, 21 二月 2025 09:42:52 +0800
Subject: [PATCH] bug
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppLoginController.java | 53 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 38 insertions(+), 15 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppLoginController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppLoginController.java
index 138ad68..69cfbf7 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppLoginController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppLoginController.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sinata.common.constant.Constants;
import com.sinata.common.core.domain.AjaxResult;
@@ -139,33 +140,55 @@
* @param loginBody 登录信息
* @return 结果
*/
+// @PostMapping("/login")
+// @ApiOperation("验证码登录")
+// public AjaxResult login(@RequestBody LoginBody loginBody)
+// {
+// AjaxResult ajax = AjaxResult.success();
+// // 生成令牌
+// LoginUser loginUser = loginService.login1(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+// loginBody.getUuid());
+// ajax.put(Constants.TOKEN, tokenService.createToken(loginUser));
+// // List<SysRole> roles = loginUser.getUser().getRoles();
+// // if (CollectionUtils.isEmpty(roles)) {
+// // return AjaxResult.error("请关联角色!");
+// // }
+
+// List<SysMenu> menus = roleService.roleInfoFromUserId(loginUser.getUserId());
+// String string = redisCache.getCacheObject(loginBody.getUsername()).toString();
+// if (StringUtils.isBlank(string)) {
+// return AjaxResult.error("验证码已失效");
+// }
+// if (!loginBody.getCode().equals(string)){
+// return AjaxResult.error("验证码错误，请重试");
+// }
+// // ajax.put("menus", menus);
+// ajax.put("userInfo", loginUser);
+// return ajax;
+// }
+
@PostMapping("/login")
- @ApiOperation("验证码登录")
+ @ApiOperation("管理后台登录")
public AjaxResult login(@RequestBody LoginBody loginBody)
{
AjaxResult ajax = AjaxResult.success();
// 生成令牌
- LoginUser loginUser = loginService.login1(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+ LoginUser loginUser = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
loginBody.getUuid());
ajax.put(Constants.TOKEN, tokenService.createToken(loginUser));
-// List<SysRole> roles = loginUser.getUser().getRoles();
-// if (CollectionUtils.isEmpty(roles)) {
-// return AjaxResult.error("请关联角色!");
-// }
-
+ List<SysRole> roles = loginUser.getUser().getRoles();
+ if (CollectionUtils.isEmpty(roles)) {
+ return AjaxResult.error("请关联角色!");
+ }
List<SysMenu> menus = roleService.roleInfoFromUserId(loginUser.getUserId());
- String string = redisCache.getCacheObject(loginBody.getUsername()).toString();
- if (StringUtils.isBlank(string)) {
- return AjaxResult.error("验证码已失效");
- }
- if (!loginBody.getCode().equals(string)){
- return AjaxResult.error("验证码错误，请重试");
- }
-// ajax.put("menus", menus);
+ Set<Long> permissions = roleService.getMenuIdSets(loginUser.getUserId());
+ ajax.put("menus", menus);
ajax.put("userInfo", loginUser);
+ ajax.put("permissions", permissions);
return ajax;
}
+
@PostMapping("/get/department")
@ApiOperation("登录后获取部门")
public R<SysDepartment> department()
--
Gitblit v1.7.1