From e2b9f177907375dfec6cbcc276f47aa4c4c3f301 Mon Sep 17 00:00:00 2001 From: mashuai Date: Tue, 28 May 2024 09:10:12 +0800 Subject: [PATCH 1/2] bug --- .../com/bonus/sgzb/auth/controller/TokenController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java index fc8325c0..f678d2b2 100644 --- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java +++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java @@ -57,10 +57,10 @@ public class TokenController { //web端登录 @PostMapping("login") - public R login(@RequestBody LoginBody form) throws Exception { - String decryptedData = RsaUtil.decryptByPrivateKey(form.getPassword(), privateKey); + public R login(@RequestBody LoginBody form) { + //String decryptedData = RsaUtil.decryptByPrivateKey(form.getPassword(), privateKey); // 用户登录 - LoginUser userInfo = sysLoginService.login(form.getUsername(), decryptedData); + LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword()); String uuid = form.getUuid(); String captcha = redisService.getCacheObject(CacheConstants.CAPTCHA_CODE_KEY + uuid).toString(); if (StringUtils.isBlank(captcha)) { From a79ab95fe03db19fbb7348076af80322fe19960d Mon Sep 17 00:00:00 2001 From: mashuai Date: Tue, 28 May 2024 09:29:29 +0800 Subject: [PATCH 2/2] bug --- .../com/bonus/sgzb/system/controller/SysProfileController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysProfileController.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysProfileController.java index 0732640d..caf260c4 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysProfileController.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysProfileController.java @@ -99,7 +99,7 @@ public class SysProfileController extends BaseController { @Log(title = "个人信息", businessType = BusinessType.UPDATE) @PutMapping("/updatePwd") public AjaxResult updatePwd(String oldPassword, String newPassword) { - String username = SecurityUtils.getUsername(); + String username = SecurityUtils.getLoginUser().getUsername(); SysUser user = userService.selectUserByUserName(username); String password = user.getPassword(); if (!SecurityUtils.matchesPassword(oldPassword, password)) {