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

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

上级 15a6891f
......@@ -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>
......
......@@ -1398,16 +1398,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"
}
} ]
}, {
......
......@@ -84,6 +84,33 @@
"selectFirstOnly" : false,
"selected" : false,
"id" : "ROOT"
}, {
"counterMode" : 0,
"name" : "动态",
"getNavPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ViewMsgViewMsgDataSet.json",
"viewType" : "DEGRIDVIEW"
},
"nodeType" : "node",
"text" : "动态",
"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"
} ],
"getRemovePSControlAction" : {
"modelref" : true,
......
......@@ -7,6 +7,7 @@
"height" : 600,
"mDCtrlActiveMode" : 2,
"name" : "TESTListView",
"openMode" : "POPUPMODAL",
"getPSAppCounterRef" : {
"modelref" : true,
"id" : "57a03eae761cc02c765be88b39d08c17"
......@@ -120,14 +121,6 @@
"id" : "VMGroup"
},
"getPSAppViewRefs" : [ {
"name" : "EDITDATA",
"realTitle" : "测试实体编辑视图",
"getRefPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView.json",
"viewType" : "DEEDITVIEW"
}
}, {
"name" : "NEWDATA",
"realTitle" : "测试表格导航",
"getRefPSAppView" : {
......@@ -135,6 +128,14 @@
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGridExpView.json",
"viewType" : "DEGRIDEXPVIEW"
}
}, {
"name" : "EDITDATA",
"realTitle" : "测试实体编辑视图",
"getRefPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView.json",
"viewType" : "DEEDITVIEW"
}
} ],
"getPSControls" : [ {
"codeName" : "Default",
......
......@@ -27,6 +27,7 @@
},
"getPSAppViewRefs" : [ {
"name" : "EXPITEM:tabviewpanel",
"realOpenMode" : "POPUPMODAL",
"realTitle" : "测试实体列表视图",
"getRefPSAppView" : {
"modelref" : true,
......@@ -66,6 +67,7 @@
"height" : 600,
"mDCtrlActiveMode" : 2,
"name" : "TESTListView",
"openMode" : "POPUPMODAL",
"getPSAppCounterRef" : {
"modelref" : true,
"id" : "57a03eae761cc02c765be88b39d08c17"
......@@ -179,14 +181,6 @@
"id" : "VMGroup"
},
"getPSAppViewRefs" : [ {
"name" : "EDITDATA",
"realTitle" : "测试实体编辑视图",
"getRefPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView.json",
"viewType" : "DEEDITVIEW"
}
}, {
"name" : "NEWDATA",
"realTitle" : "测试表格导航",
"getRefPSAppView" : {
......@@ -194,6 +188,14 @@
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGridExpView.json",
"viewType" : "DEGRIDEXPVIEW"
}
}, {
"name" : "EDITDATA",
"realTitle" : "测试实体编辑视图",
"getRefPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView.json",
"viewType" : "DEEDITVIEW"
}
} ],
"getPSControls" : [ {
"codeName" : "Default",
......
......@@ -27,6 +27,7 @@
},
"getPSAppViewRefs" : [ {
"name" : "EXPITEM:tabviewpanel",
"realOpenMode" : "POPUPMODAL",
"realTitle" : "测试实体列表视图",
"getRefPSAppView" : {
"modelref" : true,
......@@ -66,6 +67,7 @@
"height" : 600,
"mDCtrlActiveMode" : 2,
"name" : "TESTListView",
"openMode" : "POPUPMODAL",
"getPSAppCounterRef" : {
"modelref" : true,
"id" : "57a03eae761cc02c765be88b39d08c17"
......@@ -179,14 +181,6 @@
"id" : "VMGroup"
},
"getPSAppViewRefs" : [ {
"name" : "EDITDATA",
"realTitle" : "测试实体编辑视图",
"getRefPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView.json",
"viewType" : "DEEDITVIEW"
}
}, {
"name" : "NEWDATA",
"realTitle" : "测试表格导航",
"getRefPSAppView" : {
......@@ -194,6 +188,14 @@
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGridExpView.json",
"viewType" : "DEGRIDEXPVIEW"
}
}, {
"name" : "EDITDATA",
"realTitle" : "测试实体编辑视图",
"getRefPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView.json",
"viewType" : "DEEDITVIEW"
}
} ],
"getPSControls" : [ {
"codeName" : "Default",
......
......@@ -27,6 +27,7 @@
},
"getPSAppViewRefs" : [ {
"name" : "EXPITEM:tabviewpanel",
"realOpenMode" : "POPUPMODAL",
"realTitle" : "测试实体列表视图",
"getRefPSAppView" : {
"modelref" : true,
......@@ -66,6 +67,7 @@
"height" : 600,
"mDCtrlActiveMode" : 2,
"name" : "TESTListView",
"openMode" : "POPUPMODAL",
"getPSAppCounterRef" : {
"modelref" : true,
"id" : "57a03eae761cc02c765be88b39d08c17"
......@@ -179,14 +181,6 @@
"id" : "VMGroup"
},
"getPSAppViewRefs" : [ {
"name" : "EDITDATA",
"realTitle" : "测试实体编辑视图",
"getRefPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView.json",
"viewType" : "DEEDITVIEW"
}
}, {
"name" : "NEWDATA",
"realTitle" : "测试表格导航",
"getRefPSAppView" : {
......@@ -194,6 +188,14 @@
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGridExpView.json",
"viewType" : "DEGRIDEXPVIEW"
}
}, {
"name" : "EDITDATA",
"realTitle" : "测试实体编辑视图",
"getRefPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView.json",
"viewType" : "DEEDITVIEW"
}
} ],
"getPSControls" : [ {
"codeName" : "Default",
......
......@@ -27,6 +27,7 @@
},
"getPSAppViewRefs" : [ {
"name" : "EXPITEM:tabviewpanel",
"realOpenMode" : "POPUPMODAL",
"realTitle" : "测试实体列表视图",
"getRefPSAppView" : {
"modelref" : true,
......@@ -66,6 +67,7 @@
"height" : 600,
"mDCtrlActiveMode" : 2,
"name" : "TESTListView",
"openMode" : "POPUPMODAL",
"getPSAppCounterRef" : {
"modelref" : true,
"id" : "57a03eae761cc02c765be88b39d08c17"
......@@ -179,14 +181,6 @@
"id" : "VMGroup"
},
"getPSAppViewRefs" : [ {
"name" : "EDITDATA",
"realTitle" : "测试实体编辑视图",
"getRefPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView.json",
"viewType" : "DEEDITVIEW"
}
}, {
"name" : "NEWDATA",
"realTitle" : "测试表格导航",
"getRefPSAppView" : {
......@@ -194,6 +188,14 @@
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGridExpView.json",
"viewType" : "DEGRIDEXPVIEW"
}
}, {
"name" : "EDITDATA",
"realTitle" : "测试实体编辑视图",
"getRefPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView.json",
"viewType" : "DEEDITVIEW"
}
} ],
"getPSControls" : [ {
"codeName" : "Default",
......
......@@ -1271,7 +1271,6 @@
"layoutPanel" : true,
"useDefaultLayout" : true
},
"refFlag" : false,
"title" : "视图消息编辑视图",
"getTitlePSLanguageRes" : {
"defaultContent" : "视图消息编辑视图",
......
......@@ -86,7 +86,6 @@
"viewType" : "DEEDITVIEW"
}
} ],
"refFlag" : false,
"title" : "视图消息数据重定向视图",
"getTitlePSLanguageRes" : {
"defaultContent" : "视图消息数据重定向视图",
......
......@@ -56,6 +56,15 @@
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/ViewMsg.json"
},
"getPSAppViewRefs" : [ {
"name" : "EXPITEM:node",
"realTitle" : "视图消息动态",
"getRefPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ViewMsgViewMsgDataSet.json",
"viewType" : "DEGRIDVIEW"
}
} ],
"getPSControlHandler" : {
"enableDEFieldPrivilege" : false,
"id" : "treeexpbar"
......@@ -221,6 +230,33 @@
"selectFirstOnly" : false,
"selected" : false,
"id" : "ROOT"
}, {
"counterMode" : 0,
"name" : "动态",
"getNavPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ViewMsgViewMsgDataSet.json",
"viewType" : "DEGRIDVIEW"
},
"nodeType" : "node",
"text" : "动态",
"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"
} ],
"getRemovePSControlAction" : {
"modelref" : true,
......@@ -319,7 +355,6 @@
"layoutPanel" : true,
"useDefaultLayout" : true
},
"refFlag" : false,
"title" : "视图消息测试",
"viewStyle" : "DEFAULT",
"viewType" : "DETREEEXPVIEW",
......
......@@ -17,6 +17,28 @@
"logicName" : "应用测试首页视图默认菜单",
"name" : "appmenu",
"getPSAppMenuItems" : [ {
"accUserMode" : 2,
"caption" : "视图消息",
"itemType" : "MENUITEM",
"name" : "menuitem43",
"getPSAppFunc" : {
"modelref" : true,
"id" : "UsrAppFunc0920171834"
},
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"tooltip" : "视图消息"
}, {
"accUserMode" : 0,
"caption" : "视图布局",
"itemType" : "MENUITEM",
......
......@@ -4,6 +4,16 @@
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPMENUS/AppTestIndexView.json",
"logicName" : "应用测试首页视图默认菜单",
"getPSAppMenuItems" : [ {
"accUserMode" : 2,
"caption" : "视图消息",
"itemType" : "MENUITEM",
"name" : "menuitem43",
"getPSAppFunc" : {
"modelref" : true,
"id" : "UsrAppFunc0920171834"
},
"tooltip" : "视图消息"
}, {
"accUserMode" : 0,
"caption" : "视图布局",
"itemType" : "MENUITEM",
......
......@@ -665,6 +665,7 @@
},
"getPSAppViewRefs" : [ {
"name" : "EXPITEM:tabviewpanel",
"realOpenMode" : "POPUPMODAL",
"realTitle" : "测试实体列表视图",
"getRefPSAppView" : {
"modelref" : true,
......@@ -1127,6 +1128,7 @@
},
"getPSAppViewRefs" : [ {
"name" : "EXPITEM:tabviewpanel",
"realOpenMode" : "POPUPMODAL",
"realTitle" : "测试实体列表视图",
"getRefPSAppView" : {
"modelref" : true,
......@@ -1332,6 +1334,7 @@
},
"getPSAppViewRefs" : [ {
"name" : "EXPITEM:tabviewpanel",
"realOpenMode" : "POPUPMODAL",
"realTitle" : "测试实体列表视图",
"getRefPSAppView" : {
"modelref" : true,
......@@ -1480,6 +1483,7 @@
},
"getPSAppViewRefs" : [ {
"name" : "EXPITEM:tabviewpanel",
"realOpenMode" : "POPUPMODAL",
"realTitle" : "测试实体列表视图",
"getRefPSAppView" : {
"modelref" : true,
......
......@@ -3289,6 +3289,16 @@
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXDMXGridView9.json",
"viewType" : "DEGRIDVIEW9"
}
}, {
"appFuncType" : "APPVIEW",
"codeName" : "UsrAppFunc0920171834",
"name" : "视图消息测试",
"openMode" : "INDEXVIEWTAB",
"getPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ViewMsgViewMsgTest.json",
"viewType" : "DETREEEXPVIEW"
}
}, {
"appFuncType" : "APPVIEW",
"codeName" : "AppFunc31",
......@@ -9088,16 +9098,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"
}
} ]
}, {
......@@ -9137,6 +9147,12 @@
"codeName" : "VMGroup4",
"name" : "视图消息位置测试",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-视图上方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg7"
}
}, {
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
......@@ -9154,12 +9170,6 @@
"modelref" : true,
"id" : "ViewMsg9"
}
}, {
"name" : "消息位置-视图上方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg7"
}
} ]
}, {
"codeName" : "VMGroup5",
......@@ -9187,16 +9197,16 @@
"codeName" : "VMGroup6",
"name" : "视图消息动态模式测试",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "动态模式-静态内容",
"name" : "动态模式-实体数据集",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg15"
"id" : "ViewMsg14"
}
}, {
"name" : "动态模式-实体数据集",
"name" : "动态模式-静态内容",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg14"
"id" : "ViewMsg15"
}
} ]
} ],
......@@ -9217,24 +9227,26 @@
"enableRemove" : false
}, {
"codeName" : "ViewMsg11",
"message" : "关闭模式-无删除",
"message" : "关闭模式-无删除-上方-常规",
"messageType" : "INFO",
"name" : "关闭模式-无删除",
"name" : "关闭模式-无删除-上方-常规",
"position" : "TOP",
"removeMode" : 0,
"enableRemove" : false
}, {
"codeName" : "ViewMsg12",
"message" : "关闭模式-默认删除",
"name" : "关闭模式-默认删除",
"message" : "关闭模式-默认删除-上方-错误",
"messageType" : "ERROR",
"name" : "关闭模式-默认删除-上方-错误",
"position" : "TOP",
"removeMode" : 1,
"enableRemove" : true
}, {
"codeName" : "ViewMsg13",
"message" : "关闭模式-本次删除",
"name" : "关闭模式-本次删除",
"position" : "BODY",
"message" : "关闭模式-本次删除-上方-警告",
"messageType" : "WARN",
"name" : "关闭模式-本次删除-上方-警告",
"position" : "TOP",
"removeMode" : 2,
"enableRemove" : true
}, {
......@@ -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 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册