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>>
<#if column.columnType != 'Timestamp'>
-
- <#else >
-
+
+ <#else >
+
#if>
#if>
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>