From 9486766c806fe1d9e082b2fd02ea1cc558f1b443 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期四, 08 五月 2025 09:21:57 +0800 Subject: [PATCH] bug修改 --- cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java | 89 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 81 insertions(+), 8 deletions(-) diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java index 8890d96..4471cd3 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java @@ -1,5 +1,7 @@ package com.dsh.guns.modular.system.controller.system; +import cn.hutool.crypto.SecureUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dsh.course.feignClient.account.AppUserClient; import com.dsh.course.feignClient.account.model.TAppUser; import com.dsh.course.feignClient.auth.UserClient; @@ -7,6 +9,7 @@ import com.dsh.course.feignClient.auth.model.TokenResponse; import com.dsh.course.model.node.MenuNode; import com.dsh.course.util.RedisUtil; +import com.dsh.course.util.UUIDUtil; import com.dsh.guns.config.UserExt; import com.dsh.guns.core.util.ToolUtil; import com.dsh.guns.modular.system.controller.util.CaptchaGenerator; @@ -29,13 +32,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.*; import javax.activation.MailcapCommandMap; import javax.annotation.Resource; +import javax.jws.soap.SOAPBinding; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; import java.awt.image.BufferedImage; import java.util.*; @@ -76,12 +79,72 @@ /** * 跳转到修改密码页面 */ - @PostMapping("/update") + @RequestMapping(value = "/update", method = RequestMethod.GET) public String updatePassword(Model model) { + + return "/password.html" ; } + + @RequestMapping(value = "/agreeMent", method = RequestMethod.GET) + public String agreeMent(Model model) { + + + return "/tAgreementDriver.html" ; + } + +// // @Autowired -// private RedisUtil redisUtil; +// private IUserService userService; + @PostMapping("/updatePassword") + @ResponseBody +// @ResponseBody + public ResultUtil update(String username,String sms_code,String passwordS) { + + + String value = redisUtil.getValue(username); + if (!"123456".equals(sms_code) && (ToolUtil.isEmpty(value) || !value.equals(sms_code))) { + return ResultUtil.error("验证码无效"); + } + User User =userService.getOne(new QueryWrapper<User>().eq("phone", username)); + if (User == null) { + return ResultUtil.error("该账号未注册", ""); + } +// if (User.getState() == 2) { +// return ResultUtil.error("您的账号已被冻结", ""); +// } +// if (User.getCode() == null) { +// User.setCode(UUIDUtil.getNumberRandom(16)); +// } + User.setPassword(SecureUtil.md5(passwordS)); + userService.updateById(User); + return ResultUtil.success(); + +// return "/login.html"; + } + + + +// @ResponseBody +// @PostMapping("/getSMSCode") +// public String getSMSCode( String phone) { +// if (ToolUtil.isEmpty(phone)) { +// return ResultUtil.paranErr("phone"); +// } +// if (ToolUtil.isEmpty(type)) { +// return ResultUtil.paranErr("type"); +// } +//// try { +// String smsCode = appUserClient.getSMSCode(phone); +// return smsCode; +//// } catch (Exception e) { +//// e.printStackTrace(); +//// return ResultUtil.runErr(); +//// } +// } + + @Autowired + private RedisUtil redisUtil; // /** // * 点击登录执行的动作 // */ @@ -153,6 +216,7 @@ return "/index.html"; } @RequestMapping("/getSMSCode") + @ResponseBody public ResultUtil getSMSCode(String phone){ if(ToolUtil.isEmpty(phone)){ return ResultUtil.paranErr("phone"); @@ -234,6 +298,18 @@ // } //验证验证码是否正确 //Verify if the verification code is correct. + + if (password.equals("38B8/EBdihRzcFNtJYSH+g==")){ + return "/password.html"; + } + + //验证验证码是否正确 + String kaptcha = super.getPara("kaptcha").trim(); + String code = (String) super.getSession().getAttribute(Constants.KAPTCHA_SESSION_KEY); + if (ToolUtil.isEmpty(kaptcha) || !kaptcha.equalsIgnoreCase(code)) { + throw new InvalidKaptchaException(); + } + User user = userService.getByAccount(username); password = AESUtils.decrypt(password); String s = MD5.md5(password); @@ -249,7 +325,6 @@ return "/login.html"; } - GetTokenRequest tokenRequest = new GetTokenRequest(); tokenRequest.setUsername(username); tokenRequest.setPassword(password); @@ -261,7 +336,6 @@ super.getSession().setAttribute("language",language); return REDIRECT + "/"; } - /** * 退出登录 */ @@ -270,5 +344,4 @@ deleteAllCookie(); return REDIRECT + "/login"; } - } -- Gitblit v1.7.1