Skip to content
GitLab
"...java/net/mingsoft/git@ustchcs.com:gujinli1118/MCMS.git" did not exist on "8a2fc3b7466fefad0c4fb2144d8e47f42fb86c8a"
Commit cd4672a3 authored by killfen's avatar killfen
Browse files

配置优化

parent da21280b
Expand all Hide whitespace changes
Inline Side-by-side
pom.xml
View file @ cd4672a3
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<groupId>net.mingsoft</groupId> <groupId>net.mingsoft</groupId>
<artifactId>mcms</artifactId> <artifactId>mcms</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<name>mcms</name> <name>mcms1</name>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
......
src/main/resources/application.yml
View file @ cd4672a3
...@@ -17,21 +17,18 @@ spring: ...@@ -17,21 +17,18 @@ spring:
multipart: multipart:
max-request-size: 100MB max-request-size: 100MB
freemarker: freemarker:
allow-request-override: false suffix: .ftl
allow-session-override: false
cache: false
charset: UTF-8 charset: UTF-8
check-template-location: true
content-type: text/html content-type: text/html
enabled: true allow-request-override: true
expose-request-attributes: false allow-session-override: true
expose-session-attributes: false expose-request-attributes: true
expose-session-attributes: true
expose-spring-macro-helpers: true expose-spring-macro-helpers: true
prefer-file-system-access: true prefer-file-system-access: true
suffix: .ftl template-loader-path: classpath:/WEB-INF/manager
template-loader-path: classpath:/WEB-INF/manager/
settings: settings:
template_update_delay: 0 template_update_delay: 1
default_encoding: UTF-8 default_encoding: UTF-8
classic_compatible: true classic_compatible: true
date_format: yyyy-MM-dd date_format: yyyy-MM-dd
...@@ -56,7 +53,7 @@ ms: ...@@ -56,7 +53,7 @@ ms:
manager: manager:
path: /ms path: /ms
view: #已过期 view: #已过期
path: path: /WEB-INF/manager
session: session:
timeout: 1800000 #会话超时， 单位：毫秒， 20m=1200000ms, 30m=1800000ms, 60m=3600000ms timeout: 1800000 #会话超时， 单位：毫秒， 20m=1200000ms, 30m=1800000ms, 60m=3600000ms
validation.interval: 120000 #会话清理间隔时间， 单位：毫秒，2m=120000ms validation.interval: 120000 #会话清理间隔时间， 单位：毫秒，2m=120000ms
......
src/main/webapp/WEB-INF/manager/basic/index.ftl
View file @ cd4672a3
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<#include "${managerViewPath}/include/meta.ftl"/> <!--调用head内样式信息--> <#include "/include/meta.ftl"/> <!--调用head内样式信息-->
<script type="text/javascript" src="${base}/jquery/zTree_v3/jquery.ztree.all-3.5.min.js"></script> <script type="text/javascript" src="${base}/jquery/zTree_v3/jquery.ztree.all-3.5.min.js"></script>
<link rel="stylesheet" href="${base}/jquery/zTree_v3/zTreeStyle.css" type="text/css"> <link rel="stylesheet" href="${base}/jquery/zTree_v3/zTreeStyle.css" type="text/css">
</head> </head>
......
src/main/webapp/WEB-INF/manager/category/index.ftl
View file @ cd4672a3
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<div id="toolbar"> <div id="toolbar">
<@ms.panelNav> <@ms.panelNav>
<@ms.buttonGroup> <@ms.buttonGroup>
<#include "${managerViewPath}/${model?default('')}/category/shiro-button.ftl"/> <#include "/${model?default('')}/category/shiro-button.ftl"/>
</@ms.buttonGroup> </@ms.buttonGroup>
</@ms.panelNav> </@ms.panelNav>
</div> </div>
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
field: 'categoryTitle', field: 'categoryTitle',
title: '${modelTitle}标题', title: '${modelTitle}标题',
formatter:function(value,row,index) { formatter:function(value,row,index) {
<#include "${managerViewPath}/${model?default('')}/category/shiro-update.ftl"/> <#include "/${model?default('')}/category/shiro-update.ftl"/>
} }
}, { }, {
field: 'categoryDescription', field: 'categoryDescription',
......
src/main/webapp/WEB-INF/manager/column/index.ftl
View file @ cd4672a3
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<div id="toolbar"> <div id="toolbar">
<@ms.panelNav> <@ms.panelNav>
<@ms.buttonGroup> <@ms.buttonGroup>
<#include "${managerViewPath}/${model?default('')}/column/shiro-button.ftl"/> <#include "/${model?default('')}/column/shiro-button.ftl"/>
</@ms.buttonGroup> </@ms.buttonGroup>
</@ms.panelNav> </@ms.panelNav>
</div> </div>
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
title: '标题', title: '标题',
align: 'left', align: 'left',
formatter:function(value,row,index) { formatter:function(value,row,index) {
<#include "${managerViewPath}/${model?default('')}/column/shiro-update.ftl"/> <#include "/${model?default('')}/column/shiro-update.ftl"/>
} }
},{ },{
field: 'columnType', field: 'columnType',
......
src/main/webapp/WEB-INF/manager/include/macro.ftl
View file @ cd4672a3
<#include "/include/ui/index.ftl"/> <#include "/include/ui/index.ftl"/>
<#include "/include/manager.ftl"/>
<#global autoCURD=""/> <#global autoCURD=""/>
<#macro autoCURD> <#macro autoCURD>
<#local url=baseUrl?split("?")?first?split("/")?last/> <#local url=baseUrl?split("?")?first?split("/")?last/>
...@@ -8,7 +9,7 @@ ...@@ -8,7 +9,7 @@
<#global autoCURD="update"> <#global autoCURD="update">
</#if> </#if>
</#macro> </#macro>
<@autoCURD/> <@ms.autoCURD/>
<#--权限控制--> <#--权限控制-->
<#--link:必须 type:add/del/edit/query class:样式 id,value:显示文字--> <#--link:必须 type:add/del/edit/query class:样式 id,value:显示文字-->
......
src/main/webapp/WEB-INF/manager/include/manager.ftl
View file @ cd4672a3
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<#include "${managerViewPath}/include/macro.ftl"/> <#include "/include/macro.ftl"/>
<#include "${managerViewPath}/include/meta.ftl"/> <#include "/include/meta.ftl"/>
</head> </head>
<body> <body>
<div class="ms-content"> <div class="ms-content">
......
src/main/webapp/WEB-INF/manager/include/meta.ftl
View file @ cd4672a3
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<#include "${managerViewPath}/include/macro.ftl"/> <#include "/include/macro.ftl"/>
<script> <script>
var basePath = "${basePath}"; var basePath = "${basePath}";
var base = "${base}"; var base = "${base}";
......
src/main/webapp/WEB-INF/manager/include/ui/checkboxlist.ftl
View file @ cd4672a3
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
help="" help=""
> >
<div class="form-group ms-form-group"> <div class="form-group ms-form-group">
<#include "control.ftl"/><#rt/> <#include "/include/ui/control.ftl"/><#rt/>
<div class="col-sm-10" <#if width!=""> style="${width}px"</#if><#rt/>> <div class="col-sm-10" <#if width!=""> style="${width}px"</#if><#rt/>>
<#if list?is_sequence> <#if list?is_sequence>
<#if listKey!="" && listValue!=""> <#if listKey!="" && listValue!="">
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<#local rvalue=item[listValue]> <#local rvalue=item[listValue]>
<#local index=item_index> <#local index=item_index>
<#local hasNext=item_has_next> <#local hasNext=item_has_next>
<#include "checkboxlist-item.ftl"><#t/> <#include "/include/ui/checkboxlist-item.ftl"><#t/>
</#list> </#list>
<#else> <#else>
<#list list as item> <#list list as item>
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<#local rvalue=item> <#local rvalue=item>
<#local index=item_index> <#local index=item_index>
<#local hasNext=item_has_next> <#local hasNext=item_has_next>
<#include "checkboxlist-item.ftl"><#t/> <#include "/include/ui/checkboxlist-item.ftl"><#t/>
</#list> </#list>
</#if> </#if>
<#else> <#else>
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<#local rvalue=list[key]/> <#local rvalue=list[key]/>
<#local index=key_index> <#local index=key_index>
<#local hasNext=key_has_next> <#local hasNext=key_has_next>
<#include "checkboxlist-item.ftl"><#t/> <#include "/include/ui/checkboxlist-item.ftl"><#t/>
</#list> </#list>
</#if> </#if>
</div> </div>
......
src/main/webapp/WEB-INF/manager/include/ui/date.ftl
View file @ cd4672a3
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
helpDirection="" helpDirection=""
> >
<div class="form-group ms-form-group"> <div class="form-group ms-form-group">
<#include "control.ftl"/><#rt/> <#include "/include/ui/control.ftl"/><#rt/>
<div class="control-group col-sm-9 ms-from-group-input has-feedback" style="min-width:200px;<#if width!=""> width:${width}px"</#if>"<#rt/>> <div class="control-group col-sm-9 ms-from-group-input has-feedback" style="min-width:200px;<#if width!=""> width:${width}px"</#if>"<#rt/>>
<div class="controls"> <div class="controls">
<div class="input-prepend input-group"> <div class="input-prepend input-group">
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<#if maxlength!=""> maxlength="${maxlength}"</#if><#rt/> <#if maxlength!=""> maxlength="${maxlength}"</#if><#rt/>
<#if readonly!=""> readonly="${readonly}"</#if><#rt/> <#if readonly!=""> readonly="${readonly}"</#if><#rt/>
<#if value?? && value?string!=""> value="${value?html}"</#if><#rt/> <#if value?? && value?string!=""> value="${value?html}"</#if><#rt/>
<#include "common-attributes.ftl"/><#rt/> <#include "/include/ui/common-attributes.ftl"/><#rt/>
/><#rt/> /><#rt/>
</div> </div>
</div> </div>
......
src/main/webapp/WEB-INF/manager/include/ui/editor.ftl
View file @ cd4672a3
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<#--content:初始化内容--> <#--content:初始化内容-->
<#macro editor name label="" content="" validation="" width="100%" height="480" labelStyle="" appId="" help="" helpDirection="" colSm=""> <#macro editor name label="" content="" validation="" width="100%" height="480" labelStyle="" appId="" help="" helpDirection="" colSm="">
<div class="form-group ms-form-group"> <div class="form-group ms-form-group">
<#include "control.ftl"/><#rt/> <#include "/include/ui/control.ftl"/><#rt/>
<div class="ms-form-control ms-from-group-input col-sm-9 has-feedback"> <div class="ms-form-control ms-from-group-input col-sm-9 has-feedback">
<script type="text/plain" id="editor_${name}" name="${name}" style="width:${width}px;height:${height}px">${content?default('')}</script> <script type="text/plain" id="editor_${name}" name="${name}" style="width:${width}px;height:${height}px">${content?default('')}</script>
<script type="text/javascript"> <script type="text/javascript">
......
src/main/webapp/WEB-INF/manager/include/ui/file.ftl
View file @ cd4672a3
...@@ -7,13 +7,13 @@ ...@@ -7,13 +7,13 @@
id="" name="" class="" style="" size="" title="" disabled="" tabindex="" accesskey="" labelStyle="" id="" name="" class="" style="" size="" title="" disabled="" tabindex="" accesskey="" labelStyle=""
onclick="" ondblclick="" onmousedown="" onmouseup="" onmouseover="" onmousemove="" onmouseout="" onfocus="" onblur="" onkeypress="" onkeydown="" onkeyup="" onselect="" onchange="" onclick="" ondblclick="" onmousedown="" onmouseup="" onmouseover="" onmousemove="" onmouseout="" onfocus="" onblur="" onkeypress="" onkeydown="" onkeyup="" onselect="" onchange=""
> >
<#include "control.ftl"/><#rt/> <#include "/include/ui/control.ftl"/><#rt/>
<input type="file"<#rt/> <input type="file"<#rt/>
<#if id!=""> id="${id}"</#if><#rt/> <#if id!=""> id="${id}"</#if><#rt/>
<#if accept!=""> accept="${accept}"</#if><#rt/> <#if accept!=""> accept="${accept}"</#if><#rt/>
<#if value!=""> value="${value}"</#if><#rt/> <#if value!=""> value="${value}"</#if><#rt/>
<#include "common-attributes.ftl"/><#rt/> <#include "/include/ui/common-attributes.ftl"/><#rt/>
<#include "scripting-events.ftl"/><#rt/> <#include "/include/ui/scripting-events.ftl"/><#rt/>
/> />
<#include "control-close.ftl"/><#rt/> <#include "/include/ui/control-close.ftl"/><#rt/>
</#macro> </#macro>
src/main/webapp/WEB-INF/manager/include/ui/index.ftl
View file @ cd4672a3
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
<#include "/include/ui/editor.ftl"/> <#include "/include/ui/editor.ftl"/>
<#include "/include/ui/time.ftl"/> <#include "/include/ui/time.ftl"/>
<#include "/include/ui/tree.ftl"/> <#include "/include/ui/tree.ftl"/>
<#include "/include/manager.ftl"/>
<#include "/include/ui/page.ftl"/> <#include "/include/ui/page.ftl"/>
<#include "/include/ui/table.ftl"/> <#include "/include/ui/table.ftl"/>
<#include "/include/ui/modal.ftl"/> <#include "/include/ui/modal.ftl"/>
......
src/main/webapp/WEB-INF/manager/include/ui/input.ftl
View file @ cd4672a3
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
<#local rvalue=item[listValue]> <#local rvalue=item[listValue]>
<#local index=item_index> <#local index=item_index>
<#local hasNext=item_has_next> <#local hasNext=item_has_next>
<#include "radio-item.ftl"><#t/> <#include "/include/ui/radio-item.ftl"><#t/>
</#list> </#list>
<#else> <#else>
<#list list as item> <#list list as item>
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
<#local rvalue=item> <#local rvalue=item>
<#local index=item_index> <#local index=item_index>
<#local hasNext=item_has_next> <#local hasNext=item_has_next>
<#include "radio-item.ftl"><#t/> <#include "/include/ui/radio-item.ftl"><#t/>
</#list> </#list>
</#if> </#if>
<#else> <#else>
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
<#local rvalue=list[key]/> <#local rvalue=list[key]/>
<#local index=key_index> <#local index=key_index>
<#local hasNext=key_has_next> <#local hasNext=key_has_next>
<#include "radio-item.ftl"><#t/> <#include "/include/ui/radio-item.ftl"><#t/>
</#list> </#list>
</#if> </#if>
</div> </div>
......
src/main/webapp/WEB-INF/manager/include/ui/page.ftl
View file @ cd4672a3
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<#include "${managerViewPath}/include/macro.ftl"/> <#include "/include/macro.ftl"/>
<#include "${managerViewPath}/include/meta.ftl"/> <#include "/include/meta.ftl"/>
</head> </head>
<body> <body>
<div class="ms-content"> <div class="ms-content">
......
src/main/webapp/WEB-INF/manager/include/ui/radio-item.ftl
View file @ cd4672a3
...@@ -3,5 +3,5 @@ ...@@ -3,5 +3,5 @@
<#if onclick?? && onclick!=""> onclick="${onclick}"</#if><#rt/> <#if onclick?? && onclick!=""> onclick="${onclick}"</#if><#rt/>
<#if disabled?? && disabled> disabled="disabled" </#if><#rt/> <#if disabled?? && disabled> disabled="disabled" </#if><#rt/>
<#if (rkey?string=="" && (!value?? || value?string=="")) || (value?? && value?string!="" && value?string==rkey?string)> checked="checked"</#if><#rt/> <#if (rkey?string=="" && (!value?? || value?string=="")) || (value?? && value?string!="" && value?string==rkey?string)> checked="checked"</#if><#rt/>
<#include "common-attributes.ftl"/><#rt/> <#include "/include/ui/common-attributes.ftl"/><#rt/>
/> ${rvalue} </label> <#if hasNext> </#if> /> ${rvalue} </label> <#if hasNext> </#if>
src/main/webapp/WEB-INF/manager/include/ui/time.ftl
View file @ cd4672a3
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
helpDirection="" helpDirection=""
> >
<div class="form-group ms-form-group"> <div class="form-group ms-form-group">
<#include "control.ftl"/><#rt/> <#include "/include/ui/control.ftl"/><#rt/>
<div class="control-group col-sm-9 ms-from-group-input" style="min-widht:200px;<#if width!="">width:${width}px</#if>"<#rt/>> <div class="control-group col-sm-9 ms-from-group-input" style="min-widht:200px;<#if width!="">width:${width}px</#if>"<#rt/>>
<div class="controls"> <div class="controls">
<div class="input-prepend input-group date" <#if id!=""> id="${id}"<#elseif name!="">id="${name}"</#if><#rt/> <div class="input-prepend input-group date" <#if id!=""> id="${id}"<#elseif name!="">id="${name}"</#if><#rt/>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<#if maxlength!=""> maxlength="${maxlength}"</#if><#rt/> <#if maxlength!=""> maxlength="${maxlength}"</#if><#rt/>
<#if readonly!=""> readonly="${readonly}"</#if><#rt/> <#if readonly!=""> readonly="${readonly}"</#if><#rt/>
<#if value?? && value?string!=""> value="${value?html}"</#if><#rt/> <#if value?? && value?string!=""> value="${value?html}"</#if><#rt/>
<#include "common-attributes.ftl"/><#rt/>/> <#include "/include/ui/common-attributes.ftl"/><#rt/>/>
</div> </div>
</div> </div>
</div> </div>
......
src/main/webapp/WEB-INF/manager/include/ui/tree.ftl
View file @ cd4672a3
...@@ -267,7 +267,7 @@ ...@@ -267,7 +267,7 @@
<#elseif type=="default"> <#--默认调用方式在4.5.5将废弃--> <#elseif type=="default"> <#--默认调用方式在4.5.5将废弃-->
<!-- 初始化样式开始 --> <!-- 初始化样式开始 -->
<div class="form-group ms-form-group "> <div class="form-group ms-form-group ">
<#include "control.ftl"/><#rt/> <#include "/include/ui/control.ftl"/><#rt/>
<div class="ms-form-control <#if label!="">col-sm-9</#if>"> <div class="ms-form-control <#if label!="">col-sm-9</#if>">
<ul class="ztree" id="treeDome${treeId}"> <ul class="ztree" id="treeDome${treeId}">
</ul> </ul>
......
src/main/webapp/WEB-INF/manager/index.ftl
View file @ cd4672a3
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<head> <head>
<title><#if app?has_content>${app.basicTitle}<#else>MS</#if>管理系统</title> <title><#if app?has_content>${app.basicTitle}<#else>MS</#if>管理系统</title>
<link rel="bookmark" href="favicon.ico"/> <link rel="bookmark" href="favicon.ico"/>
<#include "${managerViewPath}/include/macro.ftl"/> <#include "/include/macro.ftl"/>
<#include "${managerViewPath}/include/meta.ftl"/> <#include "/include/meta.ftl"/>
<script src="http://cdn.mingsoft.net/model/4.6.0/ms.mstore.client.min.js"></script> <script src="http://cdn.mingsoft.net/model/4.6.0/ms.mstore.client.min.js"></script>
</head> </head>
<script type="text/javascript"> <script type="text/javascript">
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment