start 4.1.5

common/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>4.1.4-SNAPSHOT</version>
+		<version>4.1.5-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	

modules/core/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>4.1.4-SNAPSHOT</version>
+		<version>4.1.5-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 	

modules/core/src/main/resources/static/jqGrid/4.7/js/i18n/en.js

@@ -0,0 +1,186 @@
+;(function($){
+/**
+ * jqGrid English Translation
+ * Tony Tomov tony@trirand.com
+ * http://trirand.com/blog/ 
+ * Dual licensed under the MIT and GPL licenses:
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.gnu.org/licenses/gpl.html
+**/
+$.jgrid = $.jgrid || {};
+$.extend($.jgrid,{
+	extend : {
+		btnSearch: 'Search',
+		btnHideSearch: 'Hide Search',
+		expandTooMany: 'You need to expand the "{0}" node, because there are too many nodes, and the execution is canceled.',
+		pageTitle: 'Click the number, you can fill in the page number of pages, press enter to take effect!',
+		pageLabelA: 'Page',
+		pageLabelB: ' / ',
+		pageLabelC: 'of {0}',
+	},
+	defaults : {
+		recordtext: "View {0} - {1} of {2}",
+		emptyrecords: "No records to view",
+		loadtext: "Loading...",
+		pgtext : "Page {0} of {1}",
+		pgfirst : "First Page",
+		pglast : "Last Page",
+		pgnext : "Next Page",
+		pgprev : "Previous Page",
+		pgrecs : "Records per Page",
+		showhide: "Toggle Expand Collapse Grid"
+	},
+	search : {
+		caption: "Search...",
+		Find: "Find",
+		Reset: "Reset",
+		odata: [{ oper:'eq', text:'equal'},{ oper:'ne', text:'not equal'},{ oper:'lt', text:'less'},{ oper:'le', text:'less or equal'},{ oper:'gt', text:'greater'},{ oper:'ge', text:'greater or equal'},{ oper:'bw', text:'begins with'},{ oper:'bn', text:'does not begin with'},{ oper:'in', text:'is in'},{ oper:'ni', text:'is not in'},{ oper:'ew', text:'ends with'},{ oper:'en', text:'does not end with'},{ oper:'cn', text:'contains'},{ oper:'nc', text:'does not contain'},{ oper:'nu', text:'is null'},{ oper:'nn', text:'is not null'}],
+		groupOps: [{ op: "AND", text: "all" },{ op: "OR",  text: "any" }],
+		operandTitle : "Click to select search operation.",
+		resetTitle : "Reset Search Value"
+	},
+	edit : {
+		addCaption: "Add Record",
+		editCaption: "Edit Record",
+		bSubmit: "Submit",
+		bCancel: "Cancel",
+		bClose: "Close",
+		saveData: "Data has been changed! Save changes?",
+		bYes : "Yes",
+		bNo : "No",
+		bExit : "Cancel",
+		msg: {
+			required:"Field is required",
+			number:"Please, enter valid number",
+			minValue:"value must be greater than or equal to ",
+			maxValue:"value must be less than or equal to",
+			email: "is not a valid e-mail",
+			integer: "Please, enter valid integer value",
+			date: "Please, enter valid date value",
+			url: "is not a valid URL. Prefix required ('http://' or 'https://')",
+			nodefined : " is not defined!",
+			novalue : " return value is required!",
+			customarray : "Custom function should return array!",
+			customfcheck : "Custom function should be present in case of custom checking!"
+			
+		}
+	},
+	view : {
+		caption: "View Record",
+		bClose: "Close"
+	},
+	del : {
+		caption: "Delete",
+		msg: "Delete selected record(s)?",
+		bSubmit: "Delete",
+		bCancel: "Cancel"
+	},
+	nav : {
+		edittext: "",
+		edittitle: "Edit selected row",
+		addtext:"",
+		addtitle: "Add new row",
+		deltext: "",
+		deltitle: "Delete selected row",
+		searchtext: "",
+		searchtitle: "Find records",
+		refreshtext: "",
+		refreshtitle: "Reload Grid",
+		alertcap: "Warning",
+		alerttext: "Please, select row",
+		viewtext: "",
+		viewtitle: "View selected row"
+	},
+	col : {
+		caption: "Select columns",
+		bSubmit: "Ok",
+		bCancel: "Cancel"
+	},
+	errors : {
+		errcap : "Error",
+		nourl : "No url is set",
+		norecords: "No records to process",
+		model : "Length of colNames <> colModel!"
+	},
+	formatter : {
+		integer : {thousandsSeparator: ",", defaultValue: '0'},
+		number : {decimalSeparator:".", thousandsSeparator: ",", decimalPlaces: 2, defaultValue: '0.00'},
+		currency : {decimalSeparator:".", thousandsSeparator: ",", decimalPlaces: 2, prefix: "", suffix:"", defaultValue: '0.00'},
+		date : {
+			dayNames:   [
+				"Sun", "Mon", "Tue", "Wed", "Thr", "Fri", "Sat",
+				"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
+			],
+			monthNames: [
+				"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
+				"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"
+			],
+			AmPm : ["am","pm","AM","PM"],
+			S: function (j) {return j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th';},
+			srcformat: 'Y-m-d',
+			newformat: 'n/j/Y',
+			parseRe : /[#%\\\/:_;.,\t\s-]/,
+			masks : {
+				// see http://php.net/manual/en/function.date.php for PHP format used in jqGrid
+				// and see http://docs.jquery.com/UI/Datepicker/formatDate
+				// and https://github.com/jquery/globalize#dates for alternative formats used frequently
+				// one can find on https://github.com/jquery/globalize/tree/master/lib/cultures many
+				// information about date, time, numbers and currency formats used in different countries
+				// one should just convert the information in PHP format
+				ISO8601Long:"Y-m-d H:i:s",
+				ISO8601Short:"Y-m-d",
+				// short date:
+				//    n - Numeric representation of a month, without leading zeros
+				//    j - Day of the month without leading zeros
+				//    Y - A full numeric representation of a year, 4 digits
+				// example: 3/1/2012 which means 1 March 2012
+				ShortDate: "n/j/Y", // in jQuery UI Datepicker: "M/d/yyyy"
+				// long date:
+				//    l - A full textual representation of the day of the week
+				//    F - A full textual representation of a month
+				//    d - Day of the month, 2 digits with leading zeros
+				//    Y - A full numeric representation of a year, 4 digits
+				LongDate: "l, F d, Y", // in jQuery UI Datepicker: "dddd, MMMM dd, yyyy"
+				// long date with long time:
+				//    l - A full textual representation of the day of the week
+				//    F - A full textual representation of a month
+				//    d - Day of the month, 2 digits with leading zeros
+				//    Y - A full numeric representation of a year, 4 digits
+				//    g - 12-hour format of an hour without leading zeros
+				//    i - Minutes with leading zeros
+				//    s - Seconds, with leading zeros
+				//    A - Uppercase Ante meridiem and Post meridiem (AM or PM)
+				FullDateTime: "l, F d, Y g:i:s A", // in jQuery UI Datepicker: "dddd, MMMM dd, yyyy h:mm:ss tt"
+				// month day:
+				//    F - A full textual representation of a month
+				//    d - Day of the month, 2 digits with leading zeros
+				MonthDay: "F d", // in jQuery UI Datepicker: "MMMM dd"
+				// short time (without seconds)
+				//    g - 12-hour format of an hour without leading zeros
+				//    i - Minutes with leading zeros
+				//    A - Uppercase Ante meridiem and Post meridiem (AM or PM)
+				ShortTime: "g:i A", // in jQuery UI Datepicker: "h:mm tt"
+				// long time (with seconds)
+				//    g - 12-hour format of an hour without leading zeros
+				//    i - Minutes with leading zeros
+				//    s - Seconds, with leading zeros
+				//    A - Uppercase Ante meridiem and Post meridiem (AM or PM)
+				LongTime: "g:i:s A", // in jQuery UI Datepicker: "h:mm:ss tt"
+				SortableDateTime: "Y-m-d\\TH:i:s",
+				UniversalSortableDateTime: "Y-m-d H:i:sO",
+				// month with year
+				//    Y - A full numeric representation of a year, 4 digits
+				//    F - A full textual representation of a month
+				YearMonth: "F, Y" // in jQuery UI Datepicker: "MMMM, yyyy"
+			},
+			reformatAfterEdit : false,
+			userLocalTime : false
+		},
+		baseLinkUrl: '',
+		showAction: '',
+		target: '',
+		checkbox : {disabled:true},
+		idName : 'id'
+	}
+});
+})(jQuery);

modules/core/src/main/resources/static/jqGrid/4.7/js/i18n/zh_CN.js

@@ -0,0 +1,185 @@
+;(function($){
+/**
+ * jqGrid Chinese Translation
+ * 咖啡兔 yanhonglei@gmail.com
+ * http://www.kafeitu.me 
+ * Dual licensed under the MIT and GPL licenses:
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.gnu.org/licenses/gpl.html
+**/
+$.jgrid = $.jgrid || {};
+$.extend($.jgrid,{
+	extend : {
+		btnSearch: '查询',
+		btnHideSearch: '隐藏',
+		expandTooMany: '本次需要展开“{0}”个节点，因为展开节点过多，执行取消。',
+		pageTitle: '点击数字，可填写页码和每页条数，按回车即可生效！',
+		pageLabelA: '当前',
+		pageLabelB: '页，每页',
+		pageLabelC: '条，共 {0} 条',
+	},
+    defaults : {
+        recordtext: "{0} - {1}\u3000共 {2} 条", // 共字前是全角空格
+        emptyrecords: "无数据显示",
+        loadtext: "正在加载...",
+        pgtext : " {0} 共 {1} 页",
+		pgfirst : "First Page",
+		pglast : "Last Page",
+		pgnext : "Next Page",
+		pgprev : "Previous Page",
+		pgrecs : "Records per Page",
+		showhide: "Toggle Expand Collapse Grid"
+    },
+    search : {
+        caption: "搜索...",
+        Find: "查找",
+        Reset: "重置",
+        odata: [{ oper:'eq', text:'等于\u3000\u3000'},{ oper:'ne', text:'不等\u3000\u3000'},{ oper:'lt', text:'小于\u3000\u3000'},{ oper:'le', text:'小于等于'},{ oper:'gt', text:'大于\u3000\u3000'},{ oper:'ge', text:'大于等于'},{ oper:'bw', text:'开始于'},{ oper:'bn', text:'不开始于'},{ oper:'in', text:'属于\u3000\u3000'},{ oper:'ni', text:'不属于'},{ oper:'ew', text:'结束于'},{ oper:'en', text:'不结束于'},{ oper:'cn', text:'包含\u3000\u3000'},{ oper:'nc', text:'不包含'},{ oper:'nu', text:'不存在'},{ oper:'nn', text:'存在'}],
+        groupOps: [ { op: "AND", text: "所有" },    { op: "OR",  text: "任一" } ],
+		operandTitle : "Click to select search operation.",
+		resetTitle : "Reset Search Value"
+    },
+    edit : {
+        addCaption: "添加记录",
+        editCaption: "编辑记录",
+        bSubmit: "提交",
+        bCancel: "取消",
+        bClose: "关闭",
+        saveData: "数据已改变，是否保存？",
+        bYes : "是",
+        bNo : "否",
+        bExit : "取消",
+        msg: {
+            required:"此字段必需",
+            number:"请输入有效数字",
+            minValue:"输值必须大于等于 ",
+            maxValue:"输值必须小于等于 ",
+            email: "这不是有效的e-mail地址",
+            integer: "请输入有效整数",
+            date: "请输入有效时间",
+            url: "无效网址。前缀必须为 ('http://' 或 'https://')",
+            nodefined : " 未定义！",
+            novalue : " 需要返回值！",
+            customarray : "自定义函数需要返回数组！",
+            customfcheck : "必须有自定义函数!"
+        }
+    },
+    view : {
+        caption: "查看记录",
+        bClose: "关闭"
+    },
+    del : {
+        caption: "删除",
+        msg: "删除所选记录？",
+        bSubmit: "删除",
+        bCancel: "取消"
+    },
+    nav : {
+        edittext: "",
+        edittitle: "编辑所选记录",
+        addtext:"",
+        addtitle: "添加新记录",
+        deltext: "",
+        deltitle: "删除所选记录",
+        searchtext: "",
+        searchtitle: "查找",
+        refreshtext: "",
+        refreshtitle: "刷新表格",
+        alertcap: "注意",
+        alerttext: "请选择记录",
+        viewtext: "",
+        viewtitle: "查看所选记录"
+    },
+    col : {
+        caption: "选择列",
+        bSubmit: "确定",
+        bCancel: "取消"
+    },
+    errors : {
+        errcap : "错误",
+        nourl : "没有设置url",
+        norecords: "没有要处理的记录",
+        model : "colNames 和 colModel 长度不等！"
+    },
+    formatter : {
+        integer : {thousandsSeparator: ",", defaultValue: '0'},
+        number : {decimalSeparator:".", thousandsSeparator: ",", decimalPlaces: 2, defaultValue: '0.00'},
+        currency : {decimalSeparator:".", thousandsSeparator: ",", decimalPlaces: 2, prefix: "", suffix:"", defaultValue: '0.00'},
+        date : {
+            dayNames:   [
+                "日", "一", "二", "三", "四", "五", "六",
+                "星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六",
+            ],
+            monthNames: [
+                "一", "二", "三", "四", "五", "六", "七", "八", "九", "十", "十一", "十二",
+                "一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"
+            ],
+            AmPm : ["am","pm","上午","下午"],
+            S: function (j) {return j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th';},
+            srcformat: 'Y-m-d',
+            newformat: 'Y-m-d',
+            parseRe : /[#%\\\/:_;.,\t\s-]/,
+            masks : {
+                // see http://php.net/manual/en/function.date.php for PHP format used in jqGrid
+                // and see http://docs.jquery.com/UI/Datepicker/formatDate
+                // and https://github.com/jquery/globalize#dates for alternative formats used frequently
+                // one can find on https://github.com/jquery/globalize/tree/master/lib/cultures many
+                // information about date, time, numbers and currency formats used in different countries
+                // one should just convert the information in PHP format
+                ISO8601Long:"Y-m-d H:i:s",
+                ISO8601Short:"Y-m-d",
+                // short date:
+                //    n - Numeric representation of a month, without leading zeros
+                //    j - Day of the month without leading zeros
+                //    Y - A full numeric representation of a year, 4 digits
+                // example: 3/1/2012 which means 1 March 2012
+                ShortDate: "n/j/Y", // in jQuery UI Datepicker: "M/d/yyyy"
+                // long date:
+                //    l - A full textual representation of the day of the week
+                //    F - A full textual representation of a month
+                //    d - Day of the month, 2 digits with leading zeros
+                //    Y - A full numeric representation of a year, 4 digits
+                LongDate: "l, F d, Y", // in jQuery UI Datepicker: "dddd, MMMM dd, yyyy"
+                // long date with long time:
+                //    l - A full textual representation of the day of the week
+                //    F - A full textual representation of a month
+                //    d - Day of the month, 2 digits with leading zeros
+                //    Y - A full numeric representation of a year, 4 digits
+                //    g - 12-hour format of an hour without leading zeros
+                //    i - Minutes with leading zeros
+                //    s - Seconds, with leading zeros
+                //    A - Uppercase Ante meridiem and Post meridiem (AM or PM)
+                FullDateTime: "l, F d, Y g:i:s A", // in jQuery UI Datepicker: "dddd, MMMM dd, yyyy h:mm:ss tt"
+                // month day:
+                //    F - A full textual representation of a month
+                //    d - Day of the month, 2 digits with leading zeros
+                MonthDay: "F d", // in jQuery UI Datepicker: "MMMM dd"
+                // short time (without seconds)
+                //    g - 12-hour format of an hour without leading zeros
+                //    i - Minutes with leading zeros
+                //    A - Uppercase Ante meridiem and Post meridiem (AM or PM)
+                ShortTime: "g:i A", // in jQuery UI Datepicker: "h:mm tt"
+                // long time (with seconds)
+                //    g - 12-hour format of an hour without leading zeros
+                //    i - Minutes with leading zeros
+                //    s - Seconds, with leading zeros
+                //    A - Uppercase Ante meridiem and Post meridiem (AM or PM)
+                LongTime: "g:i:s A", // in jQuery UI Datepicker: "h:mm:ss tt"
+                SortableDateTime: "Y-m-d\\TH:i:s",
+                UniversalSortableDateTime: "Y-m-d H:i:sO",
+                // month with year
+                //    Y - A full numeric representation of a year, 4 digits
+                //    F - A full textual representation of a month
+                YearMonth: "F, Y" // in jQuery UI Datepicker: "MMMM, yyyy"
+            },
+            reformatAfterEdit : false,
+			userLocalTime : false
+        },
+        baseLinkUrl: '',
+        showAction: '',
+        target: '',
+        checkbox : {disabled:true},
+        idName : 'id'
+    }
+});
+})(jQuery);

modules/core/src/main/resources/static/jqGrid/4.7/js/i18n/zh_TW.js

@@ -0,0 +1,138 @@
+;(function($){
+/**
+ * jqGrid Chinese (Taiwan) Translation for v4.2
+ * linquize
+ * https://github.com/linquize/jqGrid
+ * Dual licensed under the MIT and GPL licenses:
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.gnu.org/licenses/gpl.html
+ * 
+**/
+$.jgrid = $.jgrid || {};
+$.extend($.jgrid,{
+	defaults : {
+		recordtext: "{0} - {1} 共 {2} 條",
+		emptyrecords: "沒有記錄",
+		loadtext: "載入中...",
+		pgtext : " {0} 共 {1} 頁",
+		pgfirst : "First Page",
+		pglast : "Last Page",
+		pgnext : "Next Page",
+		pgprev : "Previous Page",
+		pgrecs : "Records per Page",
+		showhide: "Toggle Expand Collapse Grid"
+	},
+	search : {
+		caption: "搜尋...",
+		Find: "搜尋",
+		Reset: "重設",
+		odata: [{ oper:'eq', text:"等於 "},{ oper:'ne', text:"不等於 "},{ oper:'lt', text:"小於 "},{ oper:'le', text:"小於等於 "},{ oper:'gt', text:"大於 "},{ oper:'ge', text:"大於等於 "},{ oper:'bw', text:"開始於 "},{ oper:'bn', text:"不開始於 "},{ oper:'in', text:"在其中 "},{ oper:'ni', text:"不在其中 "},{ oper:'ew', text:"結束於 "},{ oper:'en', text:"不結束於 "},{ oper:'cn', text:"包含 "},{ oper:'nc', text:"不包含 "},{ oper:'nu', text:'is null'},{ oper:'nn', text:'is not null'}],
+		groupOps: [	{ op: "AND", text: "所有" },	{ op: "OR",  text: "任一" }	],
+		operandTitle : "Click to select search operation.",
+		resetTitle : "Reset Search Value"
+	},
+	edit : {
+		addCaption: "新增記錄",
+		editCaption: "編輯記錄",
+		bSubmit: "提交",
+		bCancel: "取消",
+		bClose: "關閉",
+		saveData: "資料已改變，是否儲存？",
+		bYes : "是",
+		bNo : "否",
+		bExit : "取消",
+		msg: {
+			required:"此欄必要",
+			number:"請輸入有效的數字",
+			minValue:"值必須大於等於 ",
+			maxValue:"值必須小於等於 ",
+			email: "不是有效的e-mail地址",
+			integer: "請輸入有效整数",
+			date: "請輸入有效時間",
+			url: "網址無效。前綴必須為 ('http://' 或 'https://')",
+			nodefined : " 未定義！",
+			novalue : " 需要傳回值！",
+			customarray : "自訂函數應傳回陣列！",
+			customfcheck : "自訂檢查應有自訂函數！"
+			
+		}
+	},
+	view : {
+		caption: "查看記錄",
+		bClose: "關閉"
+	},
+	del : {
+		caption: "刪除",
+		msg: "刪除已選記錄？",
+		bSubmit: "刪除",
+		bCancel: "取消"
+	},
+	nav : {
+		edittext: "",
+		edittitle: "編輯已選列",
+		addtext:"",
+		addtitle: "新增列",
+		deltext: "",
+		deltitle: "刪除已選列",
+		searchtext: "",
+		searchtitle: "搜尋記錄",
+		refreshtext: "",
+		refreshtitle: "重新整理表格",
+		alertcap: "警告",
+		alerttext: "請選擇列",
+		viewtext: "",
+		viewtitle: "檢視已選列"
+	},
+	col : {
+		caption: "選擇欄",
+		bSubmit: "確定",
+		bCancel: "取消"
+	},
+	errors : {
+		errcap : "錯誤",
+		nourl : "未設定URL",
+		norecords: "無需要處理的記錄",
+		model : "colNames 和 colModel 長度不同！"
+	},
+	formatter : {
+		integer : {thousandsSeparator: " ", defaultValue: '0'},
+		number : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, defaultValue: '0.00'},
+		currency : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, prefix: "", suffix:"", defaultValue: '0.00'},
+		date : {
+			dayNames:   [
+				"日", "一", "二", "三", "四", "五", "六",
+		         "星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"
+			],
+			monthNames: [
+				"一", "二", "三", "四", "五", "六", "七", "八", "九", "十", "十一", "十二",
+				"一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"
+			],
+			AmPm : ["上午","下午","上午","下午"],
+			S: function (j) {return j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th';},
+			srcformat: 'Y-m-d',
+			newformat: 'm-d-Y',
+			parseRe : /[#%\\\/:_;.,\t\s-]/,
+			masks : {
+				ISO8601Long:"Y-m-d H:i:s",
+				ISO8601Short:"Y-m-d",
+				ShortDate: "Y/j/n",
+				LongDate: "l, F d, Y",
+				FullDateTime: "l, F d, Y g:i:s A",
+				MonthDay: "F d",
+				ShortTime: "g:i A",
+				LongTime: "g:i:s A",
+				SortableDateTime: "Y-m-d\\TH:i:s",
+				UniversalSortableDateTime: "Y-m-d H:i:sO",
+				YearMonth: "F, Y"
+			},
+			reformatAfterEdit : false,
+			userLocalTime : false
+		},
+		baseLinkUrl: '',
+		showAction: '',
+		target: '',
+		checkbox : {disabled:true},
+		idName : 'id'
+	}
+});
+})(jQuery);

modules/template/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>4.1.4-SNAPSHOT</version>
+		<version>4.1.5-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 		
 		<!-- ====== 这是一个新增模块示例项目，你可以拷贝此项目，修改 artifactId 为您的模块即可 ====== -->

parent/pom.xml

@@ -11,7 +11,7 @@
 	
 	<groupId>com.jeesite</groupId>
 	<artifactId>jeesite-parent</artifactId>
-	<version>4.1.4-SNAPSHOT</version>
+	<version>4.1.5-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	
 	<name>JeeSite Parent</name>

root/pom.xml

@@ -5,7 +5,7 @@
 	
 	<groupId>com.jeesite</groupId>
 	<artifactId>jeesite-root</artifactId>
-	<version>4.1.4-SNAPSHOT</version>
+	<version>4.1.5-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	
 	<name>JeeSite</name>

web/.settings/org.eclipse.wst.common.component

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
   <wb-module deploy-name="web">
-        <dependent-module archiveName="jeesite-module-core-4.1.4-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jeesite-module-core/jeesite-module-core">
+        <dependent-module archiveName="jeesite-module-core-4.1.5-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jeesite-module-core/jeesite-module-core">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="jeesite-common-4.1.4-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jeesite-common/jeesite-common">
+        <dependent-module archiveName="jeesite-common-4.1.5-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jeesite-common/jeesite-common">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="jeesite-framework-4.1.4-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jeesite-framework/jeesite-framework">
+        <dependent-module archiveName="jeesite-framework-4.1.5-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jeesite-framework/jeesite-framework">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="jeesite-module-swagger-4.1.4-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jeesite-module-swagger/jeesite-module-swagger">
+        <dependent-module archiveName="jeesite-module-swagger-4.1.5-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jeesite-module-swagger/jeesite-module-swagger">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="jeesite-module-weboffice-4.1.4-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jeesite-module-weboffice/jeesite-module-weboffice">
+        <dependent-module archiveName="jeesite-module-weboffice-4.1.5-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jeesite-module-weboffice/jeesite-module-weboffice">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <property name="java-output-path" value="/src/main/webapp/WEB-INF/classes"/>

web/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>4.1.4-SNAPSHOT</version>
+		<version>4.1.5-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>