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

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

上级 db959a98
...@@ -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>
......
...@@ -110,6 +110,25 @@ ...@@ -110,6 +110,25 @@
"width" : 150, "width" : 150,
"widthUnit" : "PX", "widthUnit" : "PX",
"enableSort" : true "enableSort" : true
}, {
"align" : "LEFT",
"cLConvertMode" : "NONE",
"caption" : "人数",
"codeName" : "num",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "num",
"excelCaption" : "人数",
"mOSFilePath" : "psdegridcols/num",
"name" : "num",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "NUM",
"codeName" : "Num"
},
"rTMOSFilePath" : "psdegridcols/num",
"width" : 100,
"widthUnit" : "PX",
"enableSort" : true
} ], } ],
"getPSDEGridDataItems" : [ { "getPSDEGridDataItems" : [ {
"dataType" : 25, "dataType" : 25,
...@@ -133,6 +152,13 @@ ...@@ -133,6 +152,13 @@
"name" : "UPDATEDATE", "name" : "UPDATEDATE",
"codeName" : "UpdateDate" "codeName" : "UpdateDate"
} }
}, {
"dataType" : 9,
"name" : "num",
"getPSAppDEField" : {
"name" : "NUM",
"codeName" : "Num"
}
}, { }, {
"dataType" : 25, "dataType" : 25,
"name" : "srfkey", "name" : "srfkey",
......
...@@ -593,6 +593,25 @@ ...@@ -593,6 +593,25 @@
"width" : 150, "width" : 150,
"widthUnit" : "PX", "widthUnit" : "PX",
"enableSort" : true "enableSort" : true
}, {
"align" : "LEFT",
"cLConvertMode" : "NONE",
"caption" : "人数",
"codeName" : "num",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "num",
"excelCaption" : "人数",
"mOSFilePath" : "psdegridcols/num",
"name" : "num",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "NUM",
"codeName" : "Num"
},
"rTMOSFilePath" : "psdegridcols/num",
"width" : 100,
"widthUnit" : "PX",
"enableSort" : true
} ], } ],
"getPSDEGridDataItems" : [ { "getPSDEGridDataItems" : [ {
"dataType" : 25, "dataType" : 25,
...@@ -616,6 +635,13 @@ ...@@ -616,6 +635,13 @@
"name" : "UPDATEDATE", "name" : "UPDATEDATE",
"codeName" : "UpdateDate" "codeName" : "UpdateDate"
} }
}, {
"dataType" : 9,
"name" : "num",
"getPSAppDEField" : {
"name" : "NUM",
"codeName" : "Num"
}
}, { }, {
"dataType" : 25, "dataType" : 25,
"name" : "srfkey", "name" : "srfkey",
......
...@@ -38,11 +38,11 @@ ...@@ -38,11 +38,11 @@
} }
}, { }, {
"name" : "EXPITEM:tabviewpanel2", "name" : "EXPITEM:tabviewpanel2",
"realTitle" : "手机编辑视图", "realTitle" : "学生表格视图",
"getRefPSAppView" : { "getRefPSAppView" : {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr2EditView.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentGridView.json",
"viewType" : "DEEDITVIEW" "viewType" : "DEGRIDVIEW"
} }
} ], } ],
"getPSControlParam" : { }, "getPSControlParam" : { },
...@@ -2222,13 +2222,13 @@ ...@@ -2222,13 +2222,13 @@
"modeltype" : "PSAPPDEVIEW" "modeltype" : "PSAPPDEVIEW"
} }
}, { }, {
"caption" : "表", "caption" : "表格2",
"codeName" : "TabExpViewtabviewpanel2", "codeName" : "TabExpViewtabviewpanel2",
"controlType" : "TABVIEWPANEL", "controlType" : "TABVIEWPANEL",
"getEmbeddedPSAppDEView" : { "getEmbeddedPSAppDEView" : {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr2EditView.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentGridView.json",
"viewType" : "DEEDITVIEW" "viewType" : "DEGRIDVIEW"
}, },
"mOSFilePath" : "psmodules/common/psdataentities/PHONE/psviewpanels/TabExpViewtabviewpanel2", "mOSFilePath" : "psmodules/common/psdataentities/PHONE/psviewpanels/TabExpViewtabviewpanel2",
"name" : "tabviewpanel2", "name" : "tabviewpanel2",
......
...@@ -3951,7 +3951,6 @@ ...@@ -3951,7 +3951,6 @@
"useDefaultLayout" : true "useDefaultLayout" : true
}, },
"rTMOSFilePath" : "pssysapps/Web/psappdeviews/studentEditView", "rTMOSFilePath" : "pssysapps/Web/psappdeviews/studentEditView",
"refFlag" : false,
"title" : "学生编辑视图", "title" : "学生编辑视图",
"viewStyle" : "DEFAULT", "viewStyle" : "DEFAULT",
"viewType" : "DEEDITVIEW", "viewType" : "DEEDITVIEW",
......
...@@ -1629,7 +1629,6 @@ ...@@ -1629,7 +1629,6 @@
"useDefaultLayout" : true "useDefaultLayout" : true
}, },
"rTMOSFilePath" : "pssysapps/Web/psappdeviews/studentGridView", "rTMOSFilePath" : "pssysapps/Web/psappdeviews/studentGridView",
"refFlag" : false,
"title" : "学生表格视图", "title" : "学生表格视图",
"viewStyle" : "DEFAULT", "viewStyle" : "DEFAULT",
"viewType" : "DEGRIDVIEW", "viewType" : "DEGRIDVIEW",
......
...@@ -632,11 +632,11 @@ ...@@ -632,11 +632,11 @@
} }
}, { }, {
"name" : "EXPITEM:tabviewpanel2", "name" : "EXPITEM:tabviewpanel2",
"realTitle" : "手机编辑视图", "realTitle" : "学生表格视图",
"getRefPSAppView" : { "getRefPSAppView" : {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr2EditView.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentGridView.json",
"viewType" : "DEEDITVIEW" "viewType" : "DEGRIDVIEW"
} }
} ], } ],
"getPSControlParam" : { }, "getPSControlParam" : { },
...@@ -662,13 +662,13 @@ ...@@ -662,13 +662,13 @@
"modelid" : "ce6b7952d59604f041810a73b43824dc_tabviewpanel", "modelid" : "ce6b7952d59604f041810a73b43824dc_tabviewpanel",
"modeltype" : "PSVIEWPANEL" "modeltype" : "PSVIEWPANEL"
}, { }, {
"caption" : "表", "caption" : "表格2",
"codeName" : "TabExpViewtabviewpanel2", "codeName" : "TabExpViewtabviewpanel2",
"controlType" : "TABVIEWPANEL", "controlType" : "TABVIEWPANEL",
"getEmbeddedPSAppDEView" : { "getEmbeddedPSAppDEView" : {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr2EditView.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentGridView.json",
"viewType" : "DEEDITVIEW" "viewType" : "DEGRIDVIEW"
}, },
"mOSFilePath" : "psmodules/common/psdataentities/PHONE/psviewpanels/TabExpViewtabviewpanel2", "mOSFilePath" : "psmodules/common/psdataentities/PHONE/psviewpanels/TabExpViewtabviewpanel2",
"name" : "tabviewpanel2", "name" : "tabviewpanel2",
......
...@@ -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 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册