From a04d4cced11bec0b33fba6fbf835a5e11f988d6d Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期四, 13 二月 2025 16:28:19 +0800
Subject: [PATCH] bug
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppLoginController.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 7 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 d7595f8..138ad68 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,7 +2,7 @@
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sinata.common.constant.Constants;
import com.sinata.common.core.domain.AjaxResult;
import com.sinata.common.core.domain.R;
@@ -11,15 +11,19 @@
import com.sinata.common.core.domain.entity.SysUser;
import com.sinata.common.core.domain.model.LoginBody;
import com.sinata.common.core.domain.model.LoginUser;
+import com.sinata.common.core.redis.RedisCache;
import com.sinata.common.utils.SecurityUtils;
import com.sinata.common.utils.StringUtils;
import com.sinata.framework.web.service.SysLoginService;
import com.sinata.framework.web.service.SysPermissionService;
import com.sinata.framework.web.service.TokenService;
import com.sinata.system.domain.SysDepartment;
+import com.sinata.system.domain.SysUserRole;
import com.sinata.system.domain.dto.UserInfoDTO;
+import com.sinata.system.mapper.SysUserRoleMapper;
import com.sinata.system.service.ISysMenuService;
import com.sinata.system.service.ISysRoleService;
+import com.sinata.system.service.ISysUserService;
import com.sinata.system.service.SysDepartmentService;
import com.sinata.system.service.biz.AliSmsService;
import com.sinata.web.controller.tool.weChat.WXCore;
@@ -27,11 +31,13 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
-import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
import java.util.Random;
@@ -66,6 +72,10 @@
private SysDepartmentService departmentService;
@Resource
private AliSmsService aliSmsService;
+ @Resource
+ private ISysUserService userService;
+ @Autowired
+ private RedisCache redisCache;
@PostMapping("/getCode")
@@ -73,11 +83,29 @@
public AjaxResult getCode(String phone)
{
Random random = new Random();
-
+ List<SysUser> list = userService.lambdaQuery().eq(SysUser::getUserName, phone).list();
+ if (list.isEmpty()){
+ return AjaxResult.error("当前手机号没有对应用户，请联系管理员");
+ }
int i = 100000 + random.nextInt(900000);
aliSmsService.sendLoginCode(phone, String.valueOf(i));
+ redisCache.setCacheObject(String.valueOf(phone), String.valueOf(i));
return AjaxResult.success();
}
+
+
+ @PostMapping("/set/getCode")
+ @ApiOperation("获取验证码")
+ public AjaxResult setgetCode(String phone)
+ {
+ Random random = new Random();
+ int i = 100000 + random.nextInt(900000);
+ aliSmsService.sendLoginCode(phone, String.valueOf(i));
+ redisCache.setCacheObject(String.valueOf(phone), String.valueOf(i));
+ return AjaxResult.success();
+ }
+
+
@Resource
private WeChatUtil weChatUtil;
@@ -126,7 +154,13 @@
// }
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;
@@ -140,17 +174,25 @@
SysDepartment byId = departmentService.getById(user.getDepartmentId());
return R.ok(byId);
}
+ @Resource
+ private SysUserRoleMapper sysUserRoleMapper;
@PostMapping("/get/user")
@ApiOperation("获取个人信息")
public R<UserInfoDTO> user()
{
- SysUser user = SecurityUtils.getLoginUser().getUser();
+ SysUser user1 = SecurityUtils.getLoginUser().getUser();
+ SysUser user = userService.getById(user1.getUserId());
Set<String> roles = permissionService.getRolePermission(user);
SysDepartment byId2 = departmentService.getById(user.getDepartmentId());
UserInfoDTO userInfoDTO = new UserInfoDTO();
userInfoDTO.setNickName(user.getNickName());
userInfoDTO.setDepartment(byId2);
userInfoDTO.setRoles(roles);
+ SysUserRole sysUserRole = sysUserRoleMapper.selectOne(Wrappers.<SysUserRole>lambdaQuery().eq(SysUserRole::getUserId, user.getUserId()));
+ if (sysUserRole != null) {
+ SysRole byId = roleService.getById(sysUserRole.getRoleId());
+ userInfoDTO.setRole(byId);
+ }
return R.ok(userInfoDTO);
}
--
Gitblit v1.7.1