upgrade beetl 3.0

modules/core/src/main/resources/config/beetl-core.properties

@@ -8,7 +8,8 @@ DELIMITER_STATEMENT_END=%>
 DIRECT_BYTE_OUTPUT = FALSE
 HTML_TAG_SUPPORT = true
 HTML_TAG_FLAG = #
-HTML_TAG_BINDING_ATTRIBUTE = var
+HTML_TAG_BINDING_ATTRIBUTE = var,export
+HTML_TAG_ATTR_CONVERT=org.beetl.core.text.DefaultAttributeNameConvert
 NATIVE_CALL = TRUE
 TEMPLATE_CHARSET = UTF-8
 #ERROR_HANDLER = org.beetl.core.ConsoleErrorHandler
@@ -34,7 +35,7 @@ IMPORT_PACKAGE_core=\
 	com.jeesite.modules.sys.utils.;\
 
 ### 资源配置，resource后的属性只限于特定ResourceLoader ####
-#classpath 跟路径
+#classpath 跟路径，与框架集成的时候，此配置会被框架代码覆盖而不能生效
 RESOURCE.root = views
 #是否检测文件变化
 RESOURCE.autoCheck = TRUE
@@ -50,10 +51,10 @@ RESOURCE.tagSuffix = html
 #如果采用beetl集成的web应用，可以在渲染模板前调用如下类,此类必须实现WebRenderExt接口
 WEBAPP_EXT = 
 
-#允许html function or Tag 使用特殊的定界符
+#允许html function or Tag 使用特殊的定界符，因为function或者tag通常有大量beetl语句
 FUNCTION_TAG_LIMITER=
 
-#####  扩展 ##############
+#####  扩展，也可以通过特定框架注册##############
 ## 内置的方法
 FN.date = org.beetl.ext.fn.DateFunction
 FN.nvl = org.beetl.ext.fn.NVLFunction
@@ -66,7 +67,9 @@ FN.decode = org.beetl.ext.fn.DecodeFunction
 FN.assert = org.beetl.ext.fn.AssertFunction
 FN.print = org.beetl.ext.fn.Print
 FN.println = org.beetl.ext.fn.Println
+FN.printFile = org.beetl.ext.fn.PrintFile
 FN.trunc = org.beetl.ext.fn.TruncFunction
+FN.trim = org.beetl.ext.fn.TruncFunction2
 #兼容以前版本 empty，用isEmpty代替
 FN.empty = org.beetl.ext.fn.EmptyFunction
 FN.qmark = org.beetl.ext.fn.QuestionMark
@@ -82,6 +85,10 @@ FN.pageCtx = org.beetl.ext.fn.PageContextFunction
 FN.type.new=org.beetl.ext.fn.TypeNewFunction
 FN.type.name=org.beetl.ext.fn.TypeNameFunction
 FN.global=org.beetl.ext.fn.DynamicGlobalValueFunction
+FN.allGlobal=org.beetl.ext.fn.AllGlobaAsJsonlFunction
+FN.hasAttribute=org.beetl.ext.fn.HasAttributeFunction
+FN.env=org.beetl.ext.fn.EnvFunction
+FN.parentTag=org.beetl.ext.fn.ParentTagFunction
 
 ##内置的功能包
 FNP.strutil = org.beetl.ext.fn.StringUtil
@@ -120,7 +127,15 @@ TAG.delete= org.beetl.ext.tag.DeleteTag
 #TAG.htmltagvar= org.beetl.ext.tag.HTMLTagVarBindingWrapper
 TAG.htmltag= com.jeesite.common.beetl.ext.tag.HTMLTag
 TAG.htmltagvar= com.jeesite.common.beetl.ext.tag.HTMLTagVar
+TAG.htmltagexport= com.jeesite.common.beetl.ext.tag.HTMLTagVar
 TAG.cache= org.beetl.ext.tag.cache.CacheTag
+# 一个html风格的include和layout <#html:include file="">
+TAG.html.include= org.beetl.ext.tag.html.IncludeResourceHtmlTag
+TAG.html.layout= org.beetl.ext.tag.html.LayoutResourceHtmlTag
+TAG.html.set= org.beetl.ext.tag.html.SetHtmlTag
+TAG.html.if= org.beetl.ext.tag.html.IfHtmlTag
+TAG.html.foreach= org.beetl.ext.tag.html.ForeachHtmlTag
+#TAG.includeUrl=org.beetl.ext.tag.IncludeUrlTag
 
 ##JeeSite自定义函数
 FN.isBlank = com.jeesite.common.beetl.ext.fn.IsBlank

modules/core/src/main/resources/views/error/500.html

@@ -16,7 +16,9 @@ if (isBlank(message)){
 				break;
 			}
 		}
-		@org.slf4j.LoggerFactory.getLogger("error/500").error(ex.message, ex);
+		if (!@StringUtils.equals(message, "演示模式，不允许操作！")){
+			@org.slf4j.LoggerFactory.getLogger("error/500").error(ex.message, ex);
+		}
 	}
 }
 
@@ -47,7 +49,8 @@ else {
 			href="http://jeesite.com">JeeSite ${@Global.getProperty('jeesiteVersion')}</a>
 	</div>
 </div>
-<% if (@Global.getConfigToBoolean('error.page.printErrorInfo', 'true')){ %>
+<% if (@Global.getConfigToBoolean('error.page.printErrorInfo', 'true')
+	&& !@StringUtils.equals(message, "演示模式，不允许操作！")){ %>
 <div class="box mt20">
 	${@StringUtils.toHtml(@ExceptionUtils.getStackTraceAsString(ex))}<br/>
 	此异常信息若不想输出，可打开jeesite.yml文件，设置error.page.printErrorInfo=false即可

parent/pom.xml

@@ -50,7 +50,7 @@
 		<druid.version>1.1.18</druid.version>
 		<shiro.version>1.4.0</shiro.version>
 		<j2cache.version>2.7.0-release</j2cache.version>
-		<beetl.version>2.9-SNAPSHOT</beetl.version>
+		<beetl.version>3.0-SNAPSHOT</beetl.version>
 		<swagger.version>1.5.20</swagger.version>
 		
 		<!-- environment setting -->