Skip to content

T
TrainSys
提交 e3849c79 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

lxm1993 发布系统代码 [TrainSys，网页端]

上级 e553ab08
隐藏空白字符变更
内嵌 并排
正在显示 包含 271 行增加 和 318 行删除
app_Web/swarm.yaml
浏览文件 @ e3849c79
...@@ -3,7 +3,7 @@ services: ...@@ -3,7 +3,7 @@ services:
trainsys-app-web: trainsys-app-web:
image: dstimage image: dstimage
ports: ports:
- "50100:80" - "80:80"
networks: networks:
- agent_network - agent_network
environment: environment:
......
config.xml
浏览文件 @ e3849c79
...@@ -55,12 +55,6 @@ ...@@ -55,12 +55,6 @@
git clone -b master $para2 trainsys/ git clone -b master $para2 trainsys/
export NODE_OPTIONS=--max-old-space-size=4096 export NODE_OPTIONS=--max-old-space-size=4096
cd trainsys/ cd trainsys/
mvn clean package -Ptrainsys
mvn install -Ptrainsys
cd trainsys-provider
mvn -Ptrainsys docker:build
mvn -Ptrainsys docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/trainsys-provider-trainsys.yaml ebsx --with-registry-auth
</command> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
浏览文件 @ e3849c79
...@@ -1569,16 +1569,16 @@ ...@@ -1569,16 +1569,16 @@
"codeName" : "VMGroup2", "codeName" : "VMGroup2",
"name" : "视图消息组2", "name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息2", "name" : "视图消息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg3" "id" : "ViewMsg2"
} }
}, { }, {
"name" : "视图消息", "name" : "视图消息2",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg2" "id" : "ViewMsg3"
} }
} ] } ]
}, { }, {
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE/PSTREEGRIDICES/TestTreeGridExView_TreeGrid.json
浏览文件 @ e3849c79
...@@ -40,8 +40,7 @@ ...@@ -40,8 +40,7 @@
"width" : 80, "width" : 80,
"widthUnit" : "px", "widthUnit" : "px",
"enableExpand" : false, "enableExpand" : false,
"enableSort" : false, "enableSort" : false
"hideDefault" : true
}, { }, {
"caption" : "创建时间", "caption" : "创建时间",
"codeName" : "createdate", "codeName" : "createdate",
...@@ -356,55 +355,24 @@ ...@@ -356,55 +355,24 @@
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE.json"
}, },
"getPSDETreeNodeColumns" : [ { "getPSDETreeNodeColumns" : [ {
"cLConvertMode" : "NONE", "cLConvertMode" : "BACKEND",
"codeName" : "icon", "codeName" : "createman",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "icon",
"enableCond" : 3,
"ignoreInput" : 0,
"name" : "icon",
"getPSAppDEField" : {
"name" : "ICON",
"codeName" : "ICON"
},
"getPSDETreeColumn" : {
"modelref" : true,
"id" : "pic"
},
"allowEmpty" : true
}, {
"cLConvertMode" : "NONE",
"codeName" : "createdate",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "createdate", "dataItemName" : "createman",
"enableCond" : 3, "enableCond" : 3,
"ignoreInput" : 0, "ignoreInput" : 0,
"name" : "createdate", "name" : "createman",
"getPSAppDEField" : { "getPSAppCodeList" : {
"name" : "CREATEDATE",
"codeName" : "CreateDate"
},
"getPSDETreeColumn" : {
"modelref" : true, "modelref" : true,
"id" : "createdate" "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
}, },
"valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true
}, {
"cLConvertMode" : "NONE",
"codeName" : "fileid",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "fileid",
"enableCond" : 3,
"ignoreInput" : 0,
"name" : "fileid",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "FILEID", "name" : "CREATEMAN",
"codeName" : "FILEId" "codeName" : "CreateMan"
}, },
"getPSDETreeColumn" : { "getPSDETreeColumn" : {
"modelref" : true, "modelref" : true,
"id" : "uuid" "id" : "createman"
}, },
"allowEmpty" : true "allowEmpty" : true
}, { }, {
...@@ -440,31 +408,30 @@ ...@@ -440,31 +408,30 @@
"enableRowEdit" : true, "enableRowEdit" : true,
"needCodeListConfig" : true "needCodeListConfig" : true
}, { }, {
"cLConvertMode" : "BACKEND", "cLConvertMode" : "NONE",
"codeName" : "createman", "codeName" : "createdate",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "createman", "dataItemName" : "createdate",
"enableCond" : 3, "enableCond" : 3,
"ignoreInput" : 0, "ignoreInput" : 0,
"name" : "createman", "name" : "createdate",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
},
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "CREATEMAN", "name" : "CREATEDATE",
"codeName" : "CreateMan" "codeName" : "CreateDate"
}, },
"getPSDETreeColumn" : { "getPSDETreeColumn" : {
"modelref" : true, "modelref" : true,
"id" : "createman" "id" : "createdate"
}, },
"valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true "allowEmpty" : true
} ], }, {
"getPSDETreeNodeDataItems" : [ {
"cLConvertMode" : "NONE", "cLConvertMode" : "NONE",
"dataType" : 25, "codeName" : "icon",
"defaultValue" : "无图标（表格列）", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "icon",
"enableCond" : 3,
"ignoreInput" : 0,
"name" : "icon", "name" : "icon",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "ICON", "name" : "ICON",
...@@ -473,23 +440,15 @@ ...@@ -473,23 +440,15 @@
"getPSDETreeColumn" : { "getPSDETreeColumn" : {
"modelref" : true, "modelref" : true,
"id" : "pic" "id" : "pic"
}
}, {
"cLConvertMode" : "NONE",
"dataType" : 25,
"format" : "YYYY-MM-DD",
"name" : "createdate",
"getPSAppDEField" : {
"name" : "CREATEDATE",
"codeName" : "CreateDate"
}, },
"getPSDETreeColumn" : { "allowEmpty" : true
"modelref" : true,
"id" : "createdate"
}
}, { }, {
"cLConvertMode" : "NONE", "cLConvertMode" : "NONE",
"dataType" : 25, "codeName" : "fileid",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "fileid",
"enableCond" : 3,
"ignoreInput" : 0,
"name" : "fileid", "name" : "fileid",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "FILEID", "name" : "FILEID",
...@@ -498,6 +457,24 @@ ...@@ -498,6 +457,24 @@
"getPSDETreeColumn" : { "getPSDETreeColumn" : {
"modelref" : true, "modelref" : true,
"id" : "uuid" "id" : "uuid"
},
"allowEmpty" : true
} ],
"getPSDETreeNodeDataItems" : [ {
"cLConvertMode" : "BACKEND",
"dataType" : 25,
"name" : "createman",
"getPSAppDEField" : {
"name" : "CREATEMAN",
"codeName" : "CreateMan"
},
"getPSCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
},
"getPSDETreeColumn" : {
"modelref" : true,
"id" : "createman"
} }
}, { }, {
"cLConvertMode" : "FRONT", "cLConvertMode" : "FRONT",
...@@ -516,20 +493,42 @@ ...@@ -516,20 +493,42 @@
"id" : "name" "id" : "name"
} }
}, { }, {
"cLConvertMode" : "BACKEND", "cLConvertMode" : "NONE",
"dataType" : 25, "dataType" : 25,
"name" : "createman", "format" : "YYYY-MM-DD",
"name" : "createdate",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "CREATEMAN", "name" : "CREATEDATE",
"codeName" : "CreateMan" "codeName" : "CreateDate"
}, },
"getPSCodeList" : { "getPSDETreeColumn" : {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json" "id" : "createdate"
}
}, {
"cLConvertMode" : "NONE",
"dataType" : 25,
"defaultValue" : "无图标（表格列）",
"name" : "icon",
"getPSAppDEField" : {
"name" : "ICON",
"codeName" : "ICON"
}, },
"getPSDETreeColumn" : { "getPSDETreeColumn" : {
"modelref" : true, "modelref" : true,
"id" : "createman" "id" : "pic"
}
}, {
"cLConvertMode" : "NONE",
"dataType" : 25,
"name" : "fileid",
"getPSAppDEField" : {
"name" : "FILEID",
"codeName" : "FILEId"
},
"getPSDETreeColumn" : {
"modelref" : true,
"id" : "uuid"
} }
} ], } ],
"getPSDETreeNodeEditItems" : [ { "getPSDETreeNodeEditItems" : [ {
...@@ -622,23 +621,6 @@ ...@@ -622,23 +621,6 @@
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE.json"
}, },
"getPSDETreeNodeColumns" : [ { "getPSDETreeNodeColumns" : [ {
"cLConvertMode" : "NONE",
"codeName" : "icon",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "icon",
"enableCond" : 3,
"ignoreInput" : 0,
"name" : "icon",
"getPSAppDEField" : {
"name" : "ICON",
"codeName" : "ICON"
},
"getPSDETreeColumn" : {
"modelref" : true,
"id" : "pic"
},
"allowEmpty" : true
}, {
"cLConvertMode" : "NONE", "cLConvertMode" : "NONE",
"codeName" : "fileid", "codeName" : "fileid",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
...@@ -678,6 +660,23 @@ ...@@ -678,6 +660,23 @@
}, },
"allowEmpty" : true, "allowEmpty" : true,
"enableRowEdit" : true "enableRowEdit" : true
}, {
"cLConvertMode" : "NONE",
"codeName" : "icon",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "icon",
"enableCond" : 3,
"ignoreInput" : 0,
"name" : "icon",
"getPSAppDEField" : {
"name" : "ICON",
"codeName" : "ICON"
},
"getPSDETreeColumn" : {
"modelref" : true,
"id" : "pic"
},
"allowEmpty" : true
}, { }, {
"cLConvertMode" : "NONE", "cLConvertMode" : "NONE",
"codeName" : "createdate", "codeName" : "createdate",
...@@ -721,15 +720,10 @@ ...@@ -721,15 +720,10 @@
"getPSDETreeNodeDataItems" : [ { "getPSDETreeNodeDataItems" : [ {
"cLConvertMode" : "NONE", "cLConvertMode" : "NONE",
"dataType" : 25, "dataType" : 25,
"defaultValue" : "无图标（节点数据项）", "name" : "filetype",
"name" : "icon",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "ICON", "name" : "TYPE",
"codeName" : "ICON" "codeName" : "TYPE"
},
"getPSDETreeColumn" : {
"modelref" : true,
"id" : "pic"
} }
}, { }, {
"cLConvertMode" : "NONE", "cLConvertMode" : "NONE",
...@@ -755,6 +749,19 @@ ...@@ -755,6 +749,19 @@
"modelref" : true, "modelref" : true,
"id" : "name" "id" : "name"
} }
}, {
"cLConvertMode" : "NONE",
"dataType" : 25,
"defaultValue" : "无图标（节点数据项）",
"name" : "icon",
"getPSAppDEField" : {
"name" : "ICON",
"codeName" : "ICON"
},
"getPSDETreeColumn" : {
"modelref" : true,
"id" : "pic"
}
}, { }, {
"cLConvertMode" : "NONE", "cLConvertMode" : "NONE",
"dataType" : 25, "dataType" : 25,
...@@ -784,14 +791,6 @@ ...@@ -784,14 +791,6 @@
"modelref" : true, "modelref" : true,
"id" : "createman" "id" : "createman"
} }
}, {
"cLConvertMode" : "NONE",
"dataType" : 25,
"name" : "filetype",
"getPSAppDEField" : {
"name" : "TYPE",
"codeName" : "TYPE"
}
} ], } ],
"getPSDETreeNodeEditItems" : [ { "getPSDETreeNodeEditItems" : [ {
"codeName" : "filename", "codeName" : "filename",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/FILETestTreeGridExView.json
浏览文件 @ e3849c79
...@@ -101,8 +101,7 @@ ...@@ -101,8 +101,7 @@
"width" : 80, "width" : 80,
"widthUnit" : "px", "widthUnit" : "px",
"enableExpand" : false, "enableExpand" : false,
"enableSort" : false, "enableSort" : false
"hideDefault" : true
}, { }, {
"caption" : "创建时间", "caption" : "创建时间",
"codeName" : "createdate", "codeName" : "createdate",
...@@ -417,55 +416,24 @@ ...@@ -417,55 +416,24 @@
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE.json"
}, },
"getPSDETreeNodeColumns" : [ { "getPSDETreeNodeColumns" : [ {
"cLConvertMode" : "NONE", "cLConvertMode" : "BACKEND",
"codeName" : "icon", "codeName" : "createman",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "icon",
"enableCond" : 3,
"ignoreInput" : 0,
"name" : "icon",
"getPSAppDEField" : {
"name" : "ICON",
"codeName" : "ICON"
},
"getPSDETreeColumn" : {
"modelref" : true,
"id" : "pic"
},
"allowEmpty" : true
}, {
"cLConvertMode" : "NONE",
"codeName" : "createdate",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "createdate", "dataItemName" : "createman",
"enableCond" : 3, "enableCond" : 3,
"ignoreInput" : 0, "ignoreInput" : 0,
"name" : "createdate", "name" : "createman",
"getPSAppDEField" : { "getPSAppCodeList" : {
"name" : "CREATEDATE",
"codeName" : "CreateDate"
},
"getPSDETreeColumn" : {
"modelref" : true, "modelref" : true,
"id" : "createdate" "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
}, },
"valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true
}, {
"cLConvertMode" : "NONE",
"codeName" : "fileid",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "fileid",
"enableCond" : 3,
"ignoreInput" : 0,
"name" : "fileid",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "FILEID", "name" : "CREATEMAN",
"codeName" : "FILEId" "codeName" : "CreateMan"
}, },
"getPSDETreeColumn" : { "getPSDETreeColumn" : {
"modelref" : true, "modelref" : true,
"id" : "uuid" "id" : "createman"
}, },
"allowEmpty" : true "allowEmpty" : true
}, { }, {
...@@ -501,31 +469,30 @@ ...@@ -501,31 +469,30 @@
"enableRowEdit" : true, "enableRowEdit" : true,
"needCodeListConfig" : true "needCodeListConfig" : true
}, { }, {
"cLConvertMode" : "BACKEND", "cLConvertMode" : "NONE",
"codeName" : "createman", "codeName" : "createdate",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "createman", "dataItemName" : "createdate",
"enableCond" : 3, "enableCond" : 3,
"ignoreInput" : 0, "ignoreInput" : 0,
"name" : "createman", "name" : "createdate",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
},
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "CREATEMAN", "name" : "CREATEDATE",
"codeName" : "CreateMan" "codeName" : "CreateDate"
}, },
"getPSDETreeColumn" : { "getPSDETreeColumn" : {
"modelref" : true, "modelref" : true,
"id" : "createman" "id" : "createdate"
}, },
"valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true "allowEmpty" : true
} ], }, {
"getPSDETreeNodeDataItems" : [ {
"cLConvertMode" : "NONE", "cLConvertMode" : "NONE",
"dataType" : 25, "codeName" : "icon",
"defaultValue" : "无图标（表格列）", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "icon",
"enableCond" : 3,
"ignoreInput" : 0,
"name" : "icon", "name" : "icon",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "ICON", "name" : "ICON",
...@@ -534,23 +501,15 @@ ...@@ -534,23 +501,15 @@
"getPSDETreeColumn" : { "getPSDETreeColumn" : {
"modelref" : true, "modelref" : true,
"id" : "pic" "id" : "pic"
}
}, {
"cLConvertMode" : "NONE",
"dataType" : 25,
"format" : "YYYY-MM-DD",
"name" : "createdate",
"getPSAppDEField" : {
"name" : "CREATEDATE",
"codeName" : "CreateDate"
}, },
"getPSDETreeColumn" : { "allowEmpty" : true
"modelref" : true,
"id" : "createdate"
}
}, { }, {
"cLConvertMode" : "NONE", "cLConvertMode" : "NONE",
"dataType" : 25, "codeName" : "fileid",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "fileid",
"enableCond" : 3,
"ignoreInput" : 0,
"name" : "fileid", "name" : "fileid",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "FILEID", "name" : "FILEID",
...@@ -559,6 +518,24 @@ ...@@ -559,6 +518,24 @@
"getPSDETreeColumn" : { "getPSDETreeColumn" : {
"modelref" : true, "modelref" : true,
"id" : "uuid" "id" : "uuid"
},
"allowEmpty" : true
} ],
"getPSDETreeNodeDataItems" : [ {
"cLConvertMode" : "BACKEND",
"dataType" : 25,
"name" : "createman",
"getPSAppDEField" : {
"name" : "CREATEMAN",
"codeName" : "CreateMan"
},
"getPSCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
},
"getPSDETreeColumn" : {
"modelref" : true,
"id" : "createman"
} }
}, { }, {
"cLConvertMode" : "FRONT", "cLConvertMode" : "FRONT",
...@@ -577,20 +554,42 @@ ...@@ -577,20 +554,42 @@
"id" : "name" "id" : "name"
} }
}, { }, {
"cLConvertMode" : "BACKEND", "cLConvertMode" : "NONE",
"dataType" : 25, "dataType" : 25,
"name" : "createman", "format" : "YYYY-MM-DD",
"name" : "createdate",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "CREATEMAN", "name" : "CREATEDATE",
"codeName" : "CreateMan" "codeName" : "CreateDate"
}, },
"getPSCodeList" : { "getPSDETreeColumn" : {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json" "id" : "createdate"
}
}, {
"cLConvertMode" : "NONE",
"dataType" : 25,
"defaultValue" : "无图标（表格列）",
"name" : "icon",
"getPSAppDEField" : {
"name" : "ICON",
"codeName" : "ICON"
}, },
"getPSDETreeColumn" : { "getPSDETreeColumn" : {
"modelref" : true, "modelref" : true,
"id" : "createman" "id" : "pic"
}
}, {
"cLConvertMode" : "NONE",
"dataType" : 25,
"name" : "fileid",
"getPSAppDEField" : {
"name" : "FILEID",
"codeName" : "FILEId"
},
"getPSDETreeColumn" : {
"modelref" : true,
"id" : "uuid"
} }
} ], } ],
"getPSDETreeNodeEditItems" : [ { "getPSDETreeNodeEditItems" : [ {
...@@ -683,23 +682,6 @@ ...@@ -683,23 +682,6 @@
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE.json"
}, },
"getPSDETreeNodeColumns" : [ { "getPSDETreeNodeColumns" : [ {
"cLConvertMode" : "NONE",
"codeName" : "icon",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "icon",
"enableCond" : 3,
"ignoreInput" : 0,
"name" : "icon",
"getPSAppDEField" : {
"name" : "ICON",
"codeName" : "ICON"
},
"getPSDETreeColumn" : {
"modelref" : true,
"id" : "pic"
},
"allowEmpty" : true
}, {
"cLConvertMode" : "NONE", "cLConvertMode" : "NONE",
"codeName" : "fileid", "codeName" : "fileid",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
...@@ -739,6 +721,23 @@ ...@@ -739,6 +721,23 @@
}, },
"allowEmpty" : true, "allowEmpty" : true,
"enableRowEdit" : true "enableRowEdit" : true
}, {
"cLConvertMode" : "NONE",
"codeName" : "icon",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "icon",
"enableCond" : 3,
"ignoreInput" : 0,
"name" : "icon",
"getPSAppDEField" : {
"name" : "ICON",
"codeName" : "ICON"
},
"getPSDETreeColumn" : {
"modelref" : true,
"id" : "pic"
},
"allowEmpty" : true
}, { }, {
"cLConvertMode" : "NONE", "cLConvertMode" : "NONE",
"codeName" : "createdate", "codeName" : "createdate",
...@@ -782,15 +781,10 @@ ...@@ -782,15 +781,10 @@
"getPSDETreeNodeDataItems" : [ { "getPSDETreeNodeDataItems" : [ {
"cLConvertMode" : "NONE", "cLConvertMode" : "NONE",
"dataType" : 25, "dataType" : 25,
"defaultValue" : "无图标（节点数据项）", "name" : "filetype",
"name" : "icon",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "ICON", "name" : "TYPE",
"codeName" : "ICON" "codeName" : "TYPE"
},
"getPSDETreeColumn" : {
"modelref" : true,
"id" : "pic"
} }
}, { }, {
"cLConvertMode" : "NONE", "cLConvertMode" : "NONE",
...@@ -816,6 +810,19 @@ ...@@ -816,6 +810,19 @@
"modelref" : true, "modelref" : true,
"id" : "name" "id" : "name"
} }
}, {
"cLConvertMode" : "NONE",
"dataType" : 25,
"defaultValue" : "无图标（节点数据项）",
"name" : "icon",
"getPSAppDEField" : {
"name" : "ICON",
"codeName" : "ICON"
},
"getPSDETreeColumn" : {
"modelref" : true,
"id" : "pic"
}
}, { }, {
"cLConvertMode" : "NONE", "cLConvertMode" : "NONE",
"dataType" : 25, "dataType" : 25,
...@@ -845,14 +852,6 @@ ...@@ -845,14 +852,6 @@
"modelref" : true, "modelref" : true,
"id" : "createman" "id" : "createman"
} }
}, {
"cLConvertMode" : "NONE",
"dataType" : 25,
"name" : "filetype",
"getPSAppDEField" : {
"name" : "TYPE",
"codeName" : "TYPE"
}
} ], } ],
"getPSDETreeNodeEditItems" : [ { "getPSDETreeNodeEditItems" : [ {
"codeName" : "filename", "codeName" : "filename",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ e3849c79
...@@ -12681,16 +12681,16 @@ ...@@ -12681,16 +12681,16 @@
"codeName" : "VMGroup2", "codeName" : "VMGroup2",
"name" : "视图消息组2", "name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息2", "name" : "视图消息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg3" "id" : "ViewMsg2"
} }
}, { }, {
"name" : "视图消息", "name" : "视图消息2",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg2" "id" : "ViewMsg3"
} }
} ] } ]
}, { }, {
...@@ -12719,16 +12719,16 @@ ...@@ -12719,16 +12719,16 @@
"codeName" : "VMGroup3", "codeName" : "VMGroup3",
"name" : "视图消息类型测试", "name" : "视图消息类型测试",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "消息类型-警告信息", "name" : "消息类型-错误信息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg5" "id" : "ViewMsg6"
} }
}, { }, {
"name" : "消息类型-错误信息", "name" : "消息类型-警告信息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg6" "id" : "ViewMsg5"
} }
}, { }, {
"name" : "消息类型-常规信息", "name" : "消息类型-常规信息",
...@@ -12751,10 +12751,10 @@ ...@@ -12751,10 +12751,10 @@
"codeName" : "VMGroup4", "codeName" : "VMGroup4",
"name" : "视图消息位置测试", "name" : "视图消息位置测试",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-视图上方", "name" : "消息位置-视图下方",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg7" "id" : "ViewMsg8"
} }
}, { }, {
"name" : "消息位置-弹出", "name" : "消息位置-弹出",
...@@ -12763,40 +12763,39 @@ ...@@ -12763,40 +12763,39 @@
"id" : "ViewMsg10" "id" : "ViewMsg10"
} }
}, { }, {
"name" : "消息位置-视图下方", "name" : "消息位置-视图内容区",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg8" "id" : "ViewMsg9"
} }
}, { }, {
"name" : "消息位置-视图内容区", "name" : "消息位置-视图上方",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg9" "id" : "ViewMsg7"
} }
} ] } ]
}, { }, {
"codeName" : "VMGroup8", "codeName" : "VMGroup8",
"name" : "【静态测试】", "name" : "【静态测试】",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-视图下方", "name" : "关闭模式-默认删除-上方-错误",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg8" "id" : "ViewMsg12"
} }
}, { }, {
"name" : "关闭模式-本次删除-上方-警告", "name" : "消息位置-视图内容区",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg13" "id" : "ViewMsg9"
} }
}, { }, {
"name" : "消息类型-警告信息", "name" : "关闭模式-本次删除-上方-警告",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg5" "id" : "ViewMsg13"
}, }
"position" : "POPUP"
}, { }, {
"name" : "消息类型-错误信息", "name" : "消息类型-错误信息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
...@@ -12804,6 +12803,12 @@ ...@@ -12804,6 +12803,12 @@
"id" : "ViewMsg6" "id" : "ViewMsg6"
}, },
"position" : "POPUP" "position" : "POPUP"
}, {
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg8"
}
}, { }, {
"name" : "关闭模式-无删除-上方-常规", "name" : "关闭模式-无删除-上方-常规",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
...@@ -12818,26 +12823,21 @@ ...@@ -12818,26 +12823,21 @@
}, },
"position" : "POPUP" "position" : "POPUP"
}, { }, {
"name" : "关闭模式-默认删除-上方-错误", "name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
}
}, {
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg9" "id" : "ViewMsg5"
} },
"position" : "POPUP"
} ] } ]
}, { }, {
"codeName" : "VMGroup5", "codeName" : "VMGroup5",
"name" : "视图消息关闭模式", "name" : "视图消息关闭模式",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "关闭模式-默认删除", "name" : "关闭模式-本次删除",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg12" "id" : "ViewMsg13"
} }
}, { }, {
"name" : "关闭模式-无删除", "name" : "关闭模式-无删除",
...@@ -12846,26 +12846,26 @@ ...@@ -12846,26 +12846,26 @@
"id" : "ViewMsg11" "id" : "ViewMsg11"
} }
}, { }, {
"name" : "关闭模式-本次删除", "name" : "关闭模式-默认删除",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg13" "id" : "ViewMsg12"
} }
} ] } ]
}, { }, {
"codeName" : "VMGroup6", "codeName" : "VMGroup6",
"name" : "视图消息动态模式测试", "name" : "视图消息动态模式测试",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "动态模式-静态内容", "name" : "动态模式-实体数据集",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg15" "id" : "ViewMsg14"
} }
}, { }, {
"name" : "动态模式-实体数据集", "name" : "动态模式-静态内容",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg14" "id" : "ViewMsg15"
} }
} ] } ]
} ], } ],
trainsys-provider/pom.xml
浏览文件 @ e3849c79
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<profiles> <profiles>
<profile> <profile>
<id>trainsys</id> <id>runtime</id>
<build> <build>
<resources> <resources>
<resource> <resource>
......
trainsys-provider/src/main/docker/Dockerfile
浏览文件 @ e3849c79
...@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \ ...@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \ sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /trainsys-provider.jar java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /trainsys-provider.jar
EXPOSE 50000 EXPOSE 8081
ADD trainsys-provider.jar /trainsys-provider.jar ADD trainsys-provider.jar /trainsys-provider.jar
trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
浏览文件 @ e3849c79
...@@ -22,32 +22,7 @@ spec: ...@@ -22,32 +22,7 @@ spec:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 50000 - containerPort: 8081
env:
- name: SPRING_CLOUD_NACOS_DISCOVERY_IP
value: "172.16.240.140"
- name: SERVER_PORT
value: "50000"
- name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
value: "172.16.240.140:8848"
- name: SPRING_REDIS_HOST
value: "127.0.0.1"
- name: SPRING_REDIS_PORT
value: "6379"
- name: SPRING_REDIS_DATABASE
value: "0"
- name: SPRING_DATASOURCE_USERNAME
value: "a_LAB01_d23cc850e"
- name: SPRING_DATASOURCE_PASSWORD
value: "f9Df4556"
- name: SPRING_DATASOURCE_URL
value: "jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8"
- name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
value: "com.mysql.jdbc.Driver"
- name: SPRING_DATASOURCE_DEFAULTSCHEMA
value: "a_LAB01_d23cc850e"
- name: NACOS
value: "172.16.240.140:8848"
--- ---
apiVersion: v1 apiVersion: v1
...@@ -60,9 +35,9 @@ spec: ...@@ -60,9 +35,9 @@ spec:
type: NodePort type: NodePort
ports: ports:
- name: http - name: http
port: 50000 port: 8081
targetPort: 50000 targetPort: 8081
nodePort: 50000 nodePort: 8081
protocol: TCP protocol: TCP
selector: selector:
app: trainsys-provider app: trainsys-provider
......
trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
浏览文件 @ e3849c79
...@@ -3,23 +3,9 @@ services: ...@@ -3,23 +3,9 @@ services:
trainsys-provider: trainsys-provider:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
ports: ports:
- "50000:50000" - "8081:8081"
networks: networks:
- agent_network - agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.140
- SERVER_PORT=50000
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.140:8848
- SPRING_CLOUD_NACOS_CONFIG_SERVER-ADDR=172.16.240.140:8848
- SPRING_REDIS_HOST=127.0.0.1
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_LAB01_d23cc850e
- SPRING_DATASOURCE_PASSWORD=f9Df4556
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_d23cc850e
- NACOS=172.16.240.140:8848
deploy: deploy:
resources: resources:
limits: limits:
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或