提交 92b8d274 编写于 作者: ibizdev's avatar ibizdev

zhanghengfeng 发布系统代码 [TrainSys,网页端]

上级 e9a2c99d
......@@ -55,12 +55,6 @@
git clone -b master $para2 trainsys/
export NODE_OPTIONS=--max-old-space-size=4096
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>
</hudson.tasks.Shell>
</builders>
......
......@@ -1495,16 +1495,16 @@
"codeName" : "VMGroup2",
"name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息2",
"name" : "视图消息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg3"
"id" : "ViewMsg2"
}
}, {
"name" : "视图消息",
"name" : "视图消息2",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg2"
"id" : "ViewMsg3"
}
} ]
}, {
......
......@@ -353,7 +353,6 @@
"layoutPanel" : true,
"useDefaultLayout" : true
},
"refFlag" : false,
"title" : "甘特图测试",
"viewStyle" : "DEFAULT",
"viewType" : "DEGANTTVIEW",
......
......@@ -3489,6 +3489,28 @@
"layout" : "TABLE_24COL"
},
"tooltip" : "甘特图测试"
}, {
"accUserMode" : 2,
"caption" : "甘特图",
"itemType" : "MENUITEM",
"name" : "menuitem161",
"getPSAppFunc" : {
"modelref" : true,
"id" : "UsrAppFunc1206589718"
},
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"tooltip" : "甘特图"
} ],
"getPSControlHandler" : {
"enableDEFieldPrivilege" : false,
......
......@@ -1545,6 +1545,16 @@
"id" : "UsrAppFunc1206524540"
},
"tooltip" : "甘特图测试"
}, {
"accUserMode" : 2,
"caption" : "甘特图",
"itemType" : "MENUITEM",
"name" : "menuitem161",
"getPSAppFunc" : {
"modelref" : true,
"id" : "UsrAppFunc1206589718"
},
"tooltip" : "甘特图"
} ],
"enableCustomize" : false,
"name" : "appindex",
......
......@@ -11499,16 +11499,16 @@
"codeName" : "VMGroup2",
"name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息2",
"name" : "视图消息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg3"
"id" : "ViewMsg2"
}
}, {
"name" : "视图消息",
"name" : "视图消息2",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg2"
"id" : "ViewMsg3"
}
} ]
}, {
......@@ -11569,6 +11569,12 @@
"codeName" : "VMGroup4",
"name" : "视图消息位置测试",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
}
}, {
"name" : "消息位置-视图上方",
"getPSAppViewMsg" : {
"modelref" : true,
......@@ -11586,28 +11592,30 @@
"modelref" : true,
"id" : "ViewMsg10"
}
}, {
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
}
} ]
}, {
"codeName" : "VMGroup8",
"name" : "【静态测试】",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-视图下方",
"name" : "关闭模式-无删除-上方-常规",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg8"
"id" : "ViewMsg11"
}
}, {
"name" : "关闭模式-默认删除-上方-错误",
"name" : "消息类型-常规信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
}
"id" : "ViewMsg4"
},
"position" : "POPUP"
}, {
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
},
"position" : "POPUP"
}, {
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
......@@ -11615,12 +11623,11 @@
"id" : "ViewMsg9"
}
}, {
"name" : "消息类型-警告信息",
"name" : "关闭模式-默认删除-上方-错误",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
},
"position" : "POPUP"
"id" : "ViewMsg12"
}
}, {
"name" : "关闭模式-本次删除-上方-警告",
"getPSAppViewMsg" : {
......@@ -11635,39 +11642,32 @@
},
"position" : "POPUP"
}, {
"name" : "关闭模式-无删除-上方-常规",
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg11"
"id" : "ViewMsg8"
}
}, {
"name" : "消息类型-常规信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg4"
},
"position" : "POPUP"
} ]
}, {
"codeName" : "VMGroup5",
"name" : "视图消息关闭模式",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "关闭模式-本次删除",
"name" : "关闭模式-默认删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg13"
"id" : "ViewMsg12"
}
}, {
"name" : "关闭模式-删除",
"name" : "关闭模式-本次删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg11"
"id" : "ViewMsg13"
}
}, {
"name" : "关闭模式-默认删除",
"name" : "关闭模式-删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
"id" : "ViewMsg11"
}
} ]
}, {
......@@ -17855,6 +17855,28 @@
"layout" : "TABLE_24COL"
},
"tooltip" : "甘特图测试"
}, {
"accUserMode" : 2,
"caption" : "甘特图",
"itemType" : "MENUITEM",
"name" : "menuitem161",
"getPSAppFunc" : {
"modelref" : true,
"id" : "UsrAppFunc1206589718"
},
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"tooltip" : "甘特图"
} ],
"getPSControlHandler" : {
"enableDEFieldPrivilege" : false,
......@@ -42649,6 +42671,370 @@
"enableSearch" : true,
"modelid" : "a5e9d0e08e85d0275ce0c854bd9ec9d5",
"modeltype" : "PSAPPDEVIEW"
}, {
"accUserMode" : 2,
"caption" : "书",
"codeName" : "bookGanttTestView",
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookGanttTestView.json",
"mDCtrlActiveMode" : 2,
"name" : "bookGanttTestView",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
},
"getPSAppModule" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPMODULES/Ungroup.json"
},
"getPSControls" : [ {
"beginDataItemName" : "begin",
"codeName" : "GanttTestView_Gantt",
"controlType" : "GANTT",
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSGANTTS/GanttTestView_Gantt.json",
"endDataItemName" : "end",
"finishDataItemName" : "finish",
"logicName" : "甘特图测试_甘特部件",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
},
"getPSControlHandler" : {
"enableDEFieldPrivilege" : false,
"id" : "gantt"
},
"getPSControlParam" : {
"autoLoad" : true,
"showBusyIndicator" : true,
"id" : "GANTT"
},
"getPSDETreeNodeRSs" : [ {
"getChildPSDETreeNode" : {
"modelref" : true,
"id" : "node"
},
"name" : "默认根节点 - 一级测试节点1",
"getParentPSDETreeNode" : {
"modelref" : true,
"id" : "ROOT"
},
"parentValueLevel" : 1,
"searchMode" : 3
}, {
"getChildPSDETreeNode" : {
"modelref" : true,
"id" : "node_2"
},
"name" : "一级测试节点1 - 二级节点1",
"getParentPSDETreeNode" : {
"modelref" : true,
"id" : "node"
},
"parentValueLevel" : 1,
"searchMode" : 3
}, {
"getChildPSDETreeNode" : {
"modelref" : true,
"id" : "node_4"
},
"name" : "一级测试节点2 - 二级测试节点3",
"getParentPSDETreeNode" : {
"modelref" : true,
"id" : "node_1"
},
"parentValueLevel" : 1,
"searchMode" : 3
}, {
"getChildPSDETreeNode" : {
"modelref" : true,
"id" : "node_1"
},
"name" : "默认根节点 - 一级测试节点2",
"getParentPSDETreeNode" : {
"modelref" : true,
"id" : "ROOT"
},
"parentValueLevel" : 1,
"searchMode" : 3
}, {
"getChildPSDETreeNode" : {
"modelref" : true,
"id" : "node_3"
},
"name" : "一级测试节点1 - 二级检点2",
"getParentPSDETreeNode" : {
"modelref" : true,
"id" : "node"
},
"parentValueLevel" : 1,
"searchMode" : 3
}, {
"getChildPSDETreeNode" : {
"modelref" : true,
"id" : "node_5"
},
"name" : "一级测试节点2 - 二级测试节点4",
"getParentPSDETreeNode" : {
"modelref" : true,
"id" : "node_1"
},
"parentValueLevel" : 1,
"searchMode" : 3
} ],
"getPSDETreeNodes" : [ {
"counterMode" : 0,
"name" : "默认根节点",
"nodeType" : "ROOT",
"nodeValue" : "root",
"text" : "默认根节点",
"treeNodeType" : "STATIC",
"hasPSDETreeNodeRSs" : true,
"appendPNodeId" : false,
"disableSelect" : false,
"enableCheck" : false,
"enableEditData" : false,
"enableNewData" : false,
"enableQuickCreate" : false,
"enableQuickSearch" : false,
"enableRemoveData" : false,
"enableViewData" : false,
"expandFirstOnly" : false,
"expanded" : false,
"rootNode" : true,
"selectFirstOnly" : false,
"selected" : false,
"id" : "ROOT"
}, {
"counterMode" : 0,
"name" : "一级测试节点1",
"nodeType" : "node",
"text" : "一级测试节点1",
"treeNodeType" : "STATIC",
"hasPSDETreeNodeRSs" : true,
"appendPNodeId" : false,
"disableSelect" : false,
"enableCheck" : false,
"enableEditData" : false,
"enableNewData" : false,
"enableQuickCreate" : false,
"enableQuickSearch" : false,
"enableRemoveData" : false,
"enableViewData" : false,
"expandFirstOnly" : false,
"expanded" : false,
"rootNode" : false,
"selectFirstOnly" : false,
"selected" : false,
"id" : "node"
}, {
"counterMode" : 0,
"name" : "一级测试节点2",
"nodeType" : "node_1",
"text" : "一级测试节点2",
"treeNodeType" : "STATIC",
"hasPSDETreeNodeRSs" : true,
"appendPNodeId" : false,
"disableSelect" : false,
"enableCheck" : false,
"enableEditData" : false,
"enableNewData" : false,
"enableQuickCreate" : false,
"enableQuickSearch" : false,
"enableRemoveData" : false,
"enableViewData" : false,
"expandFirstOnly" : false,
"expanded" : false,
"rootNode" : false,
"selectFirstOnly" : false,
"selected" : false,
"id" : "node_1"
}, {
"counterMode" : 0,
"name" : "二级测试节点1",
"nodeType" : "node_2",
"getPSCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/FileType.json"
},
"treeNodeType" : "CODELIST",
"hasPSDETreeNodeRSs" : false,
"appendCaption" : false,
"appendPNodeId" : false,
"disableSelect" : false,
"enableCheck" : false,
"enableEditData" : false,
"enableNewData" : false,
"enableQuickCreate" : false,
"enableQuickSearch" : false,
"enableRemoveData" : false,
"enableViewData" : false,
"expandFirstOnly" : false,
"expanded" : false,
"rootNode" : false,
"selectFirstOnly" : false,
"selected" : false,
"id" : "node_2"
}, {
"counterMode" : 0,
"getIdPSAppDEField" : {
"name" : "BOOKID",
"codeName" : "BookId"
},
"maxSize" : -1,
"name" : "二级测试节点2",
"nodeType" : "node_3",
"getPSAppDEDataSet" : {
"modelref" : true,
"id" : "FetchDefault"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
},
"getTextPSAppDEField" : {
"name" : "BOOKNAME",
"codeName" : "BookName"
},
"treeNodeType" : "DE",
"hasPSDETreeNodeRSs" : false,
"appendPNodeId" : false,
"disableSelect" : false,
"enableCheck" : false,
"enableEditData" : false,
"enableNewData" : false,
"enableQuickCreate" : false,
"enableQuickSearch" : false,
"enableRemoveData" : false,
"enableViewData" : false,
"expandFirstOnly" : false,
"expanded" : false,
"rootNode" : false,
"selectFirstOnly" : false,
"selected" : false,
"id" : "node_3"
}, {
"counterMode" : 0,
"name" : "二级测试节点3",
"nodeType" : "node_4",
"text" : "二级测试节点3",
"treeNodeType" : "STATIC",
"hasPSDETreeNodeRSs" : false,
"appendPNodeId" : false,
"disableSelect" : false,
"enableCheck" : false,
"enableEditData" : false,
"enableNewData" : false,
"enableQuickCreate" : false,
"enableQuickSearch" : false,
"enableRemoveData" : false,
"enableViewData" : false,
"expandFirstOnly" : false,
"expanded" : false,
"rootNode" : false,
"selectFirstOnly" : false,
"selected" : false,
"id" : "node_4"
}, {
"counterMode" : 0,
"getIdPSAppDEField" : {
"name" : "TESTID",
"codeName" : "TESTId"
},
"maxSize" : -1,
"name" : "二级测试节点4",
"nodeType" : "node_5",
"getPSAppDEDataSet" : {
"modelref" : true,
"id" : "FetchDefault"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
},
"getTextPSAppDEField" : {
"name" : "TESTNAME",
"codeName" : "TESTName"
},
"treeNodeType" : "DE",
"hasPSDETreeNodeRSs" : false,
"appendPNodeId" : false,
"disableSelect" : false,
"enableCheck" : false,
"enableEditData" : false,
"enableNewData" : false,
"enableQuickCreate" : false,
"enableQuickSearch" : false,
"enableRemoveData" : false,
"enableViewData" : false,
"expandFirstOnly" : false,
"expanded" : false,
"rootNode" : false,
"selectFirstOnly" : false,
"selected" : false,
"id" : "node_5"
} ],
"prevDataItemName" : "prev",
"sNDataItemName" : "sn",
"totalDataItemName" : "total",
"treeGridMode" : 2,
"enableRootSelect" : false,
"outputIconDefault" : true,
"rootVisible" : false,
"name" : "gantt",
"modelid" : "8C3315A2-6284-47C7-808B-F13DDCD7B4F8",
"modeltype" : "PSDEGANTT"
}, {
"controlType" : "SEARCHBAR",
"name" : "searchbar",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
},
"getPSControlParam" : {
"id" : "searchbar"
},
"quickGroupCount" : -1,
"quickSearchMode" : 0,
"quickSearchWidth" : 0,
"enableFilter" : false,
"enableGroup" : false,
"enableQuickSearch" : false,
"mobileSearchBar" : false
}, {
"caption" : "书",
"codeName" : "GanttTestViewcaptionbar",
"controlType" : "CAPTIONBAR",
"name" : "captionbar",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
},
"getPSControlParam" : { }
} ],
"getPSDEViewCodeName" : "GanttTestView",
"getPSDEViewId" : "FC09487C-C4B6-4979-867C-8F23B29499B9",
"getPSViewLayoutPanel" : {
"codeName" : "Layoutpanel",
"controlStyle" : "APPDEGANTTVIEW",
"controlType" : "VIEWLAYOUTPANEL",
"name" : "layoutpanel",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
},
"getPSControlParam" : { },
"layoutBodyOnly" : true,
"layoutPanel" : true,
"useDefaultLayout" : true
},
"title" : "甘特图测试",
"viewStyle" : "DEFAULT",
"viewType" : "DEGANTTVIEW",
"xDataControlName" : "gantt",
"enableDP" : true,
"enableFilter" : true,
"enableSearch" : true,
"modelid" : "d82874c07bb62c6e99ed248b5b32677b",
"modeltype" : "PSAPPDEVIEW"
} ],
"getPSAppDataEntities" : [ {
"getAllPSAppDEACModes" : [ {
......@@ -33,7 +33,7 @@
<profiles>
<profile>
<id>trainsys</id>
<id>runtime</id>
<build>
<resources>
<resource>
......
......@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
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
......@@ -22,32 +22,7 @@ spec:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
imagePullPolicy: Always
ports:
- containerPort: 50000
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"
- containerPort: 8081
---
apiVersion: v1
......@@ -60,9 +35,9 @@ spec:
type: NodePort
ports:
- name: http
port: 50000
targetPort: 50000
nodePort: 50000
port: 8081
targetPort: 8081
nodePort: 8081
protocol: TCP
selector:
app: trainsys-provider
......
......@@ -3,23 +3,9 @@ services:
trainsys-provider:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
ports:
- "50000:50000"
- "8081:8081"
networks:
- 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:
resources:
limits:
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册