github
/
eladmin
mirror of https://github.com/elunez/eladmin
1
0
Fork 0
Code Issues Releases Wiki Activity

[代码优化]枚举值调整为统一大写；枚举的find方法优化 (#730) 

Co-authored-by: xuqi <xuqi@zed.com>
pull/735/head
YJRY 2022-03-04 09:52:37 +08:00 committed by GitHub
parent 0705b123be
commit e06ec08400
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-common/src/main/java/me/zhengjie/utils/enums/CodeBiEnum.java
View File

@ -40,7 +40,7 @@ public enum CodeBiEnum {
public static CodeBiEnum find(Integer code) { public static CodeBiEnum find(Integer code) {
for (CodeBiEnum value : CodeBiEnum.values()) { for (CodeBiEnum value : CodeBiEnum.values()) {
if (code.equals(value.getCode())) { if (value.getCode().equals(code)) {
return value; return value;
} }
} }

2
eladmin-common/src/main/java/me/zhengjie/utils/enums/DataScopeEnum.java
View File

@ -43,7 +43,7 @@ public enum DataScopeEnum {
public static DataScopeEnum find(String val) { public static DataScopeEnum find(String val) {
for (DataScopeEnum dataScopeEnum : DataScopeEnum.values()) { for (DataScopeEnum dataScopeEnum : DataScopeEnum.values()) {
if (val.equals(dataScopeEnum.getValue())) { if (dataScopeEnum.getValue().equals(val)) {
return dataScopeEnum; return dataScopeEnum;
} }
} }

2
eladmin-common/src/main/java/me/zhengjie/utils/enums/RequestMethodEnum.java
View File

@ -65,7 +65,7 @@ public enum RequestMethodEnum {
public static RequestMethodEnum find(String type) { public static RequestMethodEnum find(String type) {
for (RequestMethodEnum value : RequestMethodEnum.values()) { for (RequestMethodEnum value : RequestMethodEnum.values()) {
if (type.equals(value.getType())) { if (value.getType().equals(type)) {
return value; return value;
} }
} }

10
eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginCodeEnum.java
View File

@ -26,18 +26,18 @@ public enum LoginCodeEnum {
/** /**
* 算数 * 算数
*/ */
arithmetic, ARITHMETIC,
/** /**
* 中文 * 中文
*/ */
chinese, CHINESE,
/** /**
* 中文闪图 * 中文闪图
*/ */
chinese_gif, CHINESE_GIF,
/** /**
* 闪图 * 闪图
*/ */
gif, GIF,
spec SPEC
} }

12
eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginProperties.java
View File

@ -62,7 +62,7 @@ public class LoginProperties {
if (Objects.isNull(loginCode)) { if (Objects.isNull(loginCode)) {
loginCode = new LoginCode(); loginCode = new LoginCode();
if (Objects.isNull(loginCode.getCodeType())) { if (Objects.isNull(loginCode.getCodeType())) {
loginCode.setCodeType(LoginCodeEnum.arithmetic); loginCode.setCodeType(LoginCodeEnum.ARITHMETIC);
} }
} }
return switchCaptcha(loginCode); return switchCaptcha(loginCode);
@ -78,25 +78,25 @@ public class LoginProperties {
Captcha captcha; Captcha captcha;
synchronized (this) { synchronized (this) {
switch (loginCode.getCodeType()) { switch (loginCode.getCodeType()) {
case arithmetic: case ARITHMETIC:
// 算术类型 https://gitee.com/whvse/EasyCaptcha // 算术类型 https://gitee.com/whvse/EasyCaptcha
captcha = new FixedArithmeticCaptcha(loginCode.getWidth(), loginCode.getHeight()); captcha = new FixedArithmeticCaptcha(loginCode.getWidth(), loginCode.getHeight());
// 几位数运算，默认是两位 // 几位数运算，默认是两位
captcha.setLen(loginCode.getLength()); captcha.setLen(loginCode.getLength());
break; break;
case chinese: case CHINESE:
captcha = new ChineseCaptcha(loginCode.getWidth(), loginCode.getHeight()); captcha = new ChineseCaptcha(loginCode.getWidth(), loginCode.getHeight());
captcha.setLen(loginCode.getLength()); captcha.setLen(loginCode.getLength());
break; break;
case chinese_gif: case CHINESE_GIF:
captcha = new ChineseGifCaptcha(loginCode.getWidth(), loginCode.getHeight()); captcha = new ChineseGifCaptcha(loginCode.getWidth(), loginCode.getHeight());
captcha.setLen(loginCode.getLength()); captcha.setLen(loginCode.getLength());
break; break;
case gif: case GIF:
captcha = new GifCaptcha(loginCode.getWidth(), loginCode.getHeight()); captcha = new GifCaptcha(loginCode.getWidth(), loginCode.getHeight());
captcha.setLen(loginCode.getLength()); captcha.setLen(loginCode.getLength());
break; break;
case spec: case SPEC:
captcha = new SpecCaptcha(loginCode.getWidth(), loginCode.getHeight()); captcha = new SpecCaptcha(loginCode.getWidth(), loginCode.getHeight());
captcha.setLen(loginCode.getLength()); captcha.setLen(loginCode.getLength());
break; break;

2
eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java
View File

@ -123,7 +123,7 @@ public class AuthorizationController {
String uuid = properties.getCodeKey() + IdUtil.simpleUUID(); String uuid = properties.getCodeKey() + IdUtil.simpleUUID();
//当验证码类型为 arithmetic时且长度 >= 2 时，captcha.text()的结果有几率为浮点型 //当验证码类型为 arithmetic时且长度 >= 2 时，captcha.text()的结果有几率为浮点型
String captchaValue = 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]; captchaValue = captchaValue.split("\\.")[0];
} }
// 保存 // 保存