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

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

上级 e7512f9d
...@@ -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>
......
...@@ -6466,6 +6466,12 @@ ...@@ -6466,6 +6466,12 @@
"name" : "书实体数据视图", "name" : "书实体数据视图",
"realModelSubType" : "DEDATAVIEW", "realModelSubType" : "DEDATAVIEW",
"realModelType" : "PSDEVIEWBASE" "realModelType" : "PSDEVIEWBASE"
}, {
"codeName" : "DataView9",
"logicName" : "书实体数据视图(部件视图)",
"name" : "书实体数据视图(部件视图)",
"realModelSubType" : "DEDATAVIEW9",
"realModelType" : "PSDEVIEWBASE"
}, { }, {
"codeName" : "WFDynaEditView3", "codeName" : "WFDynaEditView3",
"logicName" : "书实体工作流动态视图(分页关系)", "logicName" : "书实体工作流动态视图(分页关系)",
......
...@@ -3765,6 +3765,10 @@ ...@@ -3765,6 +3765,10 @@
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookMobWFDynaEditView3.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookMobWFDynaEditView3.json",
"viewType" : "DEMOBWFDYNAEDITVIEW3" "viewType" : "DEMOBWFDYNAEDITVIEW3"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookDataView9.json",
"viewType" : "DEDATAVIEW9"
} ], } ],
"getAllPSDEMainStates" : [ { "getAllPSDEMainStates" : [ {
"codeName" : "A", "codeName" : "A",
......
...@@ -1591,6 +1591,47 @@ ...@@ -1591,6 +1591,47 @@
"layout" : "TABLE_24COL" "layout" : "TABLE_24COL"
}, },
"tooltip" : "布局面板发布承载(勿动)" "tooltip" : "布局面板发布承载(勿动)"
}, {
"accUserMode" : 0,
"caption" : "测试部件视图",
"itemType" : "MENUITEM",
"name" : "menuitem74",
"getPSAppMenuItems" : [ {
"accUserMode" : 2,
"caption" : "卡片视图(部件)",
"itemType" : "MENUITEM",
"name" : "menuitem75",
"getPSAppFunc" : {
"modelref" : true,
"id" : "AppFunc62"
},
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"tooltip" : "卡片视图(部件)"
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"tooltip" : "测试部件视图"
} ], } ],
"getPSControlHandler" : { "getPSControlHandler" : {
"enableDEFieldPrivilege" : false, "enableDEFieldPrivilege" : false,
......
...@@ -701,6 +701,23 @@ ...@@ -701,6 +701,23 @@
"tooltip" : "表格布局面板" "tooltip" : "表格布局面板"
} ], } ],
"tooltip" : "布局面板发布承载(勿动)" "tooltip" : "布局面板发布承载(勿动)"
}, {
"accUserMode" : 0,
"caption" : "测试部件视图",
"itemType" : "MENUITEM",
"name" : "menuitem74",
"getPSAppMenuItems" : [ {
"accUserMode" : 2,
"caption" : "卡片视图(部件)",
"itemType" : "MENUITEM",
"name" : "menuitem75",
"getPSAppFunc" : {
"modelref" : true,
"id" : "AppFunc62"
},
"tooltip" : "卡片视图(部件)"
} ],
"tooltip" : "测试部件视图"
} ], } ],
"enableCustomize" : false, "enableCustomize" : false,
"name" : "appindex", "name" : "appindex",
......
...@@ -1502,6 +1502,16 @@ ...@@ -1502,6 +1502,16 @@
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView3_modal.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView3_modal.json",
"viewType" : "DEEDITVIEW3" "viewType" : "DEEDITVIEW3"
} }
}, {
"appFuncType" : "APPVIEW",
"codeName" : "AppFunc62",
"name" : "书实体数据视图(部件视图)",
"openMode" : "INDEXVIEWTAB",
"getPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookDataView9.json",
"viewType" : "DEDATAVIEW9"
}
}, { }, {
"appFuncType" : "APPVIEW", "appFuncType" : "APPVIEW",
"codeName" : "AppFunc17", "codeName" : "AppFunc17",
...@@ -3258,6 +3268,12 @@ ...@@ -3258,6 +3268,12 @@
"viewType" : "DEMOBWFDYNAEDITVIEW3", "viewType" : "DEMOBWFDYNAEDITVIEW3",
"resource" : "Book", "resource" : "Book",
"view" : "MobWFDynaEditView3" "view" : "MobWFDynaEditView3"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookDataView9.json",
"viewType" : "DEDATAVIEW9",
"resource" : "Book",
"view" : "DataView9"
}, { }, {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoStuInfoList.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoStuInfoList.json",
...@@ -4939,6 +4955,47 @@ ...@@ -4939,6 +4955,47 @@
"layout" : "TABLE_24COL" "layout" : "TABLE_24COL"
}, },
"tooltip" : "布局面板发布承载(勿动)" "tooltip" : "布局面板发布承载(勿动)"
}, {
"accUserMode" : 0,
"caption" : "测试部件视图",
"itemType" : "MENUITEM",
"name" : "menuitem74",
"getPSAppMenuItems" : [ {
"accUserMode" : 2,
"caption" : "卡片视图(部件)",
"itemType" : "MENUITEM",
"name" : "menuitem75",
"getPSAppFunc" : {
"modelref" : true,
"id" : "AppFunc62"
},
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"tooltip" : "卡片视图(部件)"
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"tooltip" : "测试部件视图"
} ], } ],
"getPSControlHandler" : { "getPSControlHandler" : {
"enableDEFieldPrivilege" : false, "enableDEFieldPrivilege" : false,
...@@ -23371,6 +23428,10 @@ ...@@ -23371,6 +23428,10 @@
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookMobWFDynaEditView3.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookMobWFDynaEditView3.json",
"viewType" : "DEMOBWFDYNAEDITVIEW3" "viewType" : "DEMOBWFDYNAEDITVIEW3"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookDataView9.json",
"viewType" : "DEDATAVIEW9"
} ], } ],
"getAllPSDEMainStates" : [ { "getAllPSDEMainStates" : [ {
"codeName" : "A", "codeName" : "A",
......
...@@ -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 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册