From 8cc10807253fd645cd87b3fb68e240af1bfe4be7 Mon Sep 17 00:00:00 2001 From: winLsy <18332763730@163.com> Date: Fri, 15 Dec 2017 18:09:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E8=A7=84=E8=8C=83=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extend/mojo/MybatisGeneratorExtendMojo.java | 2 +- .../extend/service/MybatisGeneratorExtend.java | 2 +- .../browser/controller/BrowserSecurityController.java | 5 ++++- .../fast/security/core/browser/constant/LoginType.java | 10 ++++++++-- .../core/validate/code/filter/ValidateCodeFilter.java | 2 +- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/java/com/micro/fast/mybatis/generator/extend/mojo/MybatisGeneratorExtendMojo.java b/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/java/com/micro/fast/mybatis/generator/extend/mojo/MybatisGeneratorExtendMojo.java index def7b67..5925202 100644 --- a/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/java/com/micro/fast/mybatis/generator/extend/mojo/MybatisGeneratorExtendMojo.java +++ b/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/java/com/micro/fast/mybatis/generator/extend/mojo/MybatisGeneratorExtendMojo.java @@ -35,7 +35,7 @@ public class MybatisGeneratorExtendMojo extends AbstractMojo { } //加载插件所需要的配置文件 new PropertiesUtil().loadProperties(projectPath); - MybatisGeneratorExtend.GenerateMybatisGeneratorNeedFilesByTemplates(projectPath); + MybatisGeneratorExtend.generateMybatisGeneratorNeedFilesByTemplates(projectPath); } } diff --git a/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/java/com/micro/fast/mybatis/generator/extend/service/MybatisGeneratorExtend.java b/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/java/com/micro/fast/mybatis/generator/extend/service/MybatisGeneratorExtend.java index 5914d59..1e1d0ab 100644 --- a/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/java/com/micro/fast/mybatis/generator/extend/service/MybatisGeneratorExtend.java +++ b/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/java/com/micro/fast/mybatis/generator/extend/service/MybatisGeneratorExtend.java @@ -48,7 +48,7 @@ public class MybatisGeneratorExtend { /** * 根据模板引擎生成mybatis-generator需要的文件 */ - public static void GenerateMybatisGeneratorNeedFilesByTemplates(String projectPath) { + public static void generateMybatisGeneratorNeedFilesByTemplates(String projectPath) { Connection jdbcConection = JdbcConnection.getJdbcConection(); Statement statement = null; ResultSet resultSet = null; diff --git a/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/controller/BrowserSecurityController.java b/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/controller/BrowserSecurityController.java index dccc989..28c7cfb 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/controller/BrowserSecurityController.java +++ b/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/controller/BrowserSecurityController.java @@ -29,6 +29,9 @@ public class BrowserSecurityController { private SecurityProperties securityProperties; private static final Logger log = LoggerFactory.getLogger(BrowserSecurityController.class); + + private static final String REQUEST_URL_SUFFIX = ".html"; + /** * 用于获取引发身份认证的请求缓存 */ @@ -47,7 +50,7 @@ public class BrowserSecurityController { if (StringUtils.isNotBlank(redirectUrl)){ log.info("引发跳转的请求是：{}",redirectUrl); //如果是由于访问页面触发的权限认证就重定向到登录页面 - if (StringUtils.endsWithIgnoreCase(redirectUrl,".html")){ + if (StringUtils.endsWithIgnoreCase(redirectUrl,REQUEST_URL_SUFFIX)){ //进行请求的重定向重定向到用户定义登录页面 redirectStrategy.sendRedirect(request,response,securityProperties.getBrowser().getHtml()); } diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/browser/constant/LoginType.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/browser/constant/LoginType.java index 725488c..a930b33 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/browser/constant/LoginType.java +++ b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/browser/constant/LoginType.java @@ -4,6 +4,12 @@ package com.micro.fast.security.core.browser.constant; * 用户进行身份认证后返回的类型 */ public enum LoginType { - REDIRECT //以页面的形式返回身份认证结果，如果成功的话就返回触发身份认证的页面，如果失败的就返回错误页面 - ,JSON; //以json形式返回结果 + /** + * 以页面的形式返回身份认证结果，如果成功的话就返回触发身份认证的页面，如果失败的就返回错误页面 + */ + REDIRECT + /** + * 以json形式返回结果 + */ + ,JSON; } diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/filter/ValidateCodeFilter.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/filter/ValidateCodeFilter.java index 9b5f222..1a1a344 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/filter/ValidateCodeFilter.java +++ b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/filter/ValidateCodeFilter.java @@ -24,10 +24,10 @@ import java.util.Set; /** * 图片验证码校验过滤器 + * @author LSY */ public class ValidateCodeFilter extends OncePerRequestFilter implements InitializingBean{ - private AuthenticationFailureHandler authenticationFailureHandler; /** * session操作工具类