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

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

上级 a5419539
...@@ -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>
......
...@@ -48,113 +48,7 @@ ...@@ -48,113 +48,7 @@
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
} }
}, },
"groupLayout" : "ROW", "groupMode" : "NONE",
"groupMode" : "CODELIST",
"getGroupPSAppDEField" : {
"name" : "TYPE",
"codeName" : "Type"
},
"getGroupPSCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/Booktype.json"
},
"getGroupPSUIActionGroup" : {
"name" : "打开多数据表单",
"getPSUIActionGroupDetails" : [ {
"caption" : "打开多数据列表",
"detailType" : "DEUIACTION",
"name" : "u3624d39",
"getPSUIAction" : {
"actionTarget" : "NONE",
"caption" : "打开多数据列表",
"codeName" : "opendsjlb",
"getFrontPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr6EditView.json",
"viewType" : "DEEDITVIEW"
},
"frontProcessType" : "TOP",
"fullCodeName" : "Book_opendsjlb",
"name" : "打开多数据列表",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
},
"timeout" : 60000,
"uIActionMode" : "FRONT",
"uIActionTag" : "opendsjlb",
"uIActionType" : "DEUIACTION",
"id" : "opendsjlb@Book"
},
"addSeparator" : false,
"showCaption" : true,
"showIcon" : true
}, {
"caption" : "打开多数据卡片",
"detailType" : "DEUIACTION",
"name" : "u7820387",
"getPSUIAction" : {
"actionTarget" : "NONE",
"caption" : "打开多数据卡片",
"codeName" : "dkdsjkp",
"getFrontPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr7EditView.json",
"viewType" : "DEEDITVIEW"
},
"frontProcessType" : "TOP",
"fullCodeName" : "Book_dkdsjkp",
"name" : "打开多数据卡片",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Update"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
},
"timeout" : 60000,
"uIActionMode" : "BACKEND",
"uIActionTag" : "dkdsjkp",
"uIActionType" : "DEUIACTION",
"enableConfirm" : true,
"showBusyIndicator" : false,
"id" : "dkdsjkp@Book"
},
"addSeparator" : false,
"showCaption" : true,
"showIcon" : true
}, {
"caption" : "打开多数据表单",
"detailType" : "DEUIACTION",
"name" : "u7d41599",
"getPSUIAction" : {
"actionTarget" : "SINGLEKEY",
"caption" : "打开多数据表单",
"codeName" : "opendsjbd",
"getFrontPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr5EditView.json",
"viewType" : "DEEDITVIEW"
},
"frontProcessType" : "TOP",
"fullCodeName" : "Book_opendsjbd",
"name" : "打开多数据表单",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
},
"timeout" : 60000,
"uIActionMode" : "FRONT",
"uIActionTag" : "opendsjbd",
"uIActionType" : "DEUIACTION",
"id" : "opendsjbd@Book"
},
"addSeparator" : false,
"showCaption" : true,
"showIcon" : true
} ]
},
"getItemPSLayoutPanel" : { "getItemPSLayoutPanel" : {
"getAllPSPanelFields" : [ { "getAllPSPanelFields" : [ {
"id" : "field_text_dynamic", "id" : "field_text_dynamic",
...@@ -236,15 +130,15 @@ ...@@ -236,15 +130,15 @@
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
}, },
"getPSDEDataViewDataItems" : [ { "getPSDEDataViewDataItems" : [ {
"dataType" : 25,
"name" : "bookname"
}, {
"dataType" : 25, "dataType" : 25,
"getFrontPSCodeList" : { "getFrontPSCodeList" : {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList44.json" "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList44.json"
}, },
"name" : "type" "name" : "type"
}, {
"dataType" : 25,
"name" : "bookname"
}, { }, {
"dataType" : 25, "dataType" : 25,
"name" : "srfkey", "name" : "srfkey",
...@@ -275,16 +169,6 @@ ...@@ -275,16 +169,6 @@
} }
} ], } ],
"getPSDEDataViewItems" : [ { "getPSDEDataViewItems" : [ {
"caption" : "书名称",
"dataItemName" : "bookname",
"itemType" : "DATAITEM",
"name" : "BOOKNAME",
"getPSAppDEField" : {
"name" : "BOOKNAME",
"codeName" : "BookName"
},
"enableSort" : true
}, {
"cLConvertMode" : "FRONT", "cLConvertMode" : "FRONT",
"caption" : "类型", "caption" : "类型",
"dataItemName" : "type", "dataItemName" : "type",
...@@ -299,8 +183,18 @@ ...@@ -299,8 +183,18 @@
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList44.json" "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList44.json"
}, },
"enableSort" : true "enableSort" : true
}, {
"caption" : "书名称",
"dataItemName" : "bookname",
"itemType" : "DATAITEM",
"name" : "BOOKNAME",
"getPSAppDEField" : {
"name" : "BOOKNAME",
"codeName" : "BookName"
},
"enableSort" : true
} ], } ],
"pagingSize" : 1000, "pagingSize" : 20,
"getRemovePSControlAction" : { "getRemovePSControlAction" : {
"modelref" : true, "modelref" : true,
"id" : "remove", "id" : "remove",
...@@ -339,8 +233,8 @@ ...@@ -339,8 +233,8 @@
"enableCardEditGroup" : false, "enableCardEditGroup" : false,
"enableCardEditOrder" : false, "enableCardEditOrder" : false,
"enableCardNew" : false, "enableCardNew" : false,
"enableGroup" : true, "enableGroup" : false,
"enablePagingBar" : false, "enablePagingBar" : true,
"noSort" : false, "noSort" : false,
"singleSelect" : false, "singleSelect" : false,
"modelid" : "6A8B1B78-7183-4F70-9801-297C89D9EFAE", "modelid" : "6A8B1B78-7183-4F70-9801-297C89D9EFAE",
......
...@@ -674,113 +674,7 @@ ...@@ -674,113 +674,7 @@
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
} }
}, },
"groupLayout" : "ROW", "groupMode" : "NONE",
"groupMode" : "CODELIST",
"getGroupPSAppDEField" : {
"name" : "TYPE",
"codeName" : "Type"
},
"getGroupPSCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/Booktype.json"
},
"getGroupPSUIActionGroup" : {
"name" : "打开多数据表单",
"getPSUIActionGroupDetails" : [ {
"caption" : "打开多数据列表",
"detailType" : "DEUIACTION",
"name" : "u3624d39",
"getPSUIAction" : {
"actionTarget" : "NONE",
"caption" : "打开多数据列表",
"codeName" : "opendsjlb",
"getFrontPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr6EditView.json",
"viewType" : "DEEDITVIEW"
},
"frontProcessType" : "TOP",
"fullCodeName" : "Book_opendsjlb",
"name" : "打开多数据列表",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
},
"timeout" : 60000,
"uIActionMode" : "FRONT",
"uIActionTag" : "opendsjlb",
"uIActionType" : "DEUIACTION",
"id" : "opendsjlb@Book"
},
"addSeparator" : false,
"showCaption" : true,
"showIcon" : true
}, {
"caption" : "打开多数据卡片",
"detailType" : "DEUIACTION",
"name" : "u7820387",
"getPSUIAction" : {
"actionTarget" : "NONE",
"caption" : "打开多数据卡片",
"codeName" : "dkdsjkp",
"getFrontPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr7EditView.json",
"viewType" : "DEEDITVIEW"
},
"frontProcessType" : "TOP",
"fullCodeName" : "Book_dkdsjkp",
"name" : "打开多数据卡片",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Update"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
},
"timeout" : 60000,
"uIActionMode" : "BACKEND",
"uIActionTag" : "dkdsjkp",
"uIActionType" : "DEUIACTION",
"enableConfirm" : true,
"showBusyIndicator" : false,
"id" : "dkdsjkp@Book"
},
"addSeparator" : false,
"showCaption" : true,
"showIcon" : true
}, {
"caption" : "打开多数据表单",
"detailType" : "DEUIACTION",
"name" : "u7d41599",
"getPSUIAction" : {
"actionTarget" : "SINGLEKEY",
"caption" : "打开多数据表单",
"codeName" : "opendsjbd",
"getFrontPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr5EditView.json",
"viewType" : "DEEDITVIEW"
},
"frontProcessType" : "TOP",
"fullCodeName" : "Book_opendsjbd",
"name" : "打开多数据表单",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
},
"timeout" : 60000,
"uIActionMode" : "FRONT",
"uIActionTag" : "opendsjbd",
"uIActionType" : "DEUIACTION",
"id" : "opendsjbd@Book"
},
"addSeparator" : false,
"showCaption" : true,
"showIcon" : true
} ]
},
"getItemPSLayoutPanel" : { "getItemPSLayoutPanel" : {
"getAllPSPanelFields" : [ { "getAllPSPanelFields" : [ {
"id" : "field_text_dynamic", "id" : "field_text_dynamic",
...@@ -936,15 +830,15 @@ ...@@ -936,15 +830,15 @@
"id" : "DATAVIEW" "id" : "DATAVIEW"
}, },
"getPSDEDataViewDataItems" : [ { "getPSDEDataViewDataItems" : [ {
"dataType" : 25,
"name" : "bookname"
}, {
"dataType" : 25, "dataType" : 25,
"getFrontPSCodeList" : { "getFrontPSCodeList" : {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList44.json" "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList44.json"
}, },
"name" : "type" "name" : "type"
}, {
"dataType" : 25,
"name" : "bookname"
}, { }, {
"dataType" : 25, "dataType" : 25,
"name" : "srfkey", "name" : "srfkey",
...@@ -975,16 +869,6 @@ ...@@ -975,16 +869,6 @@
} }
} ], } ],
"getPSDEDataViewItems" : [ { "getPSDEDataViewItems" : [ {
"caption" : "书名称",
"dataItemName" : "bookname",
"itemType" : "DATAITEM",
"name" : "BOOKNAME",
"getPSAppDEField" : {
"name" : "BOOKNAME",
"codeName" : "BookName"
},
"enableSort" : true
}, {
"cLConvertMode" : "FRONT", "cLConvertMode" : "FRONT",
"caption" : "类型", "caption" : "类型",
"dataItemName" : "type", "dataItemName" : "type",
...@@ -999,8 +883,18 @@ ...@@ -999,8 +883,18 @@
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList44.json" "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList44.json"
}, },
"enableSort" : true "enableSort" : true
}, {
"caption" : "书名称",
"dataItemName" : "bookname",
"itemType" : "DATAITEM",
"name" : "BOOKNAME",
"getPSAppDEField" : {
"name" : "BOOKNAME",
"codeName" : "BookName"
},
"enableSort" : true
} ], } ],
"pagingSize" : 1000, "pagingSize" : 20,
"getRemovePSControlAction" : { "getRemovePSControlAction" : {
"modelref" : true, "modelref" : true,
"id" : "remove", "id" : "remove",
...@@ -1039,8 +933,8 @@ ...@@ -1039,8 +933,8 @@
"enableCardEditGroup" : false, "enableCardEditGroup" : false,
"enableCardEditOrder" : false, "enableCardEditOrder" : false,
"enableCardNew" : false, "enableCardNew" : false,
"enableGroup" : true, "enableGroup" : false,
"enablePagingBar" : false, "enablePagingBar" : true,
"noSort" : false, "noSort" : false,
"singleSelect" : false, "singleSelect" : false,
"name" : "dataview", "name" : "dataview",
......
{ {
"allAccessKeys" : [ "MODULE_ONE" ], "allAccessKeys" : [ "MODULE_ONE" ],
"getAllPSAppCodeLists" : [ { "getAllPSAppCodeLists" : [ {
"codeListTag" : "Test__Booktype",
"codeListType" : "DYNAMIC",
"codeName" : "Booktype",
"customCond" : "page=1000",
"dynaInstMode" : 0,
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/Booktype.json",
"emptyText" : "未定义",
"name" : "book类型",
"getPSAppDEDataSet" : {
"modelref" : true,
"id" : "FetchDefault"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
},
"getTextPSAppDEField" : {
"name" : "TYPE",
"codeName" : "Type"
},
"getValuePSAppDEField" : {
"name" : "TYPE",
"codeName" : "Type"
}
}, {
"codeListTag" : "common__CodeList", "codeListTag" : "common__CodeList",
"codeListType" : "DYNAMIC", "codeListType" : "DYNAMIC",
"codeName" : "CodeList", "codeName" : "CodeList",
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<profiles> <profiles>
<profile> <profile>
<id>trainsys</id> <id>runtime</id>
<build> <build>
<resources> <resources>
<resource> <resource>
......
...@@ -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
...@@ -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
......
...@@ -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 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册