From 0cd4ff9047450647cd8d2d2bb46e4a404566c7aa Mon Sep 17 00:00:00 2001 From: ZhengJie <201507802@qq.com> Date: Wed, 10 Jun 2020 21:07:20 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E5=AE=8C=E6=88=90](v2.5):?= =?UTF-8?q?=20=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=EF=BC=8C=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=A0=81=E6=94=B9=E4=B8=BA=E7=AE=97=E6=9C=AF=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=EF=BC=8C=E9=95=BF=E5=BA=A6=E6=94=B9=E4=B8=BA2?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/security/config/SecurityConfig.java | 2 +- .../security/config/bean/LoginProperties.java | 10 ++++------ .../main/resources/config/application-dev.yml | 7 +++---- .../main/resources/config/application-prod.yml | 4 ++-- .../src/main/resources/config/application.yml | 17 ----------------- 5 files changed, 10 insertions(+), 30 deletions(-) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/SecurityConfig.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/config/SecurityConfig.java index 5aba070d..2f110398 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/SecurityConfig.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/config/SecurityConfig.java @@ -131,7 +131,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { } private Map> getAnonymousUrl(Map handlerMethodMap) { - Map> anonymousUrls = new HashMap<>(); + Map> anonymousUrls = new HashMap<>(6); Set get = new HashSet<>(); Set post = new HashSet<>(); Set put = new HashSet<>(); 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 48f05ad0..7d948ed0 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 @@ -19,14 +19,12 @@ package me.zhengjie.modules.security.config.bean; import com.wf.captcha.*; import com.wf.captcha.base.Captcha; import me.zhengjie.exception.BadConfigurationException; - import java.util.Objects; /** * 配置文件读取 - * - * @author: liaojinlong - * @date: loginCode.length0loginCode.length0/6/10 17:loginCode.length6 + * @author liaojinlong + * @date loginCode.length0loginCode.length0/6/10 17:loginCode.length6 */ public class LoginProperties { @@ -65,8 +63,7 @@ public class LoginProperties { loginCode.setCodeType(LoginCodeEnum.arithmetic); } } - Captcha captcha = switchCaptcha(loginCode); - return captcha; + return switchCaptcha(loginCode); } /** @@ -100,6 +97,7 @@ public class LoginProperties { case spec: captcha = new SpecCaptcha(loginCode.getWidth(), loginCode.getHeight()); captcha.setLen(loginCode.getLength()); + break; default: throw new BadConfigurationException("验证码配置信息错误！！！正确配置查看 me.zhengjie.modules.security.config.bean.LoginCodeEnum "); } diff --git a/eladmin-system/src/main/resources/config/application-dev.yml b/eladmin-system/src/main/resources/config/application-dev.yml index 12cf5bcc..0811295c 100644 --- a/eladmin-system/src/main/resources/config/application-dev.yml +++ b/eladmin-system/src/main/resources/config/application-dev.yml @@ -50,8 +50,8 @@ login: single: false # 验证码 login-code: - # 验证码类型配置 - code-type: chinese_gif + # 验证码类型配置 查看 LoginProperties 类 + code-type: arithmetic # 登录图形验证码有效时间/分钟 expiration: 2 # 验证码高度 @@ -59,7 +59,7 @@ login: # 验证码宽度 heigth: 36 # 内容长度 - length: 3 + length: 2 #jwt jwt: @@ -91,7 +91,6 @@ swagger: ip: local-parsing: true - # 文件存储路径 file: mac: diff --git a/eladmin-system/src/main/resources/config/application-prod.yml b/eladmin-system/src/main/resources/config/application-prod.yml index 1c16b5a8..cd26ca0f 100644 --- a/eladmin-system/src/main/resources/config/application-prod.yml +++ b/eladmin-system/src/main/resources/config/application-prod.yml @@ -52,7 +52,7 @@ login: single: false # 验证码 login-code: - # 验证码类型配置 + # 验证码类型配置 查看 LoginProperties 类 code-type: chinese_gif # 登录图形验证码有效时间/分钟 expiration: 2 @@ -61,7 +61,7 @@ login: # 验证码宽度 heigth: 36 # 内容长度 - length: 3 + length: 2 #jwt jwt: diff --git a/eladmin-system/src/main/resources/config/application.yml b/eladmin-system/src/main/resources/config/application.yml index ee547363..a7123167 100644 --- a/eladmin-system/src/main/resources/config/application.yml +++ b/eladmin-system/src/main/resources/config/application.yml @@ -50,23 +50,6 @@ qiniu: code: expiration: 300 -# 登录相关配置 -login: - # 是否限制单用户登录 - single: false - # 验证码 - login-code: - # 验证码类型配置 - code-type: chinese_gif - # 登录图形验证码有效时间/分钟 - expiration: 2 - # 验证码高度 - width: 111 - # 验证码宽度 - heigth: 36 - # 内容长度 - length: 3 - #密码加密传输，前端公钥加密，后端私钥解密 rsa: private_key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A==