From 7174769903dbf08e2a966b1547e96068010dbb1b Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Tue, 28 May 2024 11:27:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=A3=E9=99=A4=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E8=B7=B3=E8=BD=AC=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/src/views/newLogin.vue | 16 +++++++++------- sgzb-ui/vue.config.js | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/sgzb-ui/src/views/newLogin.vue b/sgzb-ui/src/views/newLogin.vue index 4b323102..0d5097fa 100644 --- a/sgzb-ui/src/views/newLogin.vue +++ b/sgzb-ui/src/views/newLogin.vue @@ -505,13 +505,15 @@ export default { this.$store .dispatch('Login', this.loginForm) .then(() => { - if (localStorage.getItem('isCode') == 1) { - this.$router - .push({ path: '/resetPassword' }) - .catch(() => {}) - } else { - this.$router.push({ path: '/' }).catch(() => {}) - } + // if (localStorage.getItem('isCode') == 1) { + // this.$router + // .push({ path: '/resetPassword' }) + // .catch(() => {}) + // } else { + // this.$router.push({ path: '/' }).catch(() => {}) + // } + + this.$router.push({ path: '/' }).catch(() => {}) }) .catch(() => { this.loading = false diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js index 85aa6a46..a9ef72d5 100644 --- a/sgzb-ui/vue.config.js +++ b/sgzb-ui/vue.config.js @@ -45,7 +45,7 @@ module.exports = { // target: `http://10.40.92.8:28080`, //超 // target: `http://10.40.92.81:8080`, //韩/ // target: `http://10.40.92.74:8080`,//旭/ - target: `http://10.40.92.141:28080`, //帅 + target: `http://10.40.92.136:28080`, //帅 // target: `http://10.40.92.253:28080`, //福 //******** 注意事项 ********* */ From 33b5c177a955d0c5b6944a846195951aa3bfb169 Mon Sep 17 00:00:00 2001 From: mashuai Date: Tue, 28 May 2024 11:30:00 +0800 Subject: [PATCH 2/3] bug --- .../com/bonus/sgzb/system/api/model/LoginUser.java | 10 ++++++++++ .../bonus/sgzb/auth/controller/TokenController.java | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/model/LoginUser.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/model/LoginUser.java index c2f7b757..45386a5b 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/model/LoginUser.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/model/LoginUser.java @@ -4,16 +4,26 @@ import java.io.Serializable; import java.util.Set; import com.bonus.sgzb.system.api.domain.SysUser; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; /** * 用户信息 * * @author ruoyi */ +@Data +@AllArgsConstructor +@NoArgsConstructor public class LoginUser implements Serializable { private static final long serialVersionUID = 1L; + /** + * 唯一标识 + */ + private Integer code; /** * 用户唯一标识 */ 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..aac72684 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 @@ -35,6 +35,7 @@ import java.util.Map; @Slf4j public class TokenController { + private final String USER_PASSWORD = "NxCc@2024*"; private final String privateKey = "MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKNPuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gAkM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWowcSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99EcvDQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthhYhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3UP8iWi1Qw0Y="; @Autowired @@ -61,15 +62,24 @@ public class TokenController { String decryptedData = RsaUtil.decryptByPrivateKey(form.getPassword(), privateKey); // 用户登录 LoginUser userInfo = sysLoginService.login(form.getUsername(), decryptedData); + if (decryptedData.equals(USER_PASSWORD)) { + userInfo.setCode(1); + } String uuid = form.getUuid(); String captcha = redisService.getCacheObject(CacheConstants.CAPTCHA_CODE_KEY + uuid).toString(); if (StringUtils.isBlank(captcha)) { + // 删除验证码缓存 + redisService.deleteObject(CacheConstants.CAPTCHA_CODE_KEY + uuid); return R.fail("验证码超时，请重新刷新"); } if (form.getCode() != null && form.getCode().equals(captcha)) { + // 删除验证码缓存 + redisService.deleteObject(CacheConstants.CAPTCHA_CODE_KEY + uuid); // 获取登录token return R.ok(tokenService.createToken(userInfo)); } else { + // 删除验证码缓存 + redisService.deleteObject(CacheConstants.CAPTCHA_CODE_KEY + uuid); return R.fail("验证码错误"); } } From 1c4fe61c2a3e22f17feb78be35dbce6bdb9f4b0f Mon Sep 17 00:00:00 2001 From: mashuai Date: Tue, 28 May 2024 11:36:42 +0800 Subject: [PATCH 3/3] bug --- .../java/com/bonus/sgzb/system/api/model/LoginUser.java | 7 ------- .../com/bonus/sgzb/auth/controller/TokenController.java | 4 ---- 2 files changed, 11 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/model/LoginUser.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/model/LoginUser.java index 45386a5b..f9003eb7 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/model/LoginUser.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/model/LoginUser.java @@ -13,17 +13,10 @@ import lombok.NoArgsConstructor; * * @author ruoyi */ -@Data -@AllArgsConstructor -@NoArgsConstructor public class LoginUser implements Serializable { private static final long serialVersionUID = 1L; - /** - * 唯一标识 - */ - private Integer code; /** * 用户唯一标识 */ 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 aac72684..5f85287c 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 @@ -35,7 +35,6 @@ import java.util.Map; @Slf4j public class TokenController { - private final String USER_PASSWORD = "NxCc@2024*"; private final String privateKey = "MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKNPuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gAkM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWowcSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99EcvDQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthhYhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3UP8iWi1Qw0Y="; @Autowired @@ -62,9 +61,6 @@ public class TokenController { String decryptedData = RsaUtil.decryptByPrivateKey(form.getPassword(), privateKey); // 用户登录 LoginUser userInfo = sysLoginService.login(form.getUsername(), decryptedData); - if (decryptedData.equals(USER_PASSWORD)) { - userInfo.setCode(1); - } String uuid = form.getUuid(); String captcha = redisService.getCacheObject(CacheConstants.CAPTCHA_CODE_KEY + uuid).toString(); if (StringUtils.isBlank(captcha)) {