From a996d2b2857d94dde83de44afc33ae96411d17d3 Mon Sep 17 00:00:00 2001 From: ZhengJie <201507802@qq.com> Date: Thu, 2 Jul 2020 15:10:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](v2.5?= =?UTF-8?q?):=20update=20application-prod.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- eladmin-system/src/main/resources/config/application-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eladmin-system/src/main/resources/config/application-prod.yml b/eladmin-system/src/main/resources/config/application-prod.yml index a4122c28..00d56a7d 100644 --- a/eladmin-system/src/main/resources/config/application-prod.yml +++ b/eladmin-system/src/main/resources/config/application-prod.yml @@ -55,7 +55,7 @@ login: # 验证码 login-code: # 验证码类型配置 查看 LoginProperties 类 - code-type: chinese_gif + code-type: arithmetic # 登录图形验证码有效时间/分钟 expiration: 2 # 验证码高度 From 538e7a6e394e6c6774dc93ae506bb063b7da3dc6 Mon Sep 17 00:00:00 2001 From: ZhengJie <201507802@qq.com> Date: Sun, 5 Jul 2020 14:31:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](v2.5?= =?UTF-8?q?):=20=E9=92=88=E5=AF=B9=E7=BA=BF=E4=B8=8A=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E4=B8=AD=E6=96=87=E9=AA=8C=E8=AF=81=E4=B9=B1=E7=A0=81=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E5=9C=A8=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E9=AA=8C=E8=AF=81=E7=A0=81=E5=AD=97=E4=BD=93?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=8F=AF=E6=9B=B4=E6=8D=A2=E4=B8=BA?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=94=AF=E6=8C=81=E7=9A=84=E5=AD=97=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit close https://github.com/elunez/eladmin/issues/429 --- .../config/ConfigBeanConfiguration.java | 1 + .../security/config/bean/LoginCode.java | 48 +++++-------------- .../security/config/bean/LoginProperties.java | 26 ++++------ .../main/resources/config/application-dev.yml | 4 ++ .../resources/config/application-prod.yml | 4 ++ 5 files changed, 29 insertions(+), 54 deletions(-) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/ConfigBeanConfiguration.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/config/ConfigBeanConfiguration.java index 78a1bd20..fde89507 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/ConfigBeanConfiguration.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/config/ConfigBeanConfiguration.java @@ -28,6 +28,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration public class ConfigBeanConfiguration { + @Bean @ConfigurationProperties(prefix = "login", ignoreUnknownFields = true) public LoginProperties loginProperties() { diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginCode.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginCode.java index a27fe710..99660787 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginCode.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginCode.java @@ -15,13 +15,17 @@ */ package me.zhengjie.modules.security.config.bean; +import lombok.Data; + /** * 登录验证码配置信息 * * @author: liaojinlong * @date: 2020/6/10 18:53 */ +@Data public class LoginCode { + /** * 验证码配置 */ @@ -42,44 +46,16 @@ public class LoginCode { * 验证码高度 */ private int height = 36; + /** + * 验证码字体 + */ + private String fontName; + /** + * 字体大小 + */ + private int fontSize = 25; public LoginCodeEnum getCodeType() { return codeType; } - - public void setCodeType(LoginCodeEnum codeType) { - this.codeType = codeType; - } - - public Long getExpiration() { - return expiration; - } - - public void setExpiration(Long expiration) { - this.expiration = expiration; - } - - public int getLength() { - return length; - } - - public void setLength(int length) { - this.length = length; - } - - public int getWidth() { - return width; - } - - public void setWidth(int width) { - this.width = width; - } - - public int getHeight() { - return height; - } - - public void setHeight(int height) { - this.height = height; - } } 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 35ebcb1f..a609f5c9 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 @@ -15,11 +15,13 @@ */ package me.zhengjie.modules.security.config.bean; - import com.wf.captcha.*; import com.wf.captcha.base.Captcha; +import lombok.Data; import me.zhengjie.exception.BadConfigurationException; +import me.zhengjie.utils.StringUtils; +import java.awt.*; import java.util.Objects; /** @@ -28,6 +30,7 @@ import java.util.Objects; * @author liaojinlong * @date loginCode.length0loginCode.length0/6/10 17:loginCode.length6 */ +@Data public class LoginProperties { /** @@ -45,26 +48,10 @@ public class LoginProperties { return singleLogin; } - public void setSingleLogin(boolean singleLogin) { - this.singleLogin = singleLogin; - } - - public LoginCode getLoginCode() { - return loginCode; - } - - public void setLoginCode(LoginCode loginCode) { - this.loginCode = loginCode; - } - public boolean isCacheEnable() { return cacheEnable; } - public void setCacheEnable(boolean cacheEnable) { - this.cacheEnable = cacheEnable; - } - /** * 获取验证码生产类 * @@ -113,9 +100,12 @@ public class LoginProperties { captcha.setLen(loginCode.getLength()); break; default: - throw new BadConfigurationException("验证码配置信息错误！！！正确配置查看 me.zhengjie.modules.security.config.bean.LoginCodeEnum "); + throw new BadConfigurationException("验证码配置信息错误！正确配置查看 LoginCodeEnum "); } } + if(StringUtils.isNotBlank(loginCode.getFontName())){ + captcha.setFont(new Font(loginCode.getFontName(), Font.PLAIN, loginCode.getFontSize())); + } return captcha; } } diff --git a/eladmin-system/src/main/resources/config/application-dev.yml b/eladmin-system/src/main/resources/config/application-dev.yml index c68f99f5..411b9078 100644 --- a/eladmin-system/src/main/resources/config/application-dev.yml +++ b/eladmin-system/src/main/resources/config/application-dev.yml @@ -62,6 +62,10 @@ login: heigth: 36 # 内容长度 length: 2 + # 字体名称，为空则使用默认字体 + font-name: + # 字体大小 + font-size: 25 #jwt jwt: diff --git a/eladmin-system/src/main/resources/config/application-prod.yml b/eladmin-system/src/main/resources/config/application-prod.yml index 00d56a7d..811ca032 100644 --- a/eladmin-system/src/main/resources/config/application-prod.yml +++ b/eladmin-system/src/main/resources/config/application-prod.yml @@ -64,6 +64,10 @@ login: heigth: 36 # 内容长度 length: 2 + # 字体名称，为空则使用默认字体，如遇到线上乱码，设置其他字体即可 + font-name: + # 字体大小 + font-size: 25 #jwt jwt: