From 2bd8a9e4df2426b4d8d4f6f4db4e4a328ab1e90b Mon Sep 17 00:00:00 2001 From: jyao Date: Mon, 4 Nov 2019 13:20:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E7=B3=BB=E7=BB=9F=E9=87=8D?= =?UTF-8?q?=E5=90=8D=20AnonymousAccess=20=E6=B3=A8=E8=A7=A3=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8DAnonymousAccessController=20=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=B1=BB=20AnonymousAccess=E6=B3=A8=E8=A7=A3=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=20SecurityConfig=EF=BC=9A?= =?UTF-8?q?=20=E5=88=A4=E5=AE=9A=E6=8E=A5=E5=8F=A3=E5=8C=BF=E5=90=8D?= =?UTF-8?q?=E4=B8=8D=E5=8C=BA=E5=88=86=E5=A4=A7=E5=B0=8F=E5=86=99=20?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E7=94=9F=E6=88=90=E5=99=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rest/AnonymousAccessController.java | 2 +- .../security/annotation/AnonymousAccess.java | 18 ------------------ .../security/config/SecurityConfig.java | 3 +-- .../template/generator/front/eForm.ftl | 6 +++--- .../template/generator/front/index.ftl | 2 +- 5 files changed, 6 insertions(+), 25 deletions(-) delete mode 100644 eladmin-system/src/main/java/me/zhengjie/modules/security/annotation/AnonymousAccess.java diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/rest/AnonymousAccessController.java b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/rest/AnonymousAccessController.java index 1b304dc8..db272c22 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/rest/AnonymousAccessController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/rest/AnonymousAccessController.java @@ -1,6 +1,6 @@ package me.zhengjie.modules.monitor.rest; -import me.zhengjie.modules.security.annotation.AnonymousAccess; +import me.zhengjie.annotation.AnonymousAccess; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/annotation/AnonymousAccess.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/annotation/AnonymousAccess.java deleted file mode 100644 index 661792cf..00000000 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/annotation/AnonymousAccess.java +++ /dev/null @@ -1,18 +0,0 @@ -package me.zhengjie.modules.security.annotation; - -import me.zhengjie.aspect.LimitType; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * @author jacky - * 用于标记匿名访问方法 - */ -@Target(ElementType.METHOD) -@Retention(RetentionPolicy.RUNTIME) -public @interface AnonymousAccess { - -} 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 19a7efe5..f8c6a51f 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 @@ -1,7 +1,6 @@ package me.zhengjie.modules.security.config; import me.zhengjie.annotation.AnonymousAccess; -import me.zhengjie.config.ElPermissionConfig; import me.zhengjie.modules.security.security.JwtAuthenticationEntryPoint; import me.zhengjie.modules.security.security.JwtAuthorizationTokenFilter; import me.zhengjie.modules.security.service.JwtUserDetailsService; @@ -88,7 +87,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { HandlerMethod handlerMethod = infoEntry.getValue(); AnonymousAccess anonymousAccess = handlerMethod.getMethodAnnotation(AnonymousAccess.class); PreAuthorize preAuthorize = handlerMethod.getMethodAnnotation(PreAuthorize.class); - if (null != preAuthorize && preAuthorize.value().contains("anonymous")) { + if (null != preAuthorize && preAuthorize.value().toLowerCase().contains("anonymous")) { anonymousUrls.addAll(infoEntry.getKey().getPatternsCondition().getPatterns()); } else if (null != anonymousAccess && null == preAuthorize) { anonymousUrls.addAll(infoEntry.getKey().getPatternsCondition().getPatterns()); diff --git a/eladmin-system/src/main/resources/template/generator/front/eForm.ftl b/eladmin-system/src/main/resources/template/generator/front/eForm.ftl index de44a6ae..0d3db796 100644 --- a/eladmin-system/src/main/resources/template/generator/front/eForm.ftl +++ b/eladmin-system/src/main/resources/template/generator/front/eForm.ftl @@ -6,9 +6,9 @@ <#if column.changeColumnName != '${pkChangeColName}'> prop="${column.changeColumnName}"> <#if column.columnType != 'Timestamp'> - - <#else > - + + <#else > + diff --git a/eladmin-system/src/main/resources/template/generator/front/index.ftl b/eladmin-system/src/main/resources/template/generator/front/index.ftl index 456e955a..2e553818 100644 --- a/eladmin-system/src/main/resources/template/generator/front/index.ftl +++ b/eladmin-system/src/main/resources/template/generator/front/index.ftl @@ -40,7 +40,7 @@ <#list columns as column> <#if column.columnShow = 'true'> <#if column.columnType != 'Timestamp'> - + <#else>