From e06ec08400c8e3931ab5e177a0e156cb743049f9 Mon Sep 17 00:00:00 2001 From: YJRY <33829084+YJRY@users.noreply.github.com> Date: Fri, 4 Mar 2022 09:52:37 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96]=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E5=80=BC=E8=B0=83=E6=95=B4=E4=B8=BA=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E5=A4=A7=E5=86=99=EF=BC=9B=E6=9E=9A=E4=B8=BE=E7=9A=84find?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=BC=98=E5=8C=96=20(#730)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: xuqi --- .../java/me/zhengjie/utils/enums/CodeBiEnum.java | 2 +- .../java/me/zhengjie/utils/enums/DataScopeEnum.java | 2 +- .../me/zhengjie/utils/enums/RequestMethodEnum.java | 2 +- .../modules/security/config/bean/LoginCodeEnum.java | 10 +++++----- .../security/config/bean/LoginProperties.java | 12 ++++++------ .../security/rest/AuthorizationController.java | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/enums/CodeBiEnum.java b/eladmin-common/src/main/java/me/zhengjie/utils/enums/CodeBiEnum.java index 661e0a0c..944bc71c 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/enums/CodeBiEnum.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/enums/CodeBiEnum.java @@ -40,7 +40,7 @@ public enum CodeBiEnum { public static CodeBiEnum find(Integer code) { for (CodeBiEnum value : CodeBiEnum.values()) { - if (code.equals(value.getCode())) { + if (value.getCode().equals(code)) { return value; } } diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/enums/DataScopeEnum.java b/eladmin-common/src/main/java/me/zhengjie/utils/enums/DataScopeEnum.java index 5352b7bb..465eef65 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/enums/DataScopeEnum.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/enums/DataScopeEnum.java @@ -43,7 +43,7 @@ public enum DataScopeEnum { public static DataScopeEnum find(String val) { for (DataScopeEnum dataScopeEnum : DataScopeEnum.values()) { - if (val.equals(dataScopeEnum.getValue())) { + if (dataScopeEnum.getValue().equals(val)) { return dataScopeEnum; } } diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/enums/RequestMethodEnum.java b/eladmin-common/src/main/java/me/zhengjie/utils/enums/RequestMethodEnum.java index 1b65c786..35e42b80 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/enums/RequestMethodEnum.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/enums/RequestMethodEnum.java @@ -65,7 +65,7 @@ public enum RequestMethodEnum { public static RequestMethodEnum find(String type) { for (RequestMethodEnum value : RequestMethodEnum.values()) { - if (type.equals(value.getType())) { + if (value.getType().equals(type)) { return value; } } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginCodeEnum.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginCodeEnum.java index 9ff398f2..685ccbbb 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginCodeEnum.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginCodeEnum.java @@ -26,18 +26,18 @@ public enum LoginCodeEnum { /** * 算数 */ - arithmetic, + ARITHMETIC, /** * 中文 */ - chinese, + CHINESE, /** * 中文闪图 */ - chinese_gif, + CHINESE_GIF, /** * 闪图 */ - gif, - spec + GIF, + SPEC } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginProperties.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginProperties.java index b13f173e..7ce91fc8 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginProperties.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginProperties.java @@ -62,7 +62,7 @@ public class LoginProperties { if (Objects.isNull(loginCode)) { loginCode = new LoginCode(); if (Objects.isNull(loginCode.getCodeType())) { - loginCode.setCodeType(LoginCodeEnum.arithmetic); + loginCode.setCodeType(LoginCodeEnum.ARITHMETIC); } } return switchCaptcha(loginCode); @@ -78,25 +78,25 @@ public class LoginProperties { Captcha captcha; synchronized (this) { switch (loginCode.getCodeType()) { - case arithmetic: + case ARITHMETIC: // 算术类型 https://gitee.com/whvse/EasyCaptcha captcha = new FixedArithmeticCaptcha(loginCode.getWidth(), loginCode.getHeight()); // 几位数运算，默认是两位 captcha.setLen(loginCode.getLength()); break; - case chinese: + case CHINESE: captcha = new ChineseCaptcha(loginCode.getWidth(), loginCode.getHeight()); captcha.setLen(loginCode.getLength()); break; - case chinese_gif: + case CHINESE_GIF: captcha = new ChineseGifCaptcha(loginCode.getWidth(), loginCode.getHeight()); captcha.setLen(loginCode.getLength()); break; - case gif: + case GIF: captcha = new GifCaptcha(loginCode.getWidth(), loginCode.getHeight()); captcha.setLen(loginCode.getLength()); break; - case spec: + case SPEC: captcha = new SpecCaptcha(loginCode.getWidth(), loginCode.getHeight()); captcha.setLen(loginCode.getLength()); break; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java index 9646d73b..634356d5 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java @@ -123,7 +123,7 @@ public class AuthorizationController { String uuid = properties.getCodeKey() + IdUtil.simpleUUID(); //当验证码类型为 arithmetic时且长度 >= 2 时，captcha.text()的结果有几率为浮点型 String captchaValue = captcha.text(); - if (captcha.getCharType() - 1 == LoginCodeEnum.arithmetic.ordinal() && captchaValue.contains(".")) { + if (captcha.getCharType() - 1 == LoginCodeEnum.ARITHMETIC.ordinal() && captchaValue.contains(".")) { captchaValue = captchaValue.split("\\.")[0]; } // 保存