diff --git a/pom.xml b/pom.xml index 92ef539c..b5756a05 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ net.mingsoft mcms 0.0.1-SNAPSHOT - mcms + mcms1 war 1.8 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index db92d663..1643ff7f 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -17,21 +17,18 @@ spring: multipart: max-request-size: 100MB freemarker: - allow-request-override: false - allow-session-override: false - cache: false + suffix: .ftl charset: UTF-8 - check-template-location: true content-type: text/html - enabled: true - expose-request-attributes: false - expose-session-attributes: false + allow-request-override: true + allow-session-override: true + expose-request-attributes: true + expose-session-attributes: true expose-spring-macro-helpers: true prefer-file-system-access: true - suffix: .ftl - template-loader-path: classpath:/WEB-INF/manager/ + template-loader-path: classpath:/WEB-INF/manager settings: - template_update_delay: 0 + template_update_delay: 1 default_encoding: UTF-8 classic_compatible: true date_format: yyyy-MM-dd @@ -56,7 +53,7 @@ ms: manager: path: /ms view: #已过期 - path: + path: /WEB-INF/manager session: timeout: 1800000 #会话超时， 单位：毫秒， 20m=1200000ms, 30m=1800000ms, 60m=3600000ms validation.interval: 120000 #会话清理间隔时间， 单位：毫秒，2m=120000ms diff --git a/src/main/webapp/WEB-INF/manager/basic/index.ftl b/src/main/webapp/WEB-INF/manager/basic/index.ftl index 25b7585f..026c383c 100644 --- a/src/main/webapp/WEB-INF/manager/basic/index.ftl +++ b/src/main/webapp/WEB-INF/manager/basic/index.ftl @@ -1,7 +1,7 @@ -<#include "${managerViewPath}/include/meta.ftl"/> +<#include "/include/meta.ftl"/> diff --git a/src/main/webapp/WEB-INF/manager/category/index.ftl b/src/main/webapp/WEB-INF/manager/category/index.ftl index 13e06c0f..78661fde 100644 --- a/src/main/webapp/WEB-INF/manager/category/index.ftl +++ b/src/main/webapp/WEB-INF/manager/category/index.ftl @@ -10,7 +10,7 @@
<@ms.panelNav> <@ms.buttonGroup> - <#include "${managerViewPath}/${model?default('')}/category/shiro-button.ftl"/> + <#include "/${model?default('')}/category/shiro-button.ftl"/>
@@ -56,7 +56,7 @@ field: 'categoryTitle', title: '${modelTitle}标题', formatter:function(value,row,index) { - <#include "${managerViewPath}/${model?default('')}/category/shiro-update.ftl"/> + <#include "/${model?default('')}/category/shiro-update.ftl"/> } }, { field: 'categoryDescription', diff --git a/src/main/webapp/WEB-INF/manager/column/index.ftl b/src/main/webapp/WEB-INF/manager/column/index.ftl index a1fc6661..60ed3aed 100644 --- a/src/main/webapp/WEB-INF/manager/column/index.ftl +++ b/src/main/webapp/WEB-INF/manager/column/index.ftl @@ -9,7 +9,7 @@
<@ms.panelNav> <@ms.buttonGroup> - <#include "${managerViewPath}/${model?default('')}/column/shiro-button.ftl"/> + <#include "/${model?default('')}/column/shiro-button.ftl"/>
@@ -53,7 +53,7 @@ title: '标题', align: 'left', formatter:function(value,row,index) { - <#include "${managerViewPath}/${model?default('')}/column/shiro-update.ftl"/> + <#include "/${model?default('')}/column/shiro-update.ftl"/> } },{ field: 'columnType', diff --git a/src/main/webapp/WEB-INF/manager/include/macro.ftl b/src/main/webapp/WEB-INF/manager/include/macro.ftl index 32bde145..fa7dd9c4 100644 --- a/src/main/webapp/WEB-INF/manager/include/macro.ftl +++ b/src/main/webapp/WEB-INF/manager/include/macro.ftl @@ -1,4 +1,5 @@ <#include "/include/ui/index.ftl"/> +<#include "/include/manager.ftl"/> <#global autoCURD=""/> <#macro autoCURD> <#local url=baseUrl?split("?")?first?split("/")?last/> @@ -8,7 +9,7 @@ <#global autoCURD="update"> -<@autoCURD/> +<@ms.autoCURD/> <#--权限控制--> <#--link:必须 type:add/del/edit/query class:样式 id,value:显示文字--> diff --git a/src/main/webapp/WEB-INF/manager/include/manager.ftl b/src/main/webapp/WEB-INF/manager/include/manager.ftl index b28925da..f837d0a6 100644 --- a/src/main/webapp/WEB-INF/manager/include/manager.ftl +++ b/src/main/webapp/WEB-INF/manager/include/manager.ftl @@ -4,8 +4,8 @@ - <#include "${managerViewPath}/include/macro.ftl"/> - <#include "${managerViewPath}/include/meta.ftl"/> + <#include "/include/macro.ftl"/> + <#include "/include/meta.ftl"/>
diff --git a/src/main/webapp/WEB-INF/manager/include/meta.ftl b/src/main/webapp/WEB-INF/manager/include/meta.ftl index a9624871..e8905763 100644 --- a/src/main/webapp/WEB-INF/manager/include/meta.ftl +++ b/src/main/webapp/WEB-INF/manager/include/meta.ftl @@ -71,7 +71,7 @@ - <#include "${managerViewPath}/include/macro.ftl"/> + <#include "/include/macro.ftl"/> - - - -<#-- -重置按钮 ---> -<#macro resetbutton value="" id="" name="" class="" style="" size="" title="" disabled=false> - <#rt/> - - -<#macro button value="" id="" name="" class="btn btn-primary" style="" disabled=false -onclick="" click="" url="" toggle="tooltip" target="bottom" icon="" title="" placement="bottom" -> - <#rt/> - <#if click?? && click!="" && id?? && id!=""> - - - - - - - -<#--按钮组--> -<#macro btnGroup value="" id="" name="" class="default" style="" size="" title="" disabled=false > - - - - -<#--按钮组－子菜单，配合btnGroup使用--> -<#macro btnGroupLi value="" href="" class="" id="" ajaxUrl=""> -
  • <#rt/>><#if href !="" >${value}<#else>${value}
    • - - - - -<#--添--> -<#macro addButton value="" icon="plus" class="default" id="addButton${.now?date?string('yyyyMMddhhmmss')}" onclick="" title="添加" url="" openModal="" openModalBefor=""> - <@ms.isPanelNavBtn id="${id}" _id="addButton" class="${class}" _class="default"/> - <#if url!=""> - <@ms.button icon="${icon}" id="${id}" value="${value} " icon="${icon}" class="btn btn-${_class}" onclick="location.href='${url}'" title="${title}"/> - <#else> - <@ms.button icon="${icon}" id="${id}" value="${value} " icon="${icon}" class="btn btn-${_class}" onclick="${onclick}" title="${title}"/> - - <#if openModal!=""> - - - -<#--删--> -<#macro delButton value="" icon="trash" class="danger" id="delButton${.now?date?string('yyyyMMddhhmmss')}" onclick="" title="删除" fieldName="" url=""> - <#if fieldName!=""> - - - <@ms.isPanelNavBtn id="${id}" _id="delButton" class="${class}" _class="danger"/> - - - <@ms.modal modalName="deleteModal${id}" title="删除提示!"> - <@ms.modalBody> - 确认删除条记录？ - - <@ms.modalButton> - <@ms.button class="btn btn-danger deleteBtn${id}" value="确定删除"/> - - - - <@ms.button icon="${icon}" value="${value} " icon="${icon}" id="${id}" class="btn btn-${_class}" onclick="${onclick}" title="${title}"/> - - -<#macro editButton value="" icon="edit" class="warning" id="editButton${.now?date?string('yyyyMMddhhmmss')}" onclick="" title="编辑"> - <@ms.isPanelNavBtn id="${id}" _id="editButton" class="${class}" _class="danger"/> - <@ms.button icon="${icon}" value="${value} " icon="${icon}" id="${id}" class="btn btn-${_class}" onclick="${onclick}" title="${title}"/> - - -<#macro queryButton value="查询" icon="search" class="default" id="queryButton${.now?date?string('yyyyMMddhhmmss')}" onclick="" title="查询" form="" > - <@ms.button class="btn btn-info" value="${value} " icon="${icon}" id="${id}" onclick="${onclick}" title="${title}"/> - <#if onclick=="" && form!=""> - - - -<#--返回--> -<#macro backButton value="返回" icon="share-alt" class="default" id="backButton${.now?date?string('yyyyMMddhhmmss')}" onclick="javascript:history.go(-1)" title="返回"> - <@ms.button value="${value}" icon="${icon}" onclick="${onclick}" class="btn btn-${class}" title="${title}" id="${id}"/> - -<#--保存--> -<#macro saveButton value="保存" icon="floppy-saved" class="default" id="saveButton${.now?date?string('yyyyMMddhhmmss')}" onclick="" title="保存" postForm="" postBefor="" postAfter=""> - <@ms.button icon="${icon}" class="btn btn-success" value="${value} " icon="${icon}" id="${id}" onclick="${onclick}" title="${title}" /> - <@ms.event postForm="${postForm}" postBefor="${postBefor}" postAfter="${postBefor}" id="${id}"/> - -<#macro updateButton value="更新" icon="open" class="default" id="updateButton" onclick="" title="更新" postForm="" postBefor="" postAfter="" postForm="" postBefor="" postAfter=""> - <@ms.button icon="${icon}" class="btn btn-success" value="${value} " icon="${icon}" id="${id}" onclick="${onclick}" title="${title}"/> - <@ms.event postForm="${postForm}" postBefor="${postBefor}" postAfter="${postBefor}" id="${id}"/> - -<#macro resetButton value="重置" icon="retweet" class="warning" id="resetButton${.now?long}" onclick="" title="重置" form="" > - <@ms.button icon="${icon}" class="btn btn-warning" value="${value} " icon="${icon}" id="${id}" onclick="${onclick}" title="${title}"/> - - -<#macro exportButton value="导出" icon="export" class="default" id="exportButton" onclick="" title="导出" > - <@ms.button icon="${icon}" class="btn btn-default" value="${value} " icon="${icon}" id="${id}" onclick="${onclick}" title="${title}"/> - -<#macro importButton value="导入" icon="import" class="warning" id="importButton" onclick="" title="导入" > - <@ms.button icon="${icon}" class="btn btn-default" value="${value} " icon="${icon}" id="${id}" onclick="${onclick}" title="${title}"/> - -<#macro setingButton value="设置" icon="cog" class="warning" id="importButton" onclick="" title="设置" > - <@ms.button icon="${icon}" class="btn btn-primary" value="${value} " icon="${icon}" id="${id}" onclick="${onclick}" title="${title}"/> - - -<#macro event postForm="" postBefor="" postAfter="" id=""> - <#if postForm!=""> - - - - -<#--按钮组--> -<#macro buttonGroup role="group"> -
    - <#nested/> -
    - - -<#macro menuButton links name="菜单名称" class="default"> -
    - - - -
    - - -<#macro switchButton name on off size="small" value="" class="" color="default" onclass="danger" offclass="primary"> - - - - - - +<#-- +表单相关按钮存放区域 +--> +<#macro buttonarea id="" label="" class="form-group" style="clear: both;" size=""> +
    id="${id}"<#rt/> + <#if style?? && style?string!=""> style="${style}"<#rt/> + > + <#if label!=""> + + +
    + <#nested/><#rt/> +
    +
    + + +<#-- +保存按钮 +--> +<#macro savebutton value="" id="" name="" class="" style="" disabled=false +onclick="" click="" +> + <#rt/> + <#if click?? && click!="" && id?? && id!=""> + + + + +<#-- +重置按钮 +--> +<#macro resetbutton value="" id="" name="" class="" style="" size="" title="" disabled=false> + <#rt/> + + +<#macro button value="" id="" name="" class="btn btn-primary" style="" disabled=false +onclick="" click="" url="" toggle="tooltip" target="bottom" icon="" title="" placement="bottom" +> + <#rt/> + <#if click?? && click!="" && id?? && id!=""> + + + + + + + +<#--按钮组--> +<#macro btnGroup value="" id="" name="" class="default" style="" size="" title="" disabled=false > + + + + +<#--按钮组－子菜单，配合btnGroup使用--> +<#macro btnGroupLi value="" href="" class="" id="" ajaxUrl=""> +
  • <#rt/>><#if href !="" >${value}<#else>${value}
    • + + + + +<#--添--> +<#macro addButton value="" icon="plus" class="default" id="addButton${.now?date?string('yyyyMMddhhmmss')}" onclick="" title="添加" url="" openModal="" openModalBefor=""> + <@ms.isPanelNavBtn id="${id}" _id="addButton" class="${class}" _class="default"/> + <#if url!=""> + <@ms.button icon="${icon}" id="${id}" value="${value} " icon="${icon}" class="btn btn-${_class}" onclick="location.href='${url}'" title="${title}"/> + <#else> + <@ms.button icon="${icon}" id="${id}" value="${value} " icon="${icon}" class="btn btn-${_class}" onclick="${onclick}" title="${title}"/> + + <#if openModal!=""> + + + +<#--删--> +<#macro delButton value="" icon="trash" class="danger" id="delButton${.now?date?string('yyyyMMddhhmmss')}" onclick="" title="删除" fieldName="" url=""> + <#if fieldName!=""> + + + <@ms.isPanelNavBtn id="${id}" _id="delButton" class="${class}" _class="danger"/> + + + <@ms.modal modalName="deleteModal${id}" title="删除提示!"> + <@ms.modalBody> + 确认删除条记录？ + + <@ms.modalButton> + <@ms.button class="btn btn-danger deleteBtn${id}" value="确定删除"/> + + + + <@ms.button icon="${icon}" value="${value} " icon="${icon}" id="${id}" class="btn btn-${_class}" onclick="${onclick}" title="${title}"/> + + +<#macro editButton value="" icon="edit" class="warning" id="editButton${.now?date?string('yyyyMMddhhmmss')}" onclick="" title="编辑"> + <@ms.isPanelNavBtn id="${id}" _id="editButton" class="${class}" _class="danger"/> + <@ms.button icon="${icon}" value="${value} " icon="${icon}" id="${id}" class="btn btn-${_class}" onclick="${onclick}" title="${title}"/> + + +<#macro queryButton value="查询" icon="search" class="default" id="queryButton${.now?date?string('yyyyMMddhhmmss')}" onclick="" title="查询" form="" > + <@ms.button class="btn btn-info" value="${value} " icon="${icon}" id="${id}" onclick="${onclick}" title="${title}"/> + <#if onclick=="" && form!=""> + + + +<#--返回--> +<#macro backButton value="返回" icon="share-alt" class="default" id="backButton${.now?date?string('yyyyMMddhhmmss')}" onclick="javascript:history.go(-1)" title="返回"> + <@ms.button value="${value}" icon="${icon}" onclick="${onclick}" class="btn btn-${class}" title="${title}" id="${id}"/> + +<#--保存--> +<#macro saveButton value="保存" icon="floppy-saved" class="default" id="saveButton${.now?date?string('yyyyMMddhhmmss')}" onclick="" title="保存" postForm="" postBefor="" postAfter=""> + <@ms.button icon="${icon}" class="btn btn-success" value="${value} " icon="${icon}" id="${id}" onclick="${onclick}" title="${title}" /> + <@ms.event postForm="${postForm}" postBefor="${postBefor}" postAfter="${postBefor}" id="${id}"/> + +<#macro updateButton value="更新" icon="open" class="default" id="updateButton" onclick="" title="更新" postForm="" postBefor="" postAfter="" postForm="" postBefor="" postAfter=""> + <@ms.button icon="${icon}" class="btn btn-success" value="${value} " icon="${icon}" id="${id}" onclick="${onclick}" title="${title}"/> + <@ms.event postForm="${postForm}" postBefor="${postBefor}" postAfter="${postBefor}" id="${id}"/> + +<#macro resetButton value="重置" icon="retweet" class="warning" id="resetButton${.now?long}" onclick="" title="重置" form="" > + <@ms.button icon="${icon}" class="btn btn-warning" value="${value} " icon="${icon}" id="${id}" onclick="${onclick}" title="${title}"/> + + +<#macro exportButton value="导出" icon="export" class="default" id="exportButton" onclick="" title="导出" > + <@ms.button icon="${icon}" class="btn btn-default" value="${value} " icon="${icon}" id="${id}" onclick="${onclick}" title="${title}"/> + +<#macro importButton value="导入" icon="import" class="warning" id="importButton" onclick="" title="导入" > + <@ms.button icon="${icon}" class="btn btn-default" value="${value} " icon="${icon}" id="${id}" onclick="${onclick}" title="${title}"/> + +<#macro setingButton value="设置" icon="cog" class="warning" id="importButton" onclick="" title="设置" > + <@ms.button icon="${icon}" class="btn btn-primary" value="${value} " icon="${icon}" id="${id}" onclick="${onclick}" title="${title}"/> + + +<#macro event postForm="" postBefor="" postAfter="" id=""> + <#if postForm!=""> + + + + +<#--按钮组--> +<#macro buttonGroup role="group"> +
    + <#nested/> +
    + + +<#macro menuButton links name="菜单名称" class="default"> +
    + + + +
    + + +<#macro switchButton name on off size="small" value="" class="" color="default" onclass="danger" offclass="primary"> + + + + + + diff --git a/src/main/webapp/WEB-INF/manager/include/ui/checkboxlist.ftl b/src/main/webapp/WEB-INF/manager/include/ui/checkboxlist.ftl index 64fa013e..86836d39 100644 --- a/src/main/webapp/WEB-INF/manager/include/ui/checkboxlist.ftl +++ b/src/main/webapp/WEB-INF/manager/include/ui/checkboxlist.ftl @@ -12,7 +12,7 @@ help="" >
    - <#include "control.ftl"/><#rt/> + <#include "/include/ui/control.ftl"/><#rt/>
    style="${width}px"<#rt/>> <#if list?is_sequence> <#if listKey!="" && listValue!=""> @@ -21,7 +21,7 @@ <#local rvalue=item[listValue]> <#local index=item_index> <#local hasNext=item_has_next> - <#include "checkboxlist-item.ftl"><#t/> + <#include "/include/ui/checkboxlist-item.ftl"><#t/> <#else> <#list list as item> @@ -29,7 +29,7 @@ <#local rvalue=item> <#local index=item_index> <#local hasNext=item_has_next> - <#include "checkboxlist-item.ftl"><#t/> + <#include "/include/ui/checkboxlist-item.ftl"><#t/> <#else> @@ -38,7 +38,7 @@ <#local rvalue=list[key]/> <#local index=key_index> <#local hasNext=key_has_next> - <#include "checkboxlist-item.ftl"><#t/> + <#include "/include/ui/checkboxlist-item.ftl"><#t/>
    diff --git a/src/main/webapp/WEB-INF/manager/include/ui/date.ftl b/src/main/webapp/WEB-INF/manager/include/ui/date.ftl index 37f126b4..f0563680 100644 --- a/src/main/webapp/WEB-INF/manager/include/ui/date.ftl +++ b/src/main/webapp/WEB-INF/manager/include/ui/date.ftl @@ -9,7 +9,7 @@ helpDirection="" >
    - <#include "control.ftl"/><#rt/> + <#include "/include/ui/control.ftl"/><#rt/>
    width:${width}px""<#rt/>>
    @@ -19,7 +19,7 @@ <#if maxlength!=""> maxlength="${maxlength}"<#rt/> <#if readonly!=""> readonly="${readonly}"<#rt/> <#if value?? && value?string!=""> value="${value?html}"<#rt/> - <#include "common-attributes.ftl"/><#rt/> + <#include "/include/ui/common-attributes.ftl"/><#rt/> /><#rt/>
    diff --git a/src/main/webapp/WEB-INF/manager/include/ui/editor.ftl b/src/main/webapp/WEB-INF/manager/include/ui/editor.ftl index af3e5613..fcf531a9 100644 --- a/src/main/webapp/WEB-INF/manager/include/ui/editor.ftl +++ b/src/main/webapp/WEB-INF/manager/include/ui/editor.ftl @@ -4,7 +4,7 @@ <#--content:初始化内容--> <#macro editor name label="" content="" validation="" width="100%" height="480" labelStyle="" appId="" help="" helpDirection="" colSm="">
    - <#include "control.ftl"/><#rt/> + <#include "/include/ui/control.ftl"/><#rt/>