Skip to content

T
TrainSys
提交 28a0f26e 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

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

上级 da3223f6
显示空白字符变更
内嵌 并排
正在显示 包含 375 行增加 和 276 行删除
config.xml
浏览文件 @ 28a0f26e
...@@ -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>
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/Usr08126702EditView_Form.json
浏览文件 @ 28a0f26e
...@@ -112,6 +112,13 @@ ...@@ -112,6 +112,13 @@
"id" : "srfsourcekey", "id" : "srfsourcekey",
"hidden" : true, "hidden" : true,
"dataType" : 25 "dataType" : 25
}, {
"id" : "field",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "FIELD",
"codeName" : "Field"
}
}, { }, {
"id" : "createman", "id" : "createman",
"dataType" : 25, "dataType" : 25,
...@@ -164,6 +171,65 @@ ...@@ -164,6 +171,65 @@
"detailType" : "GROUPPANEL", "detailType" : "GROUPPANEL",
"name" : "group1", "name" : "group1",
"getPSDEFormDetails" : [ { "getPSDEFormDetails" : [ {
"codeName" : "rawitem2",
"contentType" : "RAW",
"detailStyle" : "DEFAULT",
"detailType" : "RAWITEM",
"name" : "rawitem2",
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSRawItem" : {
"caption" : "常规",
"contentType" : "RAW",
"name" : "rawitem2",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0
},
"rawContent" : "常规",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0,
"showCaption" : true
}, {
"codeName" : "grouppanel1",
"detailStyle" : "DEFAULT",
"detailType" : "GROUPPANEL",
"name" : "grouppanel1",
"getPSDEFormDetails" : [ {
"caption" : "属性",
"codeName" : "field",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"itemHeight" : 200.0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "field",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "FIELD",
"codeName" : "Field"
},
"getPSEditor" : {
"editorHeight" : 200.0,
"editorParams" : {
"HEIGHT" : "200"
},
"editorType" : "TEXTAREA_10",
"maxLength" : 2000,
"name" : "field",
"showMaxLength" : true
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"allowEmpty" : false,
"showCaption" : true
}, {
"buildInActions" : 7, "buildInActions" : 7,
"codeName" : "mdctrl2", "codeName" : "mdctrl2",
"contentType" : "REPEATER", "contentType" : "REPEATER",
...@@ -191,9 +257,8 @@ ...@@ -191,9 +257,8 @@
"name" : "bookname" "name" : "bookname"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colLG" : 8, "grow" : -1,
"colMD" : 8, "layout" : "FLEX"
"layout" : "TABLE_24COL"
}, },
"allowEmpty" : true, "allowEmpty" : true,
"repeatContent" : true, "repeatContent" : true,
...@@ -215,9 +280,8 @@ ...@@ -215,9 +280,8 @@
"name" : "field3" "name" : "field3"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colLG" : 8, "grow" : -1,
"colMD" : 8, "layout" : "FLEX"
"layout" : "TABLE_24COL"
}, },
"allowEmpty" : true, "allowEmpty" : true,
"repeatContent" : true, "repeatContent" : true,
...@@ -239,9 +303,8 @@ ...@@ -239,9 +303,8 @@
"name" : "type" "name" : "type"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colLG" : 8, "grow" : -1,
"colMD" : 8, "layout" : "FLEX"
"layout" : "TABLE_24COL"
}, },
"allowEmpty" : true, "allowEmpty" : true,
"repeatContent" : true, "repeatContent" : true,
...@@ -253,8 +316,8 @@ ...@@ -253,8 +316,8 @@
"detailType" : "RAWITEM", "detailType" : "RAWITEM",
"name" : "rawitem1", "name" : "rawitem1",
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colMD" : 24, "grow" : -1,
"layout" : "TABLE_24COL" "layout" : "FLEX"
}, },
"getPSRawItem" : { "getPSRawItem" : {
"contentType" : "DIVIDER", "contentType" : "DIVIDER",
...@@ -285,21 +348,19 @@ ...@@ -285,21 +348,19 @@
"name" : "field10" "name" : "field10"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colMD" : 24, "grow" : -1,
"layout" : "TABLE_24COL" "layout" : "FLEX"
}, },
"allowEmpty" : true, "allowEmpty" : true,
"repeatContent" : true, "repeatContent" : true,
"showCaption" : true "showCaption" : true
} ], } ],
"getPSLayout" : { "getPSLayout" : {
"childColMD" : 24, "layout" : "FLEX"
"columnCount" : 24,
"layout" : "TABLE_24COL"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colMD" : 24, "grow" : -1,
"layout" : "TABLE_24COL" "layout" : "FLEX"
}, },
"getPSSysPFPlugin" : { "getPSSysPFPlugin" : {
"pluginType" : "FORM_USERCONTROL", "pluginType" : "FORM_USERCONTROL",
...@@ -309,9 +370,20 @@ ...@@ -309,9 +370,20 @@
"showCaption" : true "showCaption" : true
} ], } ],
"getPSLayout" : { "getPSLayout" : {
"childColMD" : 24, "layout" : "FLEX"
"columnCount" : 24, },
"layout" : "TABLE_24COL" "getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"infoGroupMode" : false,
"showCaption" : false
} ],
"getPSLayout" : {
"align" : "flex-start",
"dir" : "row",
"layout" : "FLEX",
"vAlign" : "center"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colMD" : 24, "colMD" : 24,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr08126702EditView.json
浏览文件 @ 28a0f26e
...@@ -230,6 +230,13 @@ ...@@ -230,6 +230,13 @@
"id" : "srfsourcekey", "id" : "srfsourcekey",
"hidden" : true, "hidden" : true,
"dataType" : 25 "dataType" : 25
}, {
"id" : "field",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "FIELD",
"codeName" : "Field"
}
}, { }, {
"id" : "createman", "id" : "createman",
"dataType" : 25, "dataType" : 25,
...@@ -282,6 +289,65 @@ ...@@ -282,6 +289,65 @@
"detailType" : "GROUPPANEL", "detailType" : "GROUPPANEL",
"name" : "group1", "name" : "group1",
"getPSDEFormDetails" : [ { "getPSDEFormDetails" : [ {
"codeName" : "rawitem2",
"contentType" : "RAW",
"detailStyle" : "DEFAULT",
"detailType" : "RAWITEM",
"name" : "rawitem2",
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSRawItem" : {
"caption" : "常规",
"contentType" : "RAW",
"name" : "rawitem2",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0
},
"rawContent" : "常规",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0,
"showCaption" : true
}, {
"codeName" : "grouppanel1",
"detailStyle" : "DEFAULT",
"detailType" : "GROUPPANEL",
"name" : "grouppanel1",
"getPSDEFormDetails" : [ {
"caption" : "属性",
"codeName" : "field",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"itemHeight" : 200.0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "field",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "FIELD",
"codeName" : "Field"
},
"getPSEditor" : {
"editorHeight" : 200.0,
"editorParams" : {
"HEIGHT" : "200"
},
"editorType" : "TEXTAREA_10",
"maxLength" : 2000,
"name" : "field",
"showMaxLength" : true
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"allowEmpty" : false,
"showCaption" : true
}, {
"buildInActions" : 7, "buildInActions" : 7,
"codeName" : "mdctrl2", "codeName" : "mdctrl2",
"contentType" : "REPEATER", "contentType" : "REPEATER",
...@@ -309,9 +375,8 @@ ...@@ -309,9 +375,8 @@
"name" : "bookname" "name" : "bookname"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colLG" : 8, "grow" : -1,
"colMD" : 8, "layout" : "FLEX"
"layout" : "TABLE_24COL"
}, },
"allowEmpty" : true, "allowEmpty" : true,
"repeatContent" : true, "repeatContent" : true,
...@@ -333,9 +398,8 @@ ...@@ -333,9 +398,8 @@
"name" : "field3" "name" : "field3"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colLG" : 8, "grow" : -1,
"colMD" : 8, "layout" : "FLEX"
"layout" : "TABLE_24COL"
}, },
"allowEmpty" : true, "allowEmpty" : true,
"repeatContent" : true, "repeatContent" : true,
...@@ -357,9 +421,8 @@ ...@@ -357,9 +421,8 @@
"name" : "type" "name" : "type"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colLG" : 8, "grow" : -1,
"colMD" : 8, "layout" : "FLEX"
"layout" : "TABLE_24COL"
}, },
"allowEmpty" : true, "allowEmpty" : true,
"repeatContent" : true, "repeatContent" : true,
...@@ -371,8 +434,8 @@ ...@@ -371,8 +434,8 @@
"detailType" : "RAWITEM", "detailType" : "RAWITEM",
"name" : "rawitem1", "name" : "rawitem1",
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colMD" : 24, "grow" : -1,
"layout" : "TABLE_24COL" "layout" : "FLEX"
}, },
"getPSRawItem" : { "getPSRawItem" : {
"contentType" : "DIVIDER", "contentType" : "DIVIDER",
...@@ -403,21 +466,19 @@ ...@@ -403,21 +466,19 @@
"name" : "field10" "name" : "field10"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colMD" : 24, "grow" : -1,
"layout" : "TABLE_24COL" "layout" : "FLEX"
}, },
"allowEmpty" : true, "allowEmpty" : true,
"repeatContent" : true, "repeatContent" : true,
"showCaption" : true "showCaption" : true
} ], } ],
"getPSLayout" : { "getPSLayout" : {
"childColMD" : 24, "layout" : "FLEX"
"columnCount" : 24,
"layout" : "TABLE_24COL"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colMD" : 24, "grow" : -1,
"layout" : "TABLE_24COL" "layout" : "FLEX"
}, },
"getPSSysPFPlugin" : { "getPSSysPFPlugin" : {
"pluginType" : "FORM_USERCONTROL", "pluginType" : "FORM_USERCONTROL",
...@@ -427,9 +488,20 @@ ...@@ -427,9 +488,20 @@
"showCaption" : true "showCaption" : true
} ], } ],
"getPSLayout" : { "getPSLayout" : {
"childColMD" : 24, "layout" : "FLEX"
"columnCount" : 24, },
"layout" : "TABLE_24COL" "getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"infoGroupMode" : false,
"showCaption" : false
} ],
"getPSLayout" : {
"align" : "flex-start",
"dir" : "row",
"layout" : "FLEX",
"vAlign" : "center"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colMD" : 24, "colMD" : 24,
......
trainsys-provider/pom.xml
浏览文件 @ 28a0f26e
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<profiles> <profiles>
<profile> <profile>
<id>trainsys</id> <id>runtime</id>
<build> <build>
<resources> <resources>
<resource> <resource>
......
trainsys-provider/src/main/docker/Dockerfile
浏览文件 @ 28a0f26e
...@@ -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
trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
浏览文件 @ 28a0f26e
...@@ -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
......
trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
浏览文件 @ 28a0f26e
...@@ -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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或