Merge branch 'master' into deploy

# Conflicts:
#	eladmin-system/src/main/java/me/zhengjie/AppRun.java
pull/789/head
Zheng Jie 2022-03-07 14:15:18 +08:00
commit 9fab663691
8 changed files with 19 additions and 15 deletions

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -47,6 +47,8 @@ public class AppRun {
public static void main(String[] args) {
SpringApplication springApplication = new SpringApplication(AppRun.class);
// 监控应用的PID启动时可指定PID路径--spring.pid.file=/home/eladmin/app.pid
// 或者在 application.yml 添加文件路径,方便 killkill `cat /home/eladmin/app.pid`
springApplication.addListeners(new ApplicationPidFileWriter());
springApplication.run(args);
}

View File

@ -26,18 +26,18 @@ public enum LoginCodeEnum {
/**
*
*/
arithmetic,
ARITHMETIC,
/**
*
*/
chinese,
CHINESE,
/**
*
*/
chinese_gif,
CHINESE_GIF,
/**
*
*/
gif,
spec
GIF,
SPEC
}

View File

@ -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;

View File

@ -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];
}
// 保存

View File

@ -12,6 +12,8 @@ spring:
redis:
repositories:
enabled: false
# pid:
# file: /自行指定位置/eladmin.pid
#配置 Jpa
jpa: