5.0.214

modules/kdayun-app/src/main/resources/application-encryption.yml

@@ -0,0 +1,13 @@
+
+security:
+# 表单模型在网络网络上是否要开启加密加传输 
+# enable : true 启用(默认), false 启用加密 , aseKey 加密的aes key , aseIv aes加密的
+# encrypt:
+#    enable: true
+#    aseKey: C20A84DAAB331419
+#    aseIv: 3D6B046E3A0148FD
+
+# sm2加密算法的私钥,密钥
+  sm2:
+    publickey: 04745df4d87581af5643a50b27abe47ccd4bb416602499b50e440ddbd16d130c70e85e3aa1b522b0008b9398ee696b5cb3e1df37fb3f1e7c497df3bd8766d73e4d
+    privatekey: 92e8627122535ed1f6f8d42be39a23dbc7dc0cf6ba41dad4de98f552a65fb80f

modules/kdayun-app/src/main/resources/application.yml

@@ -2,7 +2,7 @@
 spring: 
   profiles:
 #引用多个application-开头的yml文件 多个以逗号隔开
-    include: db,logger,cache,upload,freemarker,druid,mybatis,baidu,server,cloud,wechat,security,proxy,xss
+    include: db,logger,cache,upload,freemarker,druid,mybatis,baidu,server,cloud,wechat,security,proxy,xss,encryption
   devtools:
     restart:
       ebabled: false

modules/kdayun-app/src/main/resources/run.bat

@@ -1,11 +1,12 @@
 @echo off
-TITLE 快搭平台服务器
+chcp 65001
+TITLE 快搭平台服务端
 cd /d %~dp0
-set JAVA_HOME="D:\BS\Server\tomcat8\jdk"
+set JAVA_HOME="D:\source\jdk1.8"
 set PATH=%JAVA_HOME%/bin;%JAVA_HOME%/jre/bin 
 set CLASSPATH=.;%JAVA_HOME%\lib\dt.jar;%JAVA_HOME%\lib\tools.jar
 echo %~dp0
 echo %JAVA_HOME%
 
-java -jar kdayun-app.jar -Dfile.encoding=utf-8
+java -Dfile.encoding=utf-8 -jar kdayun-app.jar
 pause

modules/kdayun-app/src/main/resources/static/framework/theme.js

@@ -292,6 +292,9 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 					.layui-nav{
 						background-color:{{d.navBgInput}};
 					}
+					#loader-wrapper .loader-section{
+						background:var(--kd-color) !important;
+					}
 					.layui-layer .layui-layer-title,
 						.layui-layer-iframe .layui-layer-title {
 							background-color:{{d.layerTitleBgInput}} !important;
@@ -434,10 +437,10 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 						}
 						.kdayun-menu-ul span.kdayun-menu-more {
 							border-top-color:{{d.menuFontColorInput}} !important;
-							border-bottom-color:{{d.menuBgInput}}00 !important;
+							border-bottom-color:rgba(255,0,0,0) !important;
 						}
 						.kdayun-menu-ul .kdayun-menu-item-expand>a span.kdayun-menu-more {
-							border-top-color:{{d.menuBgInput}}00 !important;
+							border-top-color:rgba(255,0,0,0) !important;
 							border-bottom-color:{{d.menuFontColorInput}} !important;
 						}
 						.kdayun-menu-item-expand>.kdayun-menu-child {
@@ -468,10 +471,10 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 						}
 						.kdayun-app-layout .layui-header a span.layui-nav-more {
 							border-top-color:{{d.navIconColorInput}} !important;
-							border-bottom-color:{{d.navBgInput}}00 !important;
+							border-bottom-color:rgba(255,0,0,0) !important;
 						}
 						.kdayun-app-layout .layui-header a span.layui-nav-mored { 
-							border-top-color:{{d.navBgInput}}00 !important;
+							border-top-color:rgba(255,0,0,0) !important;
 							border-bottom-color:{{d.navIconColorInput}} !important;
 						}
 						.kdayun-app-layout .layui-logo {
@@ -640,7 +643,7 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 		hexToRgb(strHex) {
 			let r = /^\#?[0-9A-Fa-z]{6}$/;
 			if (!r.test(strHex)) {
-				Common.error("输入错误的hex");
+				common.msgError("输入错误的hex");
 				return null;
 			}
 			strHex = strHex.replace("#", "");
@@ -674,7 +677,7 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 		rgbToHex(a, b, c) {
 			let r = /^\d{1,3}$/;
 			if (!r.test(a) || !r.test(b) || !r.test(c)) {
-				Common.error("输入错误的rgb颜色值");
+				common.msgError("输入错误的rgb颜色值");
 				return null;
 			}
 			let hexs = [a.toString(16), b.toString(16), c.toString(16)];
@@ -691,7 +694,7 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 		getDarkColor(color, level) {
 			let r = /^\#?[0-9A-Fa-z]{6}$/;
 			if (!r.test(color)) {
-				Common.error("输入错误的hex颜色值:" + color);
+				common.msgError("输入错误的hex颜色值:" + color);
 				return null;
 			}
 			let rgbc = THEME.hexToRgb(color);
@@ -709,7 +712,7 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 		getLightColor(color, level) {
 			let r = /^\#?[0-9A-Fa-z]{6}$/;
 			if (!r.test(color)) {
-				Common.error("输入错误的hex颜色值:" + color); return;
+				common.msgError("输入错误的hex颜色值:" + color); return;
 			}
 			let rgbc = THEME.hexToRgb(color);
 			for (let i = 0; i < 3; i++) rgbc[i] = Math.floor((255 - rgbc[i]) * level + rgbc[i]);
@@ -766,6 +769,7 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 		that.renderMenus();
 		that.renderBody();
 		that.renderFoot();
+		element.init();
 	};
 	ThemeRenderBase.prototype.renderHeader = function () {
 		var that = this;
@@ -897,7 +901,7 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 			var html = that.getHtml(_config.data);
 			$container.html(html);
 			that.iniEvent();
-			element.init();
+
 			that.config.elem = $container;
 		} else {
 			$.ajax({
@@ -908,7 +912,6 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 				success: function (result, status, xhr) {
 					var html = that.getHtml(result.obj);
 					$container.html(html);
-					element.init();
 				},
 				error: function (xhr, status, error) {
 					common.msgError('MenuRender error:' + error);

modules/kdayun-app/src/main/resources/static/modules/admin/coreorg/coreorg.js

@@ -554,7 +554,7 @@ layui.config({}).use(['element', 'laydate', 'zlConfig', 'zltreemenu', 'upload',
 				, '					</div>'
 				, '				</div>'
 				, '				<div class="layui-form-item">'
-				, '					<label class="layui-form-label">机构预算码</label>'
+				, '					<label class="layui-form-label">机构代码</label>'
 				, '					<div class="layui-input-block">'
 				, '						<input type="text" name="OBJCODE" maxlength="40" lay-verify="required|budgetcode" ' + readonly + ' class="layui-input">'
 				, '					</div>'

modules/kdayun-app/src/main/resources/static/modules/manager/coreinit/coreinit.js

@@ -106,7 +106,7 @@ layui.config({
         zlContext.get(layui.cache['contentPath'] + '/manager/init/getinitprocess', {}, function (result) {
             if (result[statusName] == OK) {
                 $(result[dataName]).each(function (index, item) {
-                    var obj = JSON.parse( item )
+                    var obj = eval('(' + item + ')')
                     if (obj.msg) {
                         $('#processTxt').append($('<p>' + obj.msg + '</p>'));
                     }

modules/kdayun-app/src/main/resources/static/modules/web/kdayunadmin/lib/admin.js

@@ -522,7 +522,7 @@ layui.define(['view', 'theme', 'common'], function (exports) {
 
 		// 刷新当前子页面
 		refreshCurrentPage: function () {
-			$('#LAY_app_body .layui-show iframe').attr('src', $('#LAY_app_tabsheader>li.layui-this').attr('lay-attr'));
+			events.refresh();
 		},
 
 		//遮罩
@@ -653,6 +653,10 @@ layui.define(['view', 'theme', 'common'], function (exports) {
 		dd.removeClass(THIS);
 		dd.parent().removeClass(SHOW);
 	});
+	// $body.on('click', '#kd-tabs-select', function (e) {
+	// 	var child = $(e.currentTarget).find('.layui-nav-child')
+	// 	child.addClass(SHOW);
+	// })
 
 
 	//同步路由

modules/kdayun-app/src/main/resources/static/modules/web/kdayunadmin/style/admin.css

@@ -70,6 +70,7 @@ html {
     top: 0;
     z-index: 1001;
 }
+
 .kdayun-app-layout .layui-nav .layui-nav-item {
     position: relative;
     display: inline-block;
@@ -650,7 +651,7 @@ ul.navbarSearchResult::-webkit-scrollbar-track {
     transition: all .3s;
     -webkit-transition: all .3s;
     box-sizing: border-box;
-    border-left: 1px solid #f6f6f6;
+    border-radius: 3px;
 }
 
 .layadmin-pagetabs .layadmin-tabs-control:hover {
@@ -1906,6 +1907,7 @@ ul.navbarSearchResult::-webkit-scrollbar-track {
     /*line-height:50px;*/
     padding: 0px 10px;
 }
+
 .kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul a cite {
     margin-left: 8px;
     margin-right: 6px;
@@ -1916,6 +1918,7 @@ ul.navbarSearchResult::-webkit-scrollbar-track {
     background-color: var(--kd-color);
     box-shadow: 0 3px 1px -2px rgb(0 0 0 / 20%), 0 2px 2px 0 rgb(0 0 0 / 14%), 0 1px 5px 0 rgb(0 0 0 / 12%);
 }
+
 .kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul .kdayun-menu-item>.kdayun-menu-child {
     margin-top: 4px;
 }
@@ -1969,6 +1972,7 @@ CORE STYLES BELOW - NO TOUCHY
     flex-wrap: wrap;
     border-radius: 4px;
 }
+
 .kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul ul {
     border-radius: 4px;
 }

modules/kdayun-app/src/main/resources/static/workflow/editor/css/theme_norm.css

@@ -24,9 +24,8 @@ table-layout:fixed;
 .x-grid3-row-table {
 	table-layout: fixed;
 }
-.ext_specialize_gridPanel_aml {
 
-}
+.ext_specialize_gridPanel_aml {}
 
 .x-grid3-scroller {
 	padding-bottom: 24px;
@@ -97,7 +96,8 @@ table-layout:fixed;
 
 
 
-.LoadingIndicator, .StatusIndicator {
+.LoadingIndicator,
+.StatusIndicator {
 	font-family: Verdana;
 	font-size: 11px;
 	display: block;
@@ -155,6 +155,7 @@ table-layout:fixed;
 	background: transparent url("../images/complex-trigger.gif") no-repeat 0 0;
 	cursor: pointer;
 }
+
 /* extended by Kerstin (end)*/
 
 .x-dd-drag-ghost {
@@ -166,7 +167,8 @@ table-layout:fixed;
 	padding-right: 5px;
 }
 
-.headerShapeRep, .headerShapeRepChild{
+.headerShapeRep,
+.headerShapeRepChild {
 	background: #eee url("../images/bg.gif") repeat-x;
 	margin-top: 1px;
 	border-top: 1px solid #ddd;
@@ -181,7 +183,9 @@ table-layout:fixed;
 .x-tree-root-node>.x-tree-node {
 	margin-bottom: 4px;
 }
-.headerShapeRep *, .headerShapeRepChild *{
+
+.headerShapeRep *,
+.headerShapeRepChild * {
 	cursor: default;
 }
 
@@ -190,6 +194,7 @@ table-layout:fixed;
 	height: 16px;
 	padding-top: 0px;
 }
+
 .shaperepository .x-tree-node-indent * {
 	width: 0px;
 	position: relative;
@@ -206,7 +211,8 @@ table-layout:fixed;
 	top: -2px;
 }
 
-.x-tree-node img.ShapeRepEntreeImg, .x-tree-node-leaf img.ShapeRepEntreeImg {
+.x-tree-node img.ShapeRepEntreeImg,
+.x-tree-node-leaf img.ShapeRepEntreeImg {
 	height: 16px;
 	width: 16px;
 	background: none;
@@ -227,7 +233,8 @@ table-layout:fixed;
 	background-color: #f6f6f6;
 }
 
-.ShapeRepEntree, .ShapeRepEntree *{
+.ShapeRepEntree,
+.ShapeRepEntree * {
 	cursor: move;
 	white-space: normal;
 }
@@ -272,48 +279,56 @@ table-layout:fixed;
 	margin-right: 15px;
 	background: url(../images/arrow-bottom.png) no-repeat center center;
 }
+
 .canvas_resize_indicator_shrink.S {
 	left: 50%;
 	margin-left: 15px;
 	bottom: 30px;
 	background: url(../images/arrow-top.png) no-repeat center center;
 }
+
 .canvas_resize_indicator_grow.W {
 	left: 10px;
 	top: 50%;
 	margin-bottom: 15px;
 	background: url(../images/arrow-left.png) no-repeat center center;
 }
+
 .canvas_resize_indicator_shrink.W {
 	left: 10px;
 	top: 50%;
 	margin-top: 15px;
 	background: url(../images/arrow-right.png) no-repeat center center;
 }
+
 .canvas_resize_indicator_grow.E {
 	right: 30px;
 	top: 50%;
 	margin-bottom: 15px;
 	background: url(../images/arrow-right.png) no-repeat center center;
 }
+
 .canvas_resize_indicator_shrink.E {
 	right: 30px;
 	top: 50%;
 	margin-top: 15px;
 	background: url(../images/arrow-left.png) no-repeat center center;
 }
+
 .canvas_resize_indicator_grow.N {
 	left: 50%;
 	top: 10px;
 	margin-right: 15px;
 	background: url(../images/arrow-top.png) no-repeat center center;
 }
+
 .canvas_resize_indicator_shrink.N {
 	left: 50%;
 	top: 10px;
 	margin-left: 15px;
 	background: url(../images/arrow-bottom.png) no-repeat center center;
 }
+
 /** End Resizer **/
 
 
@@ -326,14 +341,13 @@ table-layout:fixed;
 	border: 1px solid #000;
 }
 
-.Oryx_hover, .Oryx_button:hover {
+.Oryx_hover,
+.Oryx_button:hover {
 	background: url(../images/shapemenu_highlight.png) no-repeat 1px 1px;
 	opacity: 1 !important;
 }
 
-.Oryx_down {
+.Oryx_down {}
-	
-}
 
 .Oryx_button img {
 	position: relative;
@@ -508,19 +522,23 @@ table-layout:fixed;
 
 }
 
-.propertywindow th, td {
+.propertywindow th,
+td {
 	border-collapse: collapse;
 }
+
 .propertywindow thead th {
 	background-color: #ddecfe;
 	padding: 3px;
 	height: 20px;
 }
+
 .propertywindow tbody td {
 	border-top: 1px solid #CCCCCC;
 	padding: 3px;
 	height: 16px;
 }
+
 .propertywindow input {
 	width: 100%;
 }
@@ -535,7 +553,8 @@ form {
 	font-size: 12px;
 }
 
-form p, form ul {
+form p,
+form ul {
 	padding: 0px;
 	margin: 10px 0px 0px 10px;
 	list-style-type: none;
@@ -640,18 +659,30 @@ fieldset p.inline .field_with_error_msg {
 
 
 
-input.text, select, textarea {
+input.text,
+select,
+textarea {
 	border: 1px solid #efefef;
 	background-color: #efefef;
 }
 
-input.text:hover, select:hover, textarea:hover,
+input.text:hover,
-input.text.activated, select.activated, textarea.activated {
+select:hover,
+textarea:hover,
+input.text.activated,
+select.activated,
+textarea.activated {
 	border-color: #fc8b03;
 }
 
-input.text.disabled, input.disabled, select.disabled, textarea.disabled,
+input.text.disabled,
-input.text.disabled:hover, input.disabled:hover, select.disabled:hover, textarea.disabled:hover {
+input.disabled,
+select.disabled,
+textarea.disabled,
+input.text.disabled:hover,
+input.disabled:hover,
+select.disabled:hover,
+textarea.disabled:hover {
 	background-color: #fff;
 	border-color: #fff;
 	color: #000;
@@ -673,7 +704,8 @@ input.text.disabled:hover, input.disabled:hover, select.disabled:hover, textarea
 /*** PLUGIN SPECIFIC ***/
 
 /*** PLUGIN: Transform EPC to BPMN **/
-.transform-epc-bpmn-window .transform-epc-bpmn-group-button *, .transform-epc-bpmn-group-button.x-btn-pressed * {
+.transform-epc-bpmn-window .transform-epc-bpmn-group-button *,
+.transform-epc-bpmn-group-button.x-btn-pressed * {
 	background: transparent;
 	color: #555555;
 	height: 15px;
@@ -742,6 +774,7 @@ input.text.disabled:hover, input.disabled:hover, select.disabled:hover, textarea
 	border: 1px solid gray;
 
 }
+
 /*
 .PropertyWindow-CommonEditor
 {
@@ -751,7 +784,10 @@ input.text.disabled:hover, input.disabled:hover, select.disabled:hover, textarea
 {
 }*/
 
-.PropertyWindow-CommonEditor-check
+.PropertyWindow-CommonEditor-check {
-{
 	margin-top: 5px;
 }
+
+.formproperty-input {
+	margin-left: 8px;
+}

modules/kdayun-app/src/main/resources/static/workflow/editor/oryx.debug.js

@@ -26,6 +26,13 @@ if (window.Prototype) {
 	delete Array.prototype.toJSON;
 }
 
+/**
+ * 打补丁
+ */
+SVGElement.prototype.getTransformToElement = SVGElement.prototype.getTransformToElement || function (toElement) {
+	return toElement.getScreenCTM().inverse().multiply(this.getScreenCTM());
+};
+
 /**
  * @namespace Oryx name space for different utility methods
  * @name ORYX.Utils
@@ -24210,19 +24217,18 @@ Ext.SelectTempleteStrategysEditor = Ext.extend(Ext.StrategysEditorPanelBase, {
 			, items: editformPanel
 			, listeners: {
 				show: function () {
-					if (this.editFlag == 'new') {
 					editformPanel.getForm().reset();
+					if (this.editFlag == 'new') {
 						editWindow.setTitle('新增');
 					}
 					else {
 						var grid = Ext.getCmp('gridTempleteStrategsy');
 						if (grid.getSelectionModel().selections.length > 0) {
 							editWindow.setTitle('编辑');
-							editformPanel.getForm().reset();
+							var row = grid.getSelectionModel().selections.get(0);
-
+							var code = row.data.CODE || '';
-							var code = grid.getSelectionModel().selections.get(0).data.CODE || '';
+							row.data.CODE = JSON.stringify(JSON.parse(code), null, 4)
-							grid.getSelectionModel().selections.get(0).data.CODE = JSON.stringify(JSON.parse(code), null, 4)
+							editformPanel.getForm().loadRecord(row);
-							editformPanel.getForm().loadRecord(grid.getSelectionModel().selections.get(0));
 						}
 					}
 				}.bind(this)
@@ -24687,13 +24693,13 @@ Ext.UserTaskCommonEditor = Ext.extend(Ext.AbstractCommonEditorPanel, {
 		grid.getStore().commitChanges();
 
 		let defauts = [
-			{ formproperty_id: "cantuihu", formproperty_name: "退回", formproperty_value: 0, formproperty_visiable: true, formproperty_alias: "", formproperty_comment: "", formproperty_sort: 3, formproperty_type: 'string', formproperty_required: true }
+			{ formproperty_id: "cantuihu", formproperty_name: "退回", formproperty_value: 0, formproperty_visiable: true, formproperty_alias: "", formproperty_comment: "", formproperty_sort: 3, formproperty_type: 'string', formproperty_required: true, formproperty_isdef: false }
-			, { formproperty_id: "cantij", formproperty_name: "提交/送审", formproperty_value: 1, formproperty_visiable: true, formproperty_alias: "", formproperty_comment: "", formproperty_sort: 0, formproperty_type: 'string', formproperty_required: true }
+			, { formproperty_id: "cantij", formproperty_name: "提交/送审", formproperty_value: 1, formproperty_visiable: true, formproperty_alias: "", formproperty_comment: "", formproperty_sort: 0, formproperty_type: 'string', formproperty_required: true, formproperty_isdef: true }
-			, { formproperty_id: "canButy", formproperty_name: "不同意", formproperty_value: 2, formproperty_visiable: true, formproperty_alias: "", formproperty_comment: "", formproperty_sort: 2, formproperty_type: 'string', formproperty_required: true }
+			, { formproperty_id: "canButy", formproperty_name: "不同意", formproperty_value: 2, formproperty_visiable: true, formproperty_alias: "", formproperty_comment: "", formproperty_sort: 2, formproperty_type: 'string', formproperty_required: true, formproperty_isdef: false }
-			, { formproperty_id: "canTongy", formproperty_name: "同意", formproperty_value: 3, formproperty_visiable: true, formproperty_alias: "", formproperty_comment: "", formproperty_sort: 1, formproperty_type: 'string', formproperty_required: true }
+			, { formproperty_id: "canTongy", formproperty_name: "同意", formproperty_value: 3, formproperty_visiable: true, formproperty_alias: "", formproperty_comment: "", formproperty_sort: 1, formproperty_type: 'string', formproperty_required: true, formproperty_isdef: false }
-			, { formproperty_id: "canQuh", formproperty_name: "取回", formproperty_value: 4, formproperty_visiable: true, formproperty_alias: "", formproperty_comment: "", formproperty_sort: 4, formproperty_type: 'string', formproperty_required: true }
+			, { formproperty_id: "canQuh", formproperty_name: "取回", formproperty_value: 4, formproperty_visiable: true, formproperty_alias: "", formproperty_comment: "", formproperty_sort: 4, formproperty_type: 'string', formproperty_required: true, formproperty_isdef: false }
-			, { formproperty_id: "canBufty", formproperty_name: "部分同意", formproperty_value: 7, formproperty_visiable: true, formproperty_alias: "", formproperty_comment: "", formproperty_sort: 5, formproperty_type: 'string', formproperty_required: true }
+			, { formproperty_id: "canBufty", formproperty_name: "部分同意", formproperty_value: 7, formproperty_visiable: true, formproperty_alias: "", formproperty_comment: "", formproperty_sort: 5, formproperty_type: 'string', formproperty_required: true, formproperty_isdef: false }
-			, { formproperty_id: "canYuanlth", formproperty_name: "原路退回", formproperty_value: 9, formproperty_visiable: true, formproperty_alias: "", formproperty_comment: "", formproperty_sort: 6, formproperty_type: 'string', formproperty_required: true }
+			, { formproperty_id: "canYuanlth", formproperty_name: "原路退回", formproperty_value: 9, formproperty_visiable: true, formproperty_alias: "", formproperty_comment: "", formproperty_sort: 6, formproperty_type: 'string', formproperty_required: true, formproperty_isdef: false }
 		]
 		for (let i = 0; i < defauts.length; i++) {
 			var rectype = grid.store.recordType;
@@ -24950,6 +24956,8 @@ Ext.UserTaskCommonEditor = Ext.extend(Ext.AbstractCommonEditorPanel, {
 					// , hidden :true,
 				},
 			])
+			, autoWidth: true
+			, height: 200
 			, enableHdMenu: false
 			, store: this.dsDataStye
 			, tbar: toolbar
@@ -24965,22 +24973,23 @@ Ext.UserTaskCommonEditor = Ext.extend(Ext.AbstractCommonEditorPanel, {
 				},
 				afterEdit: function (e) {
 					if (e.record.data.task_listener_huiq_stype == 'selAll' || !e.record.data.task_listener_huiq_stype || e.field != 'task_listener_huiqset') {
+						that.propertywindow.editDirectly('oryx-multiinstance_condition', '');
 						return;
 					};
 					var value = e.value;
 					if (e.record.data.task_listener_huiq_stype == 'selNum') {
 						var re = /^[1-9]+[0-9]*]*$/;
 						if (!re.test(value)) {
-							Ext.Msg.alert('错误', '错误的数字，请重新输入！');
+							Ext.Msg.alert('错误', '错误的整数，请重新输入！');
 							e.value = '';
 							e.record.set(e.field, '');
 							return;
 						}
-						propertywindow.editDirectly('oryx-multiinstance_condition', '${nrOfCompletedInstances==' + value + '}');
+						that.propertywindow.editDirectly('oryx-multiinstance_condition', '${nrOfCompletedInstances==' + value + '}');
 					} else if (e.record.data.task_listener_huiq_stype == 'selRate') {
 						var re = /1|0\.[1-9]*$/;
 						if (!re.test(value)) {
-							Ext.Msg.alert('错误', '错误的数据格式，请重新输入正确的小数！');
+							Ext.Msg.alert('错误', '错误的数据格式，请重新输入正确的百分比小数！如: 0.5 ');
 							e.record.set(e.field, '');
 							return;
 						}
@@ -24989,9 +24998,9 @@ Ext.UserTaskCommonEditor = Ext.extend(Ext.AbstractCommonEditorPanel, {
 							e.record.set(e.field, '');
 							return;
 						}
-						propertywindow.editDirectly('oryx-multiinstance_condition', '${nrOfCompletedInstances/nrOfInstances>=' + value + '}');
+						that.propertywindow.editDirectly('oryx-multiinstance_condition', '${nrOfCompletedInstances/nrOfInstances>=' + value + '}');
 					} else if (e.record.data.task_listener_huiq_stype == 'selUserdef') {
-						propertywindow.editDirectly('oryx-multiinstance_condition', value);
+						that.propertywindow.editDirectly('oryx-multiinstance_condition', value);
 					}
 				}
 			}
@@ -25014,6 +25023,7 @@ Ext.UserTaskCommonEditor = Ext.extend(Ext.AbstractCommonEditorPanel, {
 				, { name: 'formproperty_sort', type: 'string' }
 				, { name: 'formproperty_type', type: 'string' }
 				, { name: 'formproperty_required', type: 'string' }
+				, { name: 'formproperty_isdef', type: 'boolean' }
 			]
 			this.dsAduRight = new Ext.data.Store({
 				proxy: new Ext.data.MemoryProxy(obj),
@@ -25054,7 +25064,8 @@ Ext.UserTaskCommonEditor = Ext.extend(Ext.AbstractCommonEditorPanel, {
 						formproperty_comment: '',
 						formproperty_sort: 0,
 						formproperty_type: 'string',
-						formproperty_required: true
+						formproperty_required: true,
+						formproperty_isdef: false
 					}
 					var rec = new rectype(r);
 					grid.stopEditing();
@@ -25118,6 +25129,13 @@ Ext.UserTaskCommonEditor = Ext.extend(Ext.AbstractCommonEditorPanel, {
 					dataIndex: 'formproperty_visiable',
 					width: 40,
 					editor: new Ext.form.CheckBoxField({ name: "visiable", allowBlank: false, disabled: false })
+					, renderer: function (value, metaData, record, rowIndex, colIndex, store, view) {
+						var attr = ''
+						if (value) {
+							attr = 'checked="checked"'
+						}
+						return "<input type='checkbox'  class='formproperty-input' name='formproperty-visiable-" + rowIndex + "' " + attr + "/>";
+					},
 				},
 				{
 					header: '自定义名称',
@@ -25134,6 +25152,18 @@ Ext.UserTaskCommonEditor = Ext.extend(Ext.AbstractCommonEditorPanel, {
 					, dataIndex: 'formproperty_sort'
 					, width: 40
 					, editor: new Ext.form.TextField({ allowBlank: true, disabled: false })
+				}, {
+					header: '默认'
+					, dataIndex: 'formproperty_isdef'
+					, width: 40
+					, editor: new Ext.form.Radio({ name: "default", allowBlank: false, disabled: false })
+					, renderer: function (value, metaData, record, rowIndex, colIndex, store, view) {
+						var attr = ''
+						if (value) {
+							attr = 'checked="checked"'
+						}
+						return "<input type='radio' class='formproperty-input' name='formproperty-default-" + rowIndex + "' " + attr + "/>";
+					},
 				}
 			])
 			, enableHdMenu: false
@@ -25171,6 +25201,20 @@ Ext.UserTaskCommonEditor = Ext.extend(Ext.AbstractCommonEditorPanel, {
 						}
 					}
 
+				},
+				cellclick: function (grid, rowIndex, columnIndex, e) {
+					if (grid.colModel.config[columnIndex].dataIndex == 'formproperty_isdef') {
+						for (let i = 0; i < grid.store.data.items.length; i++) {
+							if (rowIndex != i) {
+								const row = grid.store.data.items[i];
+								row.set('formproperty_isdef', false);
+							}
+						}
+						var row = grid.store.getAt(rowIndex);
+						if (row) {
+							row.set('formproperty_isdef', e.target.value === 'on' ? true : false);
+						}
+					}
 				}
 			}
 		})
@@ -26484,17 +26528,11 @@ ORYX.Plugins.RenameShapes = Clazz.extend({
 
 		// Depending on the property, generate 
 		// ether an TextArea or TextField
-		if (prop.wrapLines()) {
+		// if (prop.wrapLines()) {
 
 		config.y -= (60 / 2);
 		config['grow'] = true;
 		this.shownTextField = new Ext.form.TextArea(config);
-		} else {
-
-			config.y -= (20 / 2);
-
-			this.shownTextField = new Ext.form.TextField(config);
-		}
 
 		//focus
 		this.shownTextField.focus();
@@ -26567,6 +26605,7 @@ ORYX.Plugins.RenameShapes = Clazz.extend({
 			scale = this.facade.getCanvas().rootNode.lastChild.getScreenCTM();
 			transLocal = el.getTransformToElement(el.parentNode);
 		} catch (e) {
+			console.error(e);
 			return { x: 0, y: 0 }
 		}
 
@@ -29465,7 +29504,7 @@ ORYX.Plugins.SelectedRect = Clazz.extend({
 		this.dashedArea = ORYX.Editor.graft("http://www.w3.org/2000/svg", this.node,
 			['rect', {
 				x: 0, y: 0,
-				'stroke-width': 1, stroke: '#777777', fill: 'none',
+				'stroke-width': 1, stroke: 'blue', fill: 'none',
 				'stroke-dasharray': '2,2',
 				'pointer-events': 'none'
 			}]);

modules/kdayun-app/src/main/resources/static/workflow/editor/stencilset.json

@@ -543,22 +543,32 @@
               "value": "",
               "width": 80,
               "optional": false,
-              "items": [ {
+              "items": [
+                {
                   "id": "c1",
                   "title": "特定人",
                   "value": "selPer",
                   "refToView": ""
-              }, {
+                },
+                {
                   "id": "c2",
                   "title": "策略模板",
                   "value": "selTemp",
                   "refToView": ""
-              }, {
+                },
+                {
                   "id": "c3",
                   "title": "自定义",
                   "value": "userdef",
                   "refToView": ""
-              }]
+                },
+                {
+                  "id": "c4",
+                  "title": "抄送",
+                  "value": "cc",
+                  "refToView": ""
+                }
+              ]
             },
             {
               "id": "task_listener_fields",

modules/kdayun-app/src/main/resources/static/workflow/editor/stencilsets/bpmn2.0/view/activity/businessruletask.svg

@@ -32,12 +32,12 @@
   	<defs>
 		<radialGradient id="background" cx="10%" cy="10%" r="100%" fx="10%" fy="10%">
 			<stop offset="0%" stop-color="#ffffff" stop-opacity="1"/>
-			<stop id="fill_el" offset="100%" stop-color="#ffffcc" stop-opacity="1"/>
+			<stop id="fill_el" offset="100%" stop-color="LightBlue" stop-opacity="1"/>
 		</radialGradient>
 	</defs>
 	
 	<rect id="text_frame" oryx:anchors="bottom top right left" x="1" y="1" width="94" height="79" rx="10" ry="10" stroke="none" stroke-width="0" fill="none" />
-	<rect id="bg_frame" oryx:resize="vertical horizontal" x="0" y="0" width="100" height="80" rx="10" ry="10" stroke="black" stroke-width="1" fill="url(#background) #ffffcc" />
+	<rect id="bg_frame" oryx:resize="vertical horizontal" x="0" y="0" width="100" height="80" rx="10" ry="10" stroke="black" stroke-width="1" fill="url(#background) LightBlue" />
 		<text 
 			font-size="12" 
 			id="text_name" 

modules/kdayun-app/src/main/resources/static/workflow/editor/stencilsets/bpmn2.0/view/activity/callactivity.svg

@@ -32,13 +32,13 @@
   	<defs>
 		<radialGradient id="background" cx="10%" cy="10%" r="100%" fx="10%" fy="10%">
 			<stop offset="0%" stop-color="#ffffff" stop-opacity="1"/>
-			<stop id="fill_el" offset="100%" stop-color="#ffffcc" stop-opacity="1"/>
+			<stop id="fill_el" offset="100%" stop-color="LightBlue" stop-opacity="1"/>
 		</radialGradient>
 	</defs>
 	
 	<rect id="text_frame" oryx:anchors="bottom top right left" x="1" y="1" width="94" height="79" rx="10" ry="10" stroke="none" stroke-width="0" fill="none" />
     <rect oryx:resize="vertical horizontal" oryx:anchors="bottom top right left" x="0" y="0" width="100" height="80" rx="10" ry="10" stroke="black" stroke-width="4" fill="none" />
-	<rect id="bg_frame" oryx:resize="vertical horizontal" x="0" y="0" width="100" height="80" rx="10" ry="10" stroke="black" stroke-width="1" fill="url(#background) #ffffcc" />
+	<rect id="bg_frame" oryx:resize="vertical horizontal" x="0" y="0" width="100" height="80" rx="10" ry="10" stroke="black" stroke-width="1" fill="url(#background) LightBlue" />
 		<text 
 			font-size="12" 
 			id="text_name" 

modules/kdayun-app/src/main/resources/static/workflow/editor/stencilsets/bpmn2.0/view/activity/event.subprocess.collapsed.svg

@@ -19,7 +19,7 @@
 	  	<defs>
 			<radialGradient id="background" cx="10%" cy="10%" r="100%" fx="10%" fy="10%">
 				<stop offset="0%" stop-color="#ffffff" stop-opacity="1"/>
-				<stop id="fill_el" offset="100%" stop-color="#ffffcc" stop-opacity="1"/>
+				<stop id="fill_el" offset="100%" stop-color="LightBlue" stop-opacity="1"/>
 			</radialGradient>
 		</defs>
 		

modules/kdayun-app/src/main/resources/static/workflow/editor/stencilsets/bpmn2.0/view/activity/manualtask.svg

@@ -32,12 +32,12 @@
   	<defs>
 		<radialGradient id="background" cx="10%" cy="10%" r="100%" fx="10%" fy="10%">
 			<stop offset="0%" stop-color="#ffffff" stop-opacity="1"/>
-			<stop id="fill_el" offset="100%" stop-color="#ffffcc" stop-opacity="1"/>
+			<stop id="fill_el" offset="100%" stop-color="LightBlue" stop-opacity="1"/>
 		</radialGradient>
 	</defs>
 	
 	<rect id="text_frame" oryx:anchors="bottom top right left" x="1" y="1" width="94" height="79" rx="10" ry="10" stroke="none" stroke-width="0" fill="none" />
-	<rect id="bg_frame" oryx:resize="vertical horizontal" x="0" y="0" width="100" height="80" rx="10" ry="10" stroke="black" stroke-width="1" fill="url(#background) #ffffcc" />
+	<rect id="bg_frame" oryx:resize="vertical horizontal" x="0" y="0" width="100" height="80" rx="10" ry="10" stroke="black" stroke-width="1" fill="url(#background) LightBlue" />
 		<text 
 			font-size="12" 
 			id="text_name" 

modules/kdayun-app/src/main/resources/static/workflow/editor/stencilsets/bpmn2.0/view/activity/receivetask.svg

@@ -32,12 +32,12 @@
   	<defs>
 		<radialGradient id="background" cx="10%" cy="10%" r="100%" fx="10%" fy="10%">
 			<stop offset="0%" stop-color="#ffffff" stop-opacity="1"/>
-			<stop id="fill_el" offset="100%" stop-color="#ffffcc" stop-opacity="1"/>
+			<stop id="fill_el" offset="100%" stop-color="LightBlue" stop-opacity="1"/>
 		</radialGradient>
 	</defs>
 	
 	<rect id="text_frame" oryx:anchors="bottom top right left" x="1" y="1" width="94" height="79" rx="10" ry="10" stroke="none" stroke-width="0" fill="none" />
-	<rect id="bg_frame" oryx:resize="vertical horizontal" x="0" y="0" width="100" height="80" rx="10" ry="10" stroke="black" stroke-width="1" fill="url(#background) #ffffcc" />
+	<rect id="bg_frame" oryx:resize="vertical horizontal" x="0" y="0" width="100" height="80" rx="10" ry="10" stroke="black" stroke-width="1" fill="url(#background) LightBlue" />
 		<text 
 			font-size="12" 
 			id="text_name" 

modules/kdayun-app/src/main/resources/static/workflow/editor/stencilsets/bpmn2.0/view/activity/scripttask.svg

@@ -32,12 +32,12 @@
   	<defs>
 		<radialGradient id="background" cx="10%" cy="10%" r="100%" fx="10%" fy="10%">
 			<stop offset="0%" stop-color="#ffffff" stop-opacity="1"/>
-			<stop id="fill_el" offset="100%" stop-color="#ffffcc" stop-opacity="1"/>
+			<stop id="fill_el" offset="100%" stop-color="LightBlue" stop-opacity="1"/>
 		</radialGradient>
 	</defs>
 	
 	<rect id="text_frame" oryx:anchors="bottom top right left" x="1" y="1" width="94" height="79" rx="10" ry="10" stroke="none" stroke-width="0" fill="none" />
-	<rect id="bg_frame" oryx:resize="vertical horizontal" x="0" y="0" width="100" height="80" rx="10" ry="10" stroke="black" stroke-width="1" fill="url(#background) #ffffcc" />
+	<rect id="bg_frame" oryx:resize="vertical horizontal" x="0" y="0" width="100" height="80" rx="10" ry="10" stroke="black" stroke-width="1" fill="url(#background) LightBlue" />
 		<text 
 			font-size="12" 
 			id="text_name" 

modules/kdayun-app/src/main/resources/static/workflow/editor/stencilsets/bpmn2.0/view/activity/sendtask.svg

@@ -32,12 +32,12 @@
   	<defs>
 		<radialGradient id="background" cx="10%" cy="10%" r="100%" fx="10%" fy="10%">
 			<stop offset="0%" stop-color="#ffffff" stop-opacity="1"/>
-			<stop id="fill_el" offset="100%" stop-color="#ffffcc" stop-opacity="1"/>
+			<stop id="fill_el" offset="100%" stop-color="LightBlue" stop-opacity="1"/>
 		</radialGradient>
 	</defs>
 	
 	<rect id="text_frame" oryx:anchors="bottom top right left" x="1" y="1" width="94" height="79" rx="10" ry="10" stroke="none" stroke-width="0" fill="none" />
-	<rect id="bg_frame" oryx:resize="vertical horizontal" x="0" y="0" width="100" height="80" rx="10" ry="10" stroke="black" stroke-width="1" fill="url(#background) #ffffcc" />
+	<rect id="bg_frame" oryx:resize="vertical horizontal" x="0" y="0" width="100" height="80" rx="10" ry="10" stroke="black" stroke-width="1" fill="url(#background) LightBlue" />
 		<text 
 			font-size="12" 
 			id="text_name" 

modules/kdayun-app/src/main/resources/static/workflow/editor/stencilsets/bpmn2.0/view/activity/servicetask.svg

@@ -32,12 +32,12 @@
   	<defs>
 		<radialGradient id="background" cx="10%" cy="10%" r="100%" fx="10%" fy="10%">
 			<stop offset="0%" stop-color="#ffffff" stop-opacity="1"/>
-			<stop id="fill_el" offset="100%" stop-color="#ffffcc" stop-opacity="1"/>
+			<stop id="fill_el" offset="100%" stop-color="LightBlue" stop-opacity="1"/>
 		</radialGradient>
 	</defs>
 	
 	<rect id="text_frame" oryx:anchors="bottom top right left" x="1" y="1" width="94" height="79" rx="10" ry="10" stroke="none" stroke-width="0" fill="none" />
-	<rect id="bg_frame" oryx:resize="vertical horizontal" x="0" y="0" width="100" height="80" rx="10" ry="10" stroke="black" stroke-width="1" fill="url(#background) #ffffcc" />
+	<rect id="bg_frame" oryx:resize="vertical horizontal" x="0" y="0" width="100" height="80" rx="10" ry="10" stroke="black" stroke-width="1" fill="url(#background) LightBlue" />
 		<text 
 			font-size="12" 
 			id="text_name" 

modules/kdayun-app/src/main/resources/static/workflow/editor/stencilsets/bpmn2.0/view/activity/subprocess.collapsed.svg

@@ -31,12 +31,12 @@
   	<defs>
 		<radialGradient id="background" cx="10%" cy="10%" r="100%" fx="10%" fy="10%">
 			<stop offset="0%" stop-color="#ffffff" stop-opacity="1"/>
-			<stop id="fill_el" offset="100%" stop-color="#ffffcc" stop-opacity="1"/>
+			<stop id="fill_el" offset="100%" stop-color="LightBlue" stop-opacity="1"/>
 		</radialGradient>
 	</defs>
 	
 	<rect id="text_frame" oryx:anchors="bottom top right left" x="1" y="1" width="94" height="79" rx="10" ry="10" stroke="none" stroke-width="0" fill="none" />
-	<rect id="bg_frame" oryx:anchors="bottom top right left" x="0" y="0" width="100" height="80" rx="10" ry="10" stroke="black" stroke-width="1" fill="url(#background) #ffffcc" />
+	<rect id="bg_frame" oryx:anchors="bottom top right left" x="0" y="0" width="100" height="80" rx="10" ry="10" stroke="black" stroke-width="1" fill="url(#background) LightBlue" />
     <rect id="callActivity" oryx:resize="vertical horizontal" oryx:anchors="bottom top right left" x="0" y="0" width="100" height="80" rx="10" ry="10" stroke="black" stroke-width="4" fill="none" />
     	<text 
 			font-size="12"

modules/kdayun-app/src/main/resources/static/workflow/editor/stencilsets/bpmn2.0/view/activity/task.svg

@@ -32,13 +32,13 @@
   	<defs>
 		<radialGradient id="background" cx="10%" cy="10%" r="100%" fx="10%" fy="10%">
 			<stop offset="0%" stop-color="#ffffff" stop-opacity="1"/>
-			<stop id="fill_el" offset="100%" stop-color="#ffffcc" stop-opacity="1"/>
+			<stop id="fill_el" offset="100%" stop-color="LightBlue" stop-opacity="1"/>
 		</radialGradient>
 	</defs>
 	
 	<rect id="text_frame" oryx:anchors="bottom top right left" x="1" y="1" width="94" height="79" rx="10" ry="10" stroke="none" stroke-width="0" fill="none" />
     <rect id="callActivity" oryx:resize="vertical horizontal" oryx:anchors="bottom top right left" x="0" y="0" width="100" height="80" rx="10" ry="10" stroke="black" stroke-width="4" fill="none" />
-	<rect id="bg_frame" oryx:resize="vertical horizontal" x="0" y="0" width="100" height="80" rx="10" ry="10" stroke="black" stroke-width="1" fill="url(#background) #ffffcc" />
+	<rect id="bg_frame" oryx:resize="vertical horizontal" x="0" y="0" width="100" height="80" rx="10" ry="10" stroke="black" stroke-width="1" fill="url(#background) LightBlue" />
 		<text 
 			font-size="12" 
 			id="text_name" 

modules/kdayun-app/src/main/resources/static/workflow/editor/stencilsets/bpmn2.0/view/activity/usertask.svg

@@ -32,12 +32,12 @@
   	<defs>
 		<radialGradient id="background" cx="10%" cy="10%" r="100%" fx="10%" fy="10%">
 			<stop offset="0%" stop-color="#ffffff" stop-opacity="1"/>
-			<stop id="fill_el" offset="100%" stop-color="#ffffcc" stop-opacity="1"/>
+			<stop id="fill_el" offset="100%" stop-color="LightBlue" stop-opacity="1"/>
 		</radialGradient>
 	</defs>
 	
 	<rect id="text_frame" oryx:anchors="bottom top right left" x="1" y="1" width="94" height="79" rx="10" ry="10" stroke="none" stroke-width="0" fill="none" />
-	<rect id="bg_frame" oryx:resize="vertical horizontal" x="0" y="0" width="100" height="80" rx="10" ry="10" stroke="black" stroke-width="1" fill="url(#background) #ffffcc" />
+	<rect id="bg_frame" oryx:resize="vertical horizontal" x="0" y="0" width="100" height="80" rx="10" ry="10" stroke="black" stroke-width="1" fill="url(#background) LightBlue" />
 		<text 
 			font-size="12" 
 			id="text_name" 

modules/kdayun-app/src/main/resources/update/5.0.206/CORE_RES.json

@@ -468,7 +468,7 @@
             "MXZD_YINGWM": "",
             "MXZD_YUNXWK": 1,
             "MXZD_ZIDCD": "",
-            "MXZD_ZIDLX": "DATE",
+            "MXZD_ZIDLX": "DATETIME",
             "RWID": "E4A93C8C67D242D8B60BA95041F651D0",
             "SYS_CREATETIME": "2018-09-25 09:07:28",
             "SYS_CREATOR": "ADMIN",

modules/kdayun-app/src/main/resources/update/5.0.209/CORE_SYSOPT.json

@@ -38,8 +38,8 @@
             "RWID": "46A8E34619DA44D18CB6847BB522E892",
             "SYS_CREATETIME": "2019-04-10 10:34:41",
             "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
-            "SYS_MODIFYBY": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
-            "SYS_MODIFYTIME": "2019-04-10 10:34:47",
+            "SYS_MODIFYTIME": "",
             "SYS_SORT": 0.0,
             "SYS_STATUS": ""
         },
@@ -264,7 +264,7 @@
             "MXZD_YINGWM": "",
             "MXZD_YUNXWK": 1,
             "MXZD_ZIDCD": "",
-            "MXZD_ZIDLX": "DATE",
+            "MXZD_ZIDLX": "DATETIME",
             "RWID": "78A02F96954346FBBAEC3B103F0FE613",
             "SYS_CREATETIME": "2018-11-29 09:51:44",
             "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
@@ -399,8 +399,8 @@
             "SYS_CREATETIME": "2018-11-29 22:20:03",
             "SYS_CREATOR": "admin",
             "SYS_ISLEAF": "",
-            "SYS_MODIFYBY": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
-            "SYS_MODIFYTIME": "2022-04-18",
+            "SYS_MODIFYTIME": "",
             "SYS_PARENTID": "DE51D755BB9811ECAD5A0250F2000002",
             "SYS_PARENTS": "4DD45FFAFBF04D52A07B50EB0DDCD495_DE51D755BB9811ECAD5A0250F2000002_A1957133BEC111ECBACE080058000005",
             "SYS_SORT": 0.000000,
@@ -417,8 +417,8 @@
             "SYS_CREATETIME": "2022-04-14 22:20:03",
             "SYS_CREATOR": "admin",
             "SYS_ISLEAF": "",
-            "SYS_MODIFYBY": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
-            "SYS_MODIFYTIME": "2022-04-25",
+            "SYS_MODIFYTIME": "",
             "SYS_PARENTID": "DE51D755BB9811ECAD5A0250F2000002",
             "SYS_PARENTS": "4DD45FFAFBF04D52A07B50EB0DDCD495_DE51D755BB9811ECAD5A0250F2000002_870CBB12BB9811ECAD5A0250F2000002",
             "SYS_SORT": 1.000000,

modules/kdayun-app/src/main/resources/update/5.0.210/CORE_SYSOPT.json

@@ -264,7 +264,7 @@
             "MXZD_YINGWM": "",
             "MXZD_YUNXWK": 1,
             "MXZD_ZIDCD": "",
-            "MXZD_ZIDLX": "DATE",
+            "MXZD_ZIDLX": "DATETIME",
             "RWID": "78A02F96954346FBBAEC3B103F0FE613",
             "SYS_CREATETIME": "2018-11-29 09:51:44",
             "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",

modules/kdayun-app/src/main/resources/update/5.0.214/CORE_MODEL_Design.json

@@ -0,0 +1,503 @@
+{
+    "FUNCTIONID_ZLFW": "",
+    "MAINTABLENAME_ZLFW": "CORE_TABLE",
+    "MX_BIANH": "CORE_MODEL_Design",
+    "MX_BIAOLX": 1,
+    "MX_MIAOS": "",
+    "MX_MINGC": "表单设计表",
+    "MX_SHIFCJ": 1,
+    "MX_ZHUJZD": "RWID",
+    "RWID": "AF896A18316845CDB81009CE3FC31013",
+    "SYS_CREATETIME": "",
+    "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+    "SYS_ISLEAF": "",
+    "SYS_MODIFYBY": "33CE0962586841F9A477020CA6FCFFED",
+    "SYS_MODIFYTIME": "",
+    "SYS_PARENTID": "DC744F9E9E31437EA77602C1A5F3B6AA",
+    "SYS_PARENTS": "2FEF611CE3A140D7B9C8235BB1C14D22_394E6660894F4F9F9E39A701CD615C61_DC744F9E9E31437EA77602C1A5F3B6AA_AF896A18316845CDB81009CE3FC31013",
+    "SYS_SORT": 0,
+    "SYS_STATUS": "",
+    "bigFilePaths": [
+        "D:\\BS\\kdcloud\\kdayun\\kdayun-root\\modules\\kdayun-app\\target\\upload/tmp/849B9F8EC86344EDA29B3BACF2FD6BF1/CORE_MODEL_Design_bigfield"
+    ],
+    "columns": [
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "MODELD_TABLENAME",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "表单设计关联表中文名",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "AF896A18316845CDB81009CE3FC31013",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": 255,
+            "MXZD_ZIDLX": "STRING(255)",
+            "RWID": "F95ED545AED04F309F1B405226320F52",
+            "SYS_CREATETIME": "2019-06-21 03:19:53",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYTIME": "2019-06-21 03:19:58",
+            "SYS_SORT": 0.0,
+            "SYS_STATUS": ""
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "SYS_ISLEAF",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "是否叶子",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "AF896A18316845CDB81009CE3FC31013",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": "",
+            "MXZD_ZIDLX": "INTEGER",
+            "RWID": "DD12042FB4AD4E91ABC1012AC1DA6E04",
+            "SYS_CREATETIME": "2019-06-03 10:00:37",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYTIME": "2019-06-03 10:01:20",
+            "SYS_SORT": 0.0,
+            "SYS_STATUS": ""
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "SYS_PARENTID",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "上级父节点",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "AF896A18316845CDB81009CE3FC31013",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": 32,
+            "MXZD_ZIDLX": "STRING(32)",
+            "RWID": "55638664467E4FD98C44C38B077CD610",
+            "SYS_CREATETIME": "2019-06-03 09:54:43",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYTIME": "2019-06-03 09:56:43",
+            "SYS_SORT": 0.0,
+            "SYS_STATUS": ""
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "SYS_PARENTS",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "父节点",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "AF896A18316845CDB81009CE3FC31013",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": 1000,
+            "MXZD_ZIDLX": "STRING(1000)",
+            "RWID": "9D83E875004A4ED5B193F23F52273260",
+            "SYS_CREATETIME": "2019-06-02 09:55:27",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYTIME": "2019-06-02 09:56:43",
+            "SYS_SORT": 0.0,
+            "SYS_STATUS": ""
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "MODELD_VALUE",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "表单设计值",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "AF896A18316845CDB81009CE3FC31013",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": "",
+            "MXZD_ZIDLX": "TEXT",
+            "RWID": "F19BBC8439F34B86A7D1CD2AFF91680B",
+            "SYS_CREATETIME": "2019-04-12 10:09:21",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 0.0,
+            "SYS_STATUS": ""
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "MODELD_DFID",
+            "MXZD_MIAOS": "设计模板id,关联core_model_default",
+            "MXZD_MINGC": "表单设计关联模板",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "AF896A18316845CDB81009CE3FC31013",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": 32,
+            "MXZD_ZIDLX": "STRING(32)",
+            "RWID": "0044C15189734FD29BC2F9C498469F33",
+            "SYS_CREATETIME": "2019-04-12 10:03:44",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYTIME": "2019-04-12 10:07:03",
+            "SYS_SORT": 0.0,
+            "SYS_STATUS": ""
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "OBJCODE",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "表单设计编号",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "AF896A18316845CDB81009CE3FC31013",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": 50,
+            "MXZD_ZIDLX": "STRING(50)",
+            "RWID": "55AAC974BE3145CAA5AE7CC6C948F668",
+            "SYS_CREATETIME": "2019-04-12 10:00:59",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 0.0,
+            "SYS_STATUS": ""
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "OBJNAME",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "表单设计名称",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "AF896A18316845CDB81009CE3FC31013",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": 100,
+            "MXZD_ZIDLX": "STRING(100)",
+            "RWID": "34161CFA4D324730B873DA4E1DD2558C",
+            "SYS_CREATETIME": "2019-04-12 09:59:50",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 0.0,
+            "SYS_STATUS": ""
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "RWID",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "主键",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 1,
+            "MXZD_TABLEID": "AF896A18316845CDB81009CE3FC31013",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 0,
+            "MXZD_ZIDCD": 32,
+            "MXZD_ZIDLX": "PK",
+            "RWID": "B83702255882459B8C03BE04E99627C4",
+            "SYS_CREATETIME": "2019-04-12 09:48:03",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 0.0,
+            "SYS_STATUS": 0
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "MODELD_TABLEID",
+            "MXZD_MIAOS": "多个表以逗号隔开",
+            "MXZD_MINGC": "表单设计关联表",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "AF896A18316845CDB81009CE3FC31013",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": 255,
+            "MXZD_ZIDLX": "STRING(255)",
+            "RWID": "13EBB31A61724AA58F9F8D389DB0E1C5",
+            "SYS_CREATETIME": "2019-04-11 10:06:42",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 0.0,
+            "SYS_STATUS": ""
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "SYS_CREATOR",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "创建人",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "AF896A18316845CDB81009CE3FC31013",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 0,
+            "MXZD_ZIDCD": 32,
+            "MXZD_ZIDLX": "STRING(32)",
+            "RWID": "8F283BB3C46A46D1AB1F3762F4789896",
+            "SYS_CREATETIME": "2019-04-12 09:48:03",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 1000.0,
+            "SYS_STATUS": 0
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "SYS_CREATETIME",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "创建时间",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "AF896A18316845CDB81009CE3FC31013",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 0,
+            "MXZD_ZIDCD": "",
+            "MXZD_ZIDLX": "DATETIME",
+            "RWID": "7975F09701254E47B9FAF6F4051589BA",
+            "SYS_CREATETIME": "2019-04-12 09:48:03",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 1001.0,
+            "SYS_STATUS": 0
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "SYS_MODIFYBY",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "修改人",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "AF896A18316845CDB81009CE3FC31013",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": 32,
+            "MXZD_ZIDLX": "STRING(32)",
+            "RWID": "F9B6BC160F344E3A9A4D4EFACB9C39C5",
+            "SYS_CREATETIME": "2019-04-12 09:48:03",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 1002.0,
+            "SYS_STATUS": 0
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "SYS_MODIFYTIME",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "修改时间",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "AF896A18316845CDB81009CE3FC31013",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": "",
+            "MXZD_ZIDLX": "DATE",
+            "RWID": "4FD30CE42D87459AADB31A2430F16CA5",
+            "SYS_CREATETIME": "2019-04-12 09:48:03",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 1003.0,
+            "SYS_STATUS": 0
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "SYS_SORT",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "排序",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "AF896A18316845CDB81009CE3FC31013",
+            "MXZD_XIAOSJD": 6,
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": "",
+            "MXZD_ZIDLX": "FLOAT(X)",
+            "RWID": "B58A9E6A4822471F8067F42D15EA6FB7",
+            "SYS_CREATETIME": "2019-04-12 09:48:04",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 1004.0,
+            "SYS_STATUS": 0
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "SYS_PID",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "流程实例ID",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "AF896A18316845CDB81009CE3FC31013",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": 32,
+            "MXZD_ZIDLX": "STRING(32)",
+            "RWID": "81165A235AC241DE9E8020C029093708",
+            "SYS_CREATETIME": "2019-04-12 09:48:04",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 1005.0,
+            "SYS_STATUS": 0
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "SYS_AUDFLAG",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "审核状态",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "AF896A18316845CDB81009CE3FC31013",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": "",
+            "MXZD_ZIDLX": "INTEGER",
+            "RWID": "3CE62731D6CE4C62A4871971CE838BFB",
+            "SYS_CREATETIME": "2019-04-12 09:48:03",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 1006.0,
+            "SYS_STATUS": 0
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "SYS_STATUS",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "数据状态",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "AF896A18316845CDB81009CE3FC31013",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": "",
+            "MXZD_ZIDLX": "INTEGER",
+            "RWID": "1EE5B19553A645CE91CD93D3C8719178",
+            "SYS_CREATETIME": "2019-04-12 09:48:04",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 1007.0,
+            "SYS_STATUS": 0
+        }
+    ],
+    "indexs": [],
+    "links": [],
+    "rows": [
+        {
+            "MODELD_DFID": "",
+            "MODELD_TABLEID": "",
+            "MODELD_TABLENAME": "",
+            "MODELD_VALUE": "",
+            "OBJCODE": "CORE_CHAKLCRZ",
+            "OBJNAME": "查看流程日志",
+            "RWID": "BF82F13634FA49CE93552DD3C161C7AF",
+            "SYS_AUDFLAG": "",
+            "SYS_CREATETIME": "2022-09-08 10:49:30",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_ISLEAF": "",
+            "SYS_MODIFYBY": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYTIME": "2022-09-08 00:00:00",
+            "SYS_PARENTID": "994FCF88FFC34FACB38017630BD633B5",
+            "SYS_PARENTS": "994FCF88FFC34FACB38017630BD633B5_BF82F13634FA49CE93552DD3C161C7AF",
+            "SYS_PID": "",
+            "SYS_SORT": "",
+            "SYS_STATUS": ""
+        },
+        {
+            "MODELD_DFID": "",
+            "MODELD_TABLEID": "",
+            "MODELD_TABLENAME": "",
+            "MODELD_VALUE": "",
+            "OBJCODE": "CORE_LIUCSHV1",
+            "OBJNAME": "流程审核V1",
+            "RWID": "B6DFA848C40A481185D9F2AFC7423ED4",
+            "SYS_AUDFLAG": "",
+            "SYS_CREATETIME": "2022-02-10 15:49:07",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_ISLEAF": "",
+            "SYS_MODIFYBY": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYTIME": "2022-09-16 00:00:00",
+            "SYS_PARENTID": "994FCF88FFC34FACB38017630BD633B5",
+            "SYS_PARENTS": "994FCF88FFC34FACB38017630BD633B5_B6DFA848C40A481185D9F2AFC7423ED4",
+            "SYS_PID": "",
+            "SYS_SORT": "",
+            "SYS_STATUS": ""
+        },
+        {
+            "MODELD_DFID": "",
+            "MODELD_TABLEID": "",
+            "MODELD_TABLENAME": "",
+            "MODELD_VALUE": "",
+            "OBJCODE": "CORE_LCDBS",
+            "OBJNAME": "流程待办事项",
+            "RWID": "C2AB0681B83246F78D467A0D05E5B821",
+            "SYS_AUDFLAG": "",
+            "SYS_CREATETIME": "2021-09-24 13:04:49",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_ISLEAF": "",
+            "SYS_MODIFYBY": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYTIME": "2022-09-16 00:00:00",
+            "SYS_PARENTID": "994FCF88FFC34FACB38017630BD633B5",
+            "SYS_PARENTS": "994FCF88FFC34FACB38017630BD633B5_C2AB0681B83246F78D467A0D05E5B821",
+            "SYS_PID": "",
+            "SYS_SORT": "",
+            "SYS_STATUS": ""
+        }
+    ]
+}

modules/kdayun-app/src/main/resources/update/5.0.214/CORE_SYSOPT.json

@@ -0,0 +1,415 @@
+{
+    "FUNCTIONID_ZLFW": "",
+    "MAINTABLENAME_ZLFW": "CORE_TABLE",
+    "MX_BIANH": "CORE_SYSOPT",
+    "MX_BIAOLX": 1,
+    "MX_MIAOS": "",
+    "MX_MINGC": "系统选项",
+    "MX_SHIFCJ": 1,
+    "MX_ZHUJZD": "RWID",
+    "RWID": "901CF522AAFE4B09B2BA8DB6F4DCD7FB",
+    "SYS_CREATETIME": "",
+    "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+    "SYS_ISLEAF": "",
+    "SYS_MODIFYBY": "",
+    "SYS_MODIFYTIME": "",
+    "SYS_PARENTID": "394E6660894F4F9F9E39A701CD615C61",
+    "SYS_PARENTS": "2FEF611CE3A140D7B9C8235BB1C14D22_394E6660894F4F9F9E39A701CD615C61_901CF522AAFE4B09B2BA8DB6F4DCD7FB",
+    "SYS_SORT": "",
+    "SYS_STATUS": "",
+    "bigFilePaths": [
+        "D:\\BS\\kdcloud\\kdayun\\kdayun-root\\modules\\kdayun-app\\target\\upload/tmp/5D47A29C8D3A4CDA995F31FD8745F75D/CORE_SYSOPT_bigfield"
+    ],
+    "columns": [
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "XTYPE_CV",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "选项类型值大字段",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "901CF522AAFE4B09B2BA8DB6F4DCD7FB",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": "",
+            "MXZD_ZIDLX": "TEXT",
+            "RWID": "46A8E34619DA44D18CB6847BB522E892",
+            "SYS_CREATETIME": "2019-04-10 10:34:41",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYTIME": "2019-04-10 10:34:47",
+            "SYS_SORT": 0.0,
+            "SYS_STATUS": ""
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "RWID",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "主键",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 1,
+            "MXZD_TABLEID": "901CF522AAFE4B09B2BA8DB6F4DCD7FB",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 0,
+            "MXZD_ZIDCD": 32,
+            "MXZD_ZIDLX": "PK",
+            "RWID": "06A4620EB01D4A7DB7DF8914FE95B400",
+            "SYS_CREATETIME": "2018-11-29 09:51:44",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 0.0,
+            "SYS_STATUS": 0
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "K",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "选项Key",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "901CF522AAFE4B09B2BA8DB6F4DCD7FB",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 0,
+            "MXZD_ZIDCD": "",
+            "MXZD_ZIDLX": "STRING(32)",
+            "RWID": "E43F434E96EF4E4E9F7D75477C0491C7",
+            "SYS_CREATETIME": "2018-11-29 09:53:44",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 1.0,
+            "SYS_STATUS": ""
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "XTYPE",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "选项类型(switch,group,combox,input,json)",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "901CF522AAFE4B09B2BA8DB6F4DCD7FB",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 0,
+            "MXZD_ZIDCD": "",
+            "MXZD_ZIDLX": "STRING(2000)",
+            "RWID": "0D72B8C64E9A47EA85B77285B4D2507A",
+            "SYS_CREATETIME": "2018-11-29 09:53:44",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 1.0,
+            "SYS_STATUS": ""
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "V",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "选项值",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "901CF522AAFE4B09B2BA8DB6F4DCD7FB",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": "",
+            "MXZD_ZIDLX": "STRING(2000)",
+            "RWID": "23CBD7326FC244CDBF40AB6FD881BF8A",
+            "SYS_CREATETIME": "2018-11-29 09:53:44",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 2.0,
+            "SYS_STATUS": ""
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "BEIZ",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "备注",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "901CF522AAFE4B09B2BA8DB6F4DCD7FB",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": "",
+            "MXZD_ZIDLX": "STRING(2000)",
+            "RWID": "CE5DF46DE73A4745B102847A87893EEE",
+            "SYS_CREATETIME": "2018-11-29 09:54:25",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 3.0,
+            "SYS_STATUS": ""
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "TITLE",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "选项描述",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "901CF522AAFE4B09B2BA8DB6F4DCD7FB",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": "",
+            "MXZD_ZIDLX": "STRING(255)",
+            "RWID": "62A026B532134896AAE81B7D809C86C9",
+            "SYS_CREATETIME": "2018-11-29 09:54:25",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 3.0,
+            "SYS_STATUS": ""
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "SYS_CREATOR",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "创建人",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "901CF522AAFE4B09B2BA8DB6F4DCD7FB",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 0,
+            "MXZD_ZIDCD": 32,
+            "MXZD_ZIDLX": "STRING(32)",
+            "RWID": "002B4630DCB54D8F8D383BEC1A90A144",
+            "SYS_CREATETIME": "2018-11-29 09:51:44",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 1000.0,
+            "SYS_STATUS": 0
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "SYS_CREATETIME",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "创建时间",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "901CF522AAFE4B09B2BA8DB6F4DCD7FB",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 0,
+            "MXZD_ZIDCD": "",
+            "MXZD_ZIDLX": "DATETIME",
+            "RWID": "A5EE66C0126147948B8F6003BF644145",
+            "SYS_CREATETIME": "2018-11-29 09:51:44",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 1001.0,
+            "SYS_STATUS": 0
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "SYS_MODIFYBY",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "修改人",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "901CF522AAFE4B09B2BA8DB6F4DCD7FB",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": 32,
+            "MXZD_ZIDLX": "STRING(32)",
+            "RWID": "D2D51B0C83F342F391BF87DAB31492B2",
+            "SYS_CREATETIME": "2018-11-29 09:51:44",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 1002.0,
+            "SYS_STATUS": 0
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "SYS_MODIFYTIME",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "修改时间",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "901CF522AAFE4B09B2BA8DB6F4DCD7FB",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": "",
+            "MXZD_ZIDLX": "DATETIME",
+            "RWID": "78A02F96954346FBBAEC3B103F0FE613",
+            "SYS_CREATETIME": "2018-11-29 09:51:44",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 1003.0,
+            "SYS_STATUS": 0
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "SYS_SORT",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "排序",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "901CF522AAFE4B09B2BA8DB6F4DCD7FB",
+            "MXZD_XIAOSJD": 6,
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": "",
+            "MXZD_ZIDLX": "FLOAT(X)",
+            "RWID": "4FFDD99E7897491E8846E86A82C08E0C",
+            "SYS_CREATETIME": "2018-11-29 09:51:44",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 1004.0,
+            "SYS_STATUS": 0
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "SYS_STATUS",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "数据状态",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "901CF522AAFE4B09B2BA8DB6F4DCD7FB",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": "",
+            "MXZD_ZIDLX": "INTEGER",
+            "RWID": "BE01A5BB6058411DAF6941C9CDD380A4",
+            "SYS_CREATETIME": "2018-11-29 09:51:44",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 1007.0,
+            "SYS_STATUS": 0
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "SYS_PARENTS",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "所有父节点ID",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "901CF522AAFE4B09B2BA8DB6F4DCD7FB",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": 0,
+            "MXZD_ZIDLX": "STRING(1000)",
+            "RWID": "7776AF9AD2C747F58816D26CB1E778B3",
+            "SYS_CREATETIME": "2018-11-29 09:51:44",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 1008.0,
+            "SYS_STATUS": 0
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "SYS_PARENTID",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "父节点ID",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "901CF522AAFE4B09B2BA8DB6F4DCD7FB",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": 32,
+            "MXZD_ZIDLX": "STRING(32)",
+            "RWID": "486D270902D14AC7BE11B6F537737D04",
+            "SYS_CREATETIME": "2018-11-29 09:51:44",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 1009.0,
+            "SYS_STATUS": 0
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "SYS_ISLEAF",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "是否叶子节点",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "901CF522AAFE4B09B2BA8DB6F4DCD7FB",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": "",
+            "MXZD_ZIDLX": "INTEGER",
+            "RWID": "3F555A8572724931A8ACF8BD8144CC45",
+            "SYS_CREATETIME": "2018-11-29 09:51:44",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 1010.0,
+            "SYS_STATUS": 0
+        }
+    ],
+    "indexs": [],
+    "links": [],
+    "rows": [
+        {
+            "BEIZ": "用户密码在网络上传输时的密文的加密方式",
+            "K": "4C870B991E3211EDA67A309C23AF4765",
+            "RWID": "395B140E1E3211EDA67A309C23AF4765",
+            "SYS_CREATETIME": "2018-11-29 22:20:03",
+            "SYS_CREATOR": "admin",
+            "SYS_ISLEAF": "",
+            "SYS_MODIFYBY": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYTIME": "2022-08-18 00:00:00",
+            "SYS_PARENTID": "A997FE6D893D43E8AA0EB07FBC33CACD",
+            "SYS_PARENTS": "4DD45FFAFBF04D52A07B50EB0DDCD495_A997FE6D893D43E8AA0EB07FBC33CACD_FD52D4DA23874C57A1C2FF1CF201726E",
+            "SYS_SORT": 0.000000,
+            "SYS_STATUS": "",
+            "TITLE": "用户密码加密方式",
+            "V": "sm2",
+            "XTYPE": "{\n    \"xtype\": \"combox\",\n    \"items\": [\n        {\n            \"name\": \"md5\",\n            \"value\": \"md5\"\n        },\n{\n            \"name\": \"sm2(国密)\",\n            \"value\": \"sm2\"\n        }\n    ]\n}",
+            "XTYPE_CV": ""
+        }
+    ]
+}

modules/kdayun-app/src/main/resources/view/error/4xx.ftl

@@ -0,0 +1,354 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>404</title>
+    <style type="text/css">
+        /*! normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css */
+        html {
+            font-family: sans-serif;
+            line-height: 1.15;
+            -ms-text-size-adjust: 100%;
+            -webkit-text-size-adjust: 100%
+        }
+
+        body {
+            margin: 0
+        }
+
+        article,
+        aside,
+        footer,
+        header,
+        nav,
+        section {
+            display: block
+        }
+
+        h1 {
+            font-size: 2em;
+            margin: .67em 0
+        }
+
+        figcaption,
+        figure,
+        main {
+            display: block
+        }
+
+        figure {
+            margin: 1em 40px
+        }
+
+        hr {
+            box-sizing: content-box;
+            height: 0;
+            overflow: visible
+        }
+
+        pre {
+            font-family: monospace, monospace;
+            font-size: 1em
+        }
+
+        a {
+            background-color: transparent;
+            -webkit-text-decoration-skip: objects
+        }
+
+        a:active,
+        a:hover {
+            outline-width: 0
+        }
+
+        abbr[title] {
+            border-bottom: none;
+            text-decoration: underline;
+            text-decoration: underline dotted
+        }
+
+        b,
+        strong {
+            font-weight: inherit
+        }
+
+        b,
+        strong {
+            font-weight: bolder
+        }
+
+        code,
+        kbd,
+        samp {
+            font-family: monospace, monospace;
+            font-size: 1em
+        }
+
+        dfn {
+            font-style: italic
+        }
+
+        mark {
+            background-color: #ff0;
+            color: #000
+        }
+
+        small {
+            font-size: 80%
+        }
+
+        sub,
+        sup {
+            font-size: 75%;
+            line-height: 0;
+            position: relative;
+            vertical-align: baseline
+        }
+
+        sub {
+            bottom: -.25em
+        }
+
+        sup {
+            top: -.5em
+        }
+
+        audio,
+        video {
+            display: inline-block
+        }
+
+        audio:not([controls]) {
+            display: none;
+            height: 0
+        }
+
+        img {
+            border-style: none
+        }
+
+        svg:not(:root) {
+            overflow: hidden
+        }
+
+        button,
+        input,
+        optgroup,
+        select,
+        textarea {
+            font-family: sans-serif;
+            font-size: 100%;
+            line-height: 1.15;
+            margin: 0
+        }
+
+        button,
+        input {
+            overflow: visible
+        }
+
+        button,
+        select {
+            text-transform: none
+        }
+
+        [type=reset],
+        [type=submit],
+        button,
+        html [type=button] {
+            -webkit-appearance: button
+        }
+
+        [type=button]::-moz-focus-inner,
+        [type=reset]::-moz-focus-inner,
+        [type=submit]::-moz-focus-inner,
+        button::-moz-focus-inner {
+            border-style: none;
+            padding: 0
+        }
+
+        [type=button]:-moz-focusring,
+        [type=reset]:-moz-focusring,
+        [type=submit]:-moz-focusring,
+        button:-moz-focusring {
+            outline: 1px dotted ButtonText
+        }
+
+        fieldset {
+            border: 1px solid silver;
+            margin: 0 2px;
+            padding: .35em .625em .75em
+        }
+
+        legend {
+            box-sizing: border-box;
+            color: inherit;
+            display: table;
+            max-width: 100%;
+            padding: 0;
+            white-space: normal
+        }
+
+        progress {
+            display: inline-block;
+            vertical-align: baseline
+        }
+
+        textarea {
+            overflow: auto
+        }
+
+        [type=checkbox],
+        [type=radio] {
+            box-sizing: border-box;
+            padding: 0
+        }
+
+        [type=number]::-webkit-inner-spin-button,
+        [type=number]::-webkit-outer-spin-button {
+            height: auto
+        }
+
+        [type=search] {
+            -webkit-appearance: textfield;
+            outline-offset: -2px
+        }
+
+        [type=search]::-webkit-search-cancel-button,
+        [type=search]::-webkit-search-decoration {
+            -webkit-appearance: none
+        }
+
+        ::-webkit-file-upload-button {
+            -webkit-appearance: button;
+            font: inherit
+        }
+
+        details,
+        menu {
+            display: block
+        }
+
+        summary {
+            display: list-item
+        }
+
+        canvas {
+            display: inline-block
+        }
+
+        template {
+            display: none
+        }
+
+        [hidden] {
+            display: none
+        }
+
+        /*! Simple HttpErrorPages | MIT X11 License | https://github.com/AndiDittrich/HttpErrorPages */
+        body,
+        html {
+            width: 100%;
+            height: 100%;
+        }
+
+        body {
+            text-align: center;
+            text-shadow: 0 2px 4px rgba(0, 0, 0, .5);
+            padding: 0;
+            min-height: 100%;
+            display: table;
+            font-family: "Open Sans", Arial, sans-serif
+        }
+
+        h1 {
+            font-family: inherit;
+            font-weight: 500;
+            line-height: 1.1;
+            color: inherit;
+            font-size: 36px
+        }
+
+        h1 small {
+            font-size: 68%;
+            font-weight: 400;
+            line-height: 1;
+            color: #777
+        }
+
+        a {
+            text-decoration: none;
+            color: #fff;
+            font-size: inherit;
+            border-bottom: dotted 1px #707070
+        }
+
+        .lead {
+            font-size: 21px;
+            line-height: 1.4
+        }
+
+        .cover {
+            display: table-cell;
+            vertical-align: middle;
+            padding: 0 20px
+        }
+
+        footer {
+            position: fixed;
+            width: 100%;
+            height: 40px;
+            left: 0;
+            bottom: 0;
+            color: #a0a0a0;
+            font-size: 14px
+        }
+
+        .err-detail {
+            display: none
+        }
+
+        .err-detail-show {
+            display: block
+        }
+
+        .err-btn {
+            color: blue;
+            cursor: pointer;
+        }
+
+        .err-btn>div {
+            display: block
+        }
+    </style>
+    <script type="text/javascript">
+        function onDetail() {
+            let detailElem=document.getElementsByClassName("err-detail").item(0);
+            if(detailElem.classList.contains("err-detail-show")){
+                detailElem.classList.remove("err-detail-show")
+            }else{
+                detailElem.classList.add("err-detail-show")
+            }
+        }
+    </script>
+</head>
+
+<body>
+    <div class="cover">
+        <img alt="" src="">
+        <h1>${status} 错误 :  ${error}</h1>
+        <p class="lead">${message}</p>
+        <p class="lead">时间:${timestamp?string("yyyy年MM月dd日 hh:mm:ss")}</p>
+        <p class="lead">请求地址:${path}</p>
+        <#--  <div>
+            <span class="err-btn" onclick="onDetail()">详细信息
+            </span>
+            <div class="err-detail">${message}</div>
+        </div>  -->
+    </div>
+</body>
+
+</html>

modules/kdayun-app/src/main/resources/view/error/5xx.ftl

@@ -0,0 +1,356 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>500</title>
+    <style type="text/css">
+        /*! normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css */
+        html {
+            font-family: sans-serif;
+            line-height: 1.15;
+            -ms-text-size-adjust: 100%;
+            -webkit-text-size-adjust: 100%
+        }
+
+        body {
+            margin: 0
+        }
+
+        article,
+        aside,
+        footer,
+        header,
+        nav,
+        section {
+            display: block
+        }
+
+        h1 {
+            font-size: 2em;
+            margin: .67em 0
+        }
+
+        figcaption,
+        figure,
+        main {
+            display: block
+        }
+
+        figure {
+            margin: 1em 40px
+        }
+
+        hr {
+            box-sizing: content-box;
+            height: 0;
+            overflow: visible
+        }
+
+        pre {
+            font-family: monospace, monospace;
+            font-size: 1em
+        }
+
+        a {
+            background-color: transparent;
+            -webkit-text-decoration-skip: objects
+        }
+
+        a:active,
+        a:hover {
+            outline-width: 0
+        }
+
+        abbr[title] {
+            border-bottom: none;
+            text-decoration: underline;
+            text-decoration: underline dotted
+        }
+
+        b,
+        strong {
+            font-weight: inherit
+        }
+
+        b,
+        strong {
+            font-weight: bolder
+        }
+
+        code,
+        kbd,
+        samp {
+            font-family: monospace, monospace;
+            font-size: 1em
+        }
+
+        dfn {
+            font-style: italic
+        }
+
+        mark {
+            background-color: #ff0;
+            color: #000
+        }
+
+        small {
+            font-size: 80%
+        }
+
+        sub,
+        sup {
+            font-size: 75%;
+            line-height: 0;
+            position: relative;
+            vertical-align: baseline
+        }
+
+        sub {
+            bottom: -.25em
+        }
+
+        sup {
+            top: -.5em
+        }
+
+        audio,
+        video {
+            display: inline-block
+        }
+
+        audio:not([controls]) {
+            display: none;
+            height: 0
+        }
+
+        img {
+            border-style: none
+        }
+
+        svg:not(:root) {
+            overflow: hidden
+        }
+
+        button,
+        input,
+        optgroup,
+        select,
+        textarea {
+            font-family: sans-serif;
+            font-size: 100%;
+            line-height: 1.15;
+            margin: 0
+        }
+
+        button,
+        input {
+            overflow: visible
+        }
+
+        button,
+        select {
+            text-transform: none
+        }
+
+        [type=reset],
+        [type=submit],
+        button,
+        html [type=button] {
+            -webkit-appearance: button
+        }
+
+        [type=button]::-moz-focus-inner,
+        [type=reset]::-moz-focus-inner,
+        [type=submit]::-moz-focus-inner,
+        button::-moz-focus-inner {
+            border-style: none;
+            padding: 0
+        }
+
+        [type=button]:-moz-focusring,
+        [type=reset]:-moz-focusring,
+        [type=submit]:-moz-focusring,
+        button:-moz-focusring {
+            outline: 1px dotted ButtonText
+        }
+
+        fieldset {
+            border: 1px solid silver;
+            margin: 0 2px;
+            padding: .35em .625em .75em
+        }
+
+        legend {
+            box-sizing: border-box;
+            color: inherit;
+            display: table;
+            max-width: 100%;
+            padding: 0;
+            white-space: normal
+        }
+
+        progress {
+            display: inline-block;
+            vertical-align: baseline
+        }
+
+        textarea {
+            overflow: auto
+        }
+
+        [type=checkbox],
+        [type=radio] {
+            box-sizing: border-box;
+            padding: 0
+        }
+
+        [type=number]::-webkit-inner-spin-button,
+        [type=number]::-webkit-outer-spin-button {
+            height: auto
+        }
+
+        [type=search] {
+            -webkit-appearance: textfield;
+            outline-offset: -2px
+        }
+
+        [type=search]::-webkit-search-cancel-button,
+        [type=search]::-webkit-search-decoration {
+            -webkit-appearance: none
+        }
+
+        ::-webkit-file-upload-button {
+            -webkit-appearance: button;
+            font: inherit
+        }
+
+        details,
+        menu {
+            display: block
+        }
+
+        summary {
+            display: list-item
+        }
+
+        canvas {
+            display: inline-block
+        }
+
+        template {
+            display: none
+        }
+
+        [hidden] {
+            display: none
+        }
+
+        /*! Simple HttpErrorPages | MIT X11 License | https://github.com/AndiDittrich/HttpErrorPages */
+        body,
+        html {
+            width: 100%;
+            height: 100%;
+        }
+
+        body {
+            text-align: center;
+            text-shadow: 0 2px 4px rgba(0, 0, 0, .5);
+            padding: 0;
+            min-height: 100%;
+            display: table;
+            font-family: "Open Sans", Arial, sans-serif
+        }
+
+        h1 {
+            font-family: inherit;
+            font-weight: 500;
+            line-height: 1.1;
+            color: inherit;
+            font-size: 36px
+        }
+
+        h1 small {
+            font-size: 68%;
+            font-weight: 400;
+            line-height: 1;
+            color: #777
+        }
+
+        a {
+            text-decoration: none;
+            color: #fff;
+            font-size: inherit;
+            border-bottom: dotted 1px #707070
+        }
+
+        .lead {
+            font-size: 21px;
+            line-height: 1.4
+        }
+
+        .cover {
+            display: table-cell;
+            vertical-align: middle;
+            padding: 0 20px
+        }
+
+        footer {
+            position: fixed;
+            width: 100%;
+            height: 40px;
+            left: 0;
+            bottom: 0;
+            color: #a0a0a0;
+            font-size: 14px
+        }
+
+        .err-detail {
+            display: none;
+            height: 600px;
+            text-align: left;
+        }
+
+        .err-detail-show {
+            display: block
+        }
+
+        .err-btn {
+            color: blue;
+            cursor: pointer;
+        }
+
+        .err-btn>div {
+            display: block
+        }
+    </style>
+    <script type="text/javascript">
+        function onDetail() {
+            let detailElem=document.getElementsByClassName("err-detail").item(0);
+            if(detailElem.classList.contains("err-detail-show")){
+                detailElem.classList.remove("err-detail-show")
+            }else{
+                detailElem.classList.add("err-detail-show")
+            }
+        }
+    </script>
+</head>
+
+<body>
+    <div class="cover">
+        <img alt="" src="">
+        <h1>${status} 错误 : ${error}</h1>
+        <p class="lead">${message}</p>
+        <p class="lead">时间:${timestamp?string("yyyy年MM月dd日 hh:mm:ss")}</p>
+        <p class="lead">请求地址:${path}</p>
+        <#--  <div>
+            <span class="err-btn" onclick="onDetail()">详细信息
+            </span>
+            <div class="err-detail">${trace}</div>
+        </div>   -->
+    </div>
+</body>
+
+</html>

modules/kdayun-app/src/main/resources/view/manager/coremodeldesign/formdesign/design.ftl

@@ -36,6 +36,7 @@
 
     <input id="modelId" type="hidden" value='${modelId}'>
     <input id="tokenId" type="hidden" value='${tokenId}'>
+    <input id="orgid" type="hidden" value='${oid}'>
     <input id="contextPath" type="hidden" value="${request.contextPath}" >
 
   	<script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/formdesign/libs/jquery.js'> </@jstime>"></script>
@@ -45,7 +46,7 @@
 	<script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/formdesign/libs/lodash.js'> </@jstime>"></script>
 	<script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/ajaxhook.min.js'> </@jstime>"></script>
     <script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/token.js'> </@jstime>"></script>
-    <script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/aes.min.js'> </@jstime>"></script>
+    <!--<script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/aes.min.js'> </@jstime>"></script>-->
     
 
 	<!-- 让IE8/9支持媒体查询，从而兼容栅格 -->

modules/kdayun-app/src/main/resources/view/manager/coremodeldesign/formdesign/preview.ftl

@@ -58,7 +58,7 @@
     <script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/formdesign/libs/ztree/js/jquery.ztree.exhide.min.js'> </@jstime>"></script>
 	<script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/ajaxhook.min.js'> </@jstime>"></script>
 	<script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/token.js'> </@jstime>"></script>
-    <script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/aes.min.js'> </@jstime>"></script>
+    <!--<script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/aes.min.js'> </@jstime>"></script>
 	  <!-- 添加发生重大事件获取哀悼日需要把网站变灰的样式 -->
   <@config id = Global.SYSOPTKEY_ISOPENZHIHUI orgid = "${orgid}" >
       <link id="filterCss" rel="stylesheet" href="${request.contextPath}<@jstime url='/static/modules/manager/css/filter.css'> </@jstime>" media="all">

modules/kdayun-app/src/main/resources/view/manager/coresysopt/main_coresysopt.ftl

@@ -122,7 +122,7 @@
 
 	<script id="theme_setter_template" type="text/html">
         <div class="layui-card-body layadmin-setTheme">
-            <div class="layui-card-header zltree-header">系统主题</div>
+            <div class="layui-card-header zltree-header">系统主题1</div>
             <p class="layui-search operation-btn">
                 <button class="layui-btn layui-btn-sm" id="addTheme" title="添加主题">
                     <i class="layui-icon layui-icon-add-1" style="margin-right: 0;"></i>

modules/kdayun-app/src/main/resources/view/manager/index.ftl

@@ -168,16 +168,16 @@
                 <a href="javascript:;"></a>
                 <dl class="layui-nav-child layui-anim-fadein">
                   <dd layadmin-event="closeThisTabs">
-                    <a href="javascript:;">关闭当前标签页</a>
+                    <a href="javascript:;">关闭当前</a>
                   </dd>
                   <dd layadmin-event="closeOtherTabs">
-                    <a href="javascript:;">关闭其它标签页</a>
+                    <a href="javascript:;">关闭其它</a>
                   </dd>
                   <dd layadmin-event="closeAllTabs">
-                    <a href="javascript:;">关闭全部标签页</a>
+                    <a href="javascript:;">关闭全部</a>
                   </dd>
                   <dd layadmin-event="refreshCurrentPage">
-                    <a href="javascript:;">刷新当前页面</a>
+                    <a href="javascript:;">刷新当前</a>
                   </dd>
                 </dl>
               </li>

modules/kdayun-app/src/main/resources/view/manager/login/main_login.ftl

@@ -79,6 +79,10 @@
         </footer>
         <script type="text/javascript" src="${request.contextPath}/static/libs/layui/layui.js"></script>
         <script type="text/javascript" src="${request.contextPath}/static/libs/md5.js" type="text/javascript"></script>
+        <@config id=Global.SYSOPTKEY_PSW_CRYPTOTYPE value='sm2' orgid='${orgid}'>
+        <script type="text/javascript" src="${request.contextPath}/static/libs/crypto-js.js" type="text/javascript"></script>
+        <script type="text/javascript" src="${request.contextPath}/static/libs/sm2.js" type="text/javascript"></script>
+        </@config>
         <script>
             function getOrgCode() {
                 var url = window.location.href;
@@ -136,8 +140,6 @@
                 $("#captchaImg").click(function () {
                     reloadVcode();
                 });
-                //$('input[name="ZHANGHM"]').val('admin');
-                //$('input[name="abcd"]').val('zl123456zl');
 
                 $(document).on("keydown", function (e) {
                     e = e ? e : event;// 兼容FF
@@ -146,11 +148,18 @@
                         return false;//防止页面跳转刷新掉
                     }
                 });
+                var getPwdEn=function(str){
 
+                    var ret=  md5($("input[name='abcd']").val()).toUpperCase();
+                        <@config id=Global.SYSOPTKEY_PSW_CRYPTOTYPE value='sm2' orgid='${orgid}'>
+                        ret= sm2Encrypt(ret,'${sm2_publickey}',0);
+                        </@config>
+                    return ret;
+                }
                 form.on('submit(login)', function (data) {
                     var coreuser = {};
                     coreuser.ZHANGHM = $('input[name="ZHANGHM"]').val();
-                    coreuser.PSW = md5($("input[name='abcd']").val()).toUpperCase();
+                    coreuser.PSW = getPwdEn($("input[name='abcd']").val()).toUpperCase();
                     coreuser.validCode = $('input[name="vcode"]').val();
                     coreuser.orgCode = getOrgCode();
                     coreuser.loginUrl = location.href;

modules/kdayun-app/src/main/resources/view/web/index.ftl

@@ -163,16 +163,16 @@
             <a href="javascript:;"></a>
             <dl class="layui-nav-child layui-anim-fadein">
               <dd layadmin-event="closeThisTabs">
-                <a href="javascript:;">关闭当前标签页</a>
+                <a href="javascript:;">关闭当前</a>
               </dd>
               <dd layadmin-event="closeOtherTabs">
-                <a href="javascript:;">关闭其它标签页</a>
+                <a href="javascript:;">关闭其它</a>
               </dd>
               <dd layadmin-event="closeAllTabs">
-                <a href="javascript:;">关闭全部标签页</a>
+                <a href="javascript:;">关闭全部</a>
               </dd>
               <dd layadmin-event="refreshCurrentPage">
-                <a href="javascript:;">刷新当前页面</a>
+                <a href="javascript:;">刷新当前</a>
               </dd>
             </dl>
           </li>
@@ -354,16 +354,16 @@
                 <a href="javascript:;"></a>
                 <dl class="layui-nav-child layui-anim-fadein">
                   <dd layadmin-event="closeThisTabs">
-                    <a href="javascript:;">关闭当前标签页</a>
+                    <a href="javascript:;">关闭当前</a>
                   </dd>
                   <dd layadmin-event="closeOtherTabs">
-                    <a href="javascript:;">关闭其它标签页</a>
+                    <a href="javascript:;">关闭其它</a>
                   </dd>
                   <dd layadmin-event="closeAllTabs">
-                    <a href="javascript:;">关闭全部标签页</a>
+                    <a href="javascript:;">关闭全部</a>
                   </dd>
                   <dd layadmin-event="refreshCurrentPage">
-                    <a href="javascript:;">刷新当前页面</a>
+                    <a href="javascript:;">刷新当前</a>
                   </dd>
                 </dl>
               </li>

modules/kdayun-app/src/main/resources/view/web/login.ftl

@@ -204,6 +204,11 @@
 
   <script src="${request.contextPath}/static/libs/layui/layui.js"></script>
   <script type="text/javascript" src="${request.contextPath}/static/libs/md5.js" type="text/javascript"></script>
+    <@config id=Global.SYSOPTKEY_PSW_CRYPTOTYPE value='sm2' orgid='${orgid}'>
+    <script type="text/javascript" src="${request.contextPath}/static/libs/crypto-js.js" type="text/javascript"></script>
+    <script type="text/javascript" src="${request.contextPath}/static/libs/sm2.js" type="text/javascript"></script>
+    </@config>
+  
   <script type="text/javascript" src="${request.contextPath}/static/libs/store.min.js" type="text/javascript"></script>
   <!-- 微信扫描登录js -->
   <!-- <script crossorigin="anonymous" integrity="sha256-b/7ix06s1RNq6TgSFoCdAG7ZHFjtXOkZ5XBJksfFuNgGY=" type="text/javascript" src="http://res.wx.qq.com/connect/zh_CN/htmledition/js/wxLogin.js"></script> -->
@@ -549,12 +554,20 @@
             }, 1000);  
         })
 
+        var getPwdEn=function(str){
+
+            var ret=  md5($("input[name='abcd']").val()).toUpperCase();
+                <@config id=Global.SYSOPTKEY_PSW_CRYPTOTYPE value='sm2' orgid='${orgid}'>
+                ret= sm2Encrypt(ret,'${sm2_publickey}',0);
+                </@config>
+            return ret;
+        }
 
         form.on('submit(LAY-user-login-submit)', function (data) {
             var coreuser = {};
             var isSms = $('input[name="isSms"]').val();
             $("input[name='ccc']").val($("input[name='abcd']").val());
-            $("input[name='abcd']").val(md5($("input[name='abcd']").val()).toUpperCase());
+            $("input[name='abcd']").val(getPwdEn($("input[name='abcd']").val()).toUpperCase());
             coreuser.isSms = isSms;
             if ('1' == isSms) {
                 coreuser.ZHANGHM = $("#LAY-user-login-cellphone").val();
@@ -577,7 +590,7 @@
                     var newdata = eval('(' + data + ')');
                     if (newdata.state == 'OK') {
                         store.set('ZHANGHM', coreuser.ZHANGHM);
-                        var params = { optid: "251D4C26BA3F4416A65AA3B1DC76C3F6" };
+                        var params = { optid: "251D4C26BA3F4416A65AA3B1DC76C3F6",orgid:"${orgid}"};
                         $.post(
                             '${request.contextPath}/manager/coresysopt/querybyid',
                             params,
@@ -586,6 +599,15 @@
                                 if (k.state == 'OK') {
                                     if (md5(k.obj).toUpperCase() != newdata.obj.userCursor["PSW"]) {
                                         $.post('${request.contextPath}/core/queryindex',{orgid:newdata.obj.ORGID},function(indexdata){
+                                            if(indexdata && indexdata.indexOf('用户登录')!=-1){
+                                                 layer.confirm('服务器已重启,点击[确定]再次登录',{
+                                                    btn: ['确定'],
+                                                    end : function() {
+                                                         location.reload();
+	                                                }
+                                                 });
+                                                  return;
+                                            }
                                             var  indexdata = eval('(' + indexdata + ')');
                                             if (indexdata.state == 'OK') {  
                                                 location.href = '${request.contextPath}'+ indexdata.obj;