From 159a0eaec2055faf13ee184a2166c49414723baa Mon Sep 17 00:00:00 2001 From: thinkgem Date: Wed, 11 Sep 2019 11:44:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/core/src/main/resources/config/beetl-core.properties | 1 - modules/core/src/main/resources/config/jeesite-core.yml | 2 +- modules/core/src/main/resources/views/error/500.html | 2 +- web/src/main/resources/config/application.yml | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/core/src/main/resources/config/beetl-core.properties b/modules/core/src/main/resources/config/beetl-core.properties index 59439240..6f2c8801 100644 --- a/modules/core/src/main/resources/config/beetl-core.properties +++ b/modules/core/src/main/resources/config/beetl-core.properties @@ -1,4 +1,3 @@ - #######默认配置(/org/beetl/core/beetl-default.properties) ENGINE=org.beetl.core.engine.FastRuntimeEngine DELIMITER_PLACEHOLDER_START=${ diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml index 7e80bd03..ca84e0db 100644 --- a/modules/core/src/main/resources/config/jeesite-core.yml +++ b/modules/core/src/main/resources/config/jeesite-core.yml @@ -384,11 +384,11 @@ shiro: # ${adminPath}/sys/corpAdmin/treeData = anon # ${adminPath}/** = user filterChainDefinitions: | - /ReportServer/** = user ${adminPath}/** = user # 默认的授权过滤定义,如果在filterChainDefinitions中已经定义,则该定义会被覆盖。 defaultFilterChainDefinitions: | + /validCode = anon /static/** = anon /userfiles/** = anon /druid/** = perms[sys:state:druid] diff --git a/modules/core/src/main/resources/views/error/500.html b/modules/core/src/main/resources/views/error/500.html index 7954d46a..9da68c38 100644 --- a/modules/core/src/main/resources/views/error/500.html +++ b/modules/core/src/main/resources/views/error/500.html @@ -11,7 +11,7 @@ if (isBlank(message)){ if (@StringUtils.startsWith(e.message!, "msg:")){ message = @StringUtils.replace(e.message!, "msg:", ""); break; - }else if (e.class.name! == 'com.jeesite.common.service.ServiceException'){ + }else if (type.name(e) == 'ServiceException'){ message = e.message!; break; } diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml index 56254c40..87f07731 100644 --- a/web/src/main/resources/config/application.yml +++ b/web/src/main/resources/config/application.yml @@ -406,7 +406,6 @@ logging: # # # URI 权限过滤器定义 # filterChainDefinitions: | -# /ReportServer/** = user # ${adminPath}/** = user # Session 相关