From f5ffe11ec9547186e9f4c42d0b6571580b7da9e7 Mon Sep 17 00:00:00 2001 From: mashuai Date: Tue, 28 May 2024 10:29:31 +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 f678d2b2..fc8325c0 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) { - //String decryptedData = RsaUtil.decryptByPrivateKey(form.getPassword(), privateKey); + public R login(@RequestBody LoginBody form) throws Exception { + String decryptedData = RsaUtil.decryptByPrivateKey(form.getPassword(), privateKey); // 用户登录 - LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword()); + LoginUser userInfo = sysLoginService.login(form.getUsername(), decryptedData); String uuid = form.getUuid(); String captcha = redisService.getCacheObject(CacheConstants.CAPTCHA_CODE_KEY + uuid).toString(); if (StringUtils.isBlank(captcha)) { From 5d53a58d78a1e9dfc4e0196b96448a5a9b79afaa Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Tue, 28 May 2024 10:37:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E9=99=A4=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/src/store/modules/user.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sgzb-ui/src/store/modules/user.js b/sgzb-ui/src/store/modules/user.js index 1a0ee598..e7c921b5 100644 --- a/sgzb-ui/src/store/modules/user.js +++ b/sgzb-ui/src/store/modules/user.js @@ -1,7 +1,7 @@ import { login, logout, getInfo, refreshToken, checkCode, loginByMall } from '@/api/login' import { getToken, setToken, setExpiresIn, removeToken } from '@/utils/auth' import { Notification, MessageBox, Message, Loading } from 'element-ui' -import { encrypt} from '@/utils/jsencrypt' +import { encrypt } from '@/utils/jsencrypt' const user = { state: { @@ -41,7 +41,8 @@ const user = { // 登录 Login({ commit }, userInfo) { const username = userInfo.username.trim() - const password = encrypt(userInfo.password) + // const password = encrypt(userInfo.password) + const password = userInfo.password const code = userInfo.code const uuid = userInfo.uuid return new Promise((resolve, reject) => {