Skip to content

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

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

上级 0054a009
隐藏空白字符变更
内嵌 并排
正在显示 包含 93 行增加 和 261 行删除
config.xml
浏览文件 @ 14cb77d8
...@@ -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/PSAPPINDEXVIEWS/AppIndex.json
浏览文件 @ 14cb77d8
...@@ -567,6 +567,25 @@ ...@@ -567,6 +567,25 @@
"layout" : "TABLE_24COL" "layout" : "TABLE_24COL"
}, },
"tooltip" : "测试模型" "tooltip" : "测试模型"
}, {
"accUserMode" : 2,
"caption" : "测试模型",
"itemType" : "MENUITEM",
"name" : "menuitem403",
"getPSAppFunc" : {
"modelref" : true,
"id" : "UsrAppFunc0506765883"
},
"getPSLayout" : {
"childColMD" : 24,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"tooltip" : "测试模型"
}, { }, {
"accUserMode" : 2, "accUserMode" : 2,
"caption" : "树表格", "caption" : "树表格",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPMENUS/AppIndex.json
浏览文件 @ 14cb77d8
...@@ -13,6 +13,16 @@ ...@@ -13,6 +13,16 @@
"id" : "UsrAppFunc0506765883" "id" : "UsrAppFunc0506765883"
}, },
"tooltip" : "测试模型" "tooltip" : "测试模型"
}, {
"accUserMode" : 2,
"caption" : "测试模型",
"itemType" : "MENUITEM",
"name" : "menuitem403",
"getPSAppFunc" : {
"modelref" : true,
"id" : "UsrAppFunc0506765883"
},
"tooltip" : "测试模型"
}, { }, {
"accUserMode" : 2, "accUserMode" : 2,
"caption" : "树表格", "caption" : "树表格",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ 14cb77d8
...@@ -41318,6 +41318,25 @@ ...@@ -41318,6 +41318,25 @@
"layout" : "TABLE_24COL" "layout" : "TABLE_24COL"
}, },
"tooltip" : "测试模型" "tooltip" : "测试模型"
}, {
"accUserMode" : 2,
"caption" : "测试模型",
"itemType" : "MENUITEM",
"name" : "menuitem403",
"getPSAppFunc" : {
"modelref" : true,
"id" : "UsrAppFunc0506765883"
},
"getPSLayout" : {
"childColMD" : 24,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"tooltip" : "测试模型"
}, { }, {
"accUserMode" : 2, "accUserMode" : 2,
"caption" : "树表格", "caption" : "树表格",
...@@ -49757,13 +49776,11 @@ ...@@ -49757,13 +49776,11 @@
"getPSDEFormItemUpdates" : [ { "getPSDEFormItemUpdates" : [ {
"codeName" : "update", "codeName" : "update",
"name" : "update", "name" : "update",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Update"
},
"getPSDEFIUpdateDetails" : [ { "getPSDEFIUpdateDetails" : [ {
"name" : "lowprice" "name" : "lowprice"
} ] } ],
"scriptCode" : "console.log('表单项更新')",
"customCode" : true
} ], } ],
"getPSDEFormItems" : [ { "getPSDEFormItems" : [ {
"id" : "srfupdatedate", "id" : "srfupdatedate",
...@@ -49831,8 +49848,12 @@ ...@@ -49831,8 +49848,12 @@
"codeName" : "End" "codeName" : "End"
} }
}, { }, {
"id" : "formitem", "id" : "phonetype",
"dataType" : 25 "dataType" : 25,
"getPSAppDEField" : {
"name" : "PHONETYPE",
"codeName" : "Phonetype"
}
}, { }, {
"id" : "createman", "id" : "createman",
"dataType" : 25, "dataType" : 25,
...@@ -49993,205 +50014,32 @@ ...@@ -49993,205 +50014,32 @@
"allowEmpty" : true, "allowEmpty" : true,
"showCaption" : true "showCaption" : true
}, { }, {
"caption" : "直接内容", "codeName" : "rawitem1",
"codeName" : "grouppanel1", "contentType" : "RAW",
"detailStyle" : "DEFAULT", "detailStyle" : "DEFAULT",
"detailType" : "GROUPPANEL", "detailType" : "RAWITEM",
"name" : "grouppanel1", "name" : "rawitem1",
"getPSDEFormDetails" : [ {
"codeName" : "rawitem4",
"contentType" : "VIDEO",
"detailStyle" : "DEFAULT",
"detailType" : "RAWITEM",
"name" : "rawitem4",
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"getPSRawItem" : {
"contentType" : "VIDEO",
"name" : "rawitem4",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0
},
"rawContent" : "{\"path\":\"\",\"mute\":true,\"autoplay\":true,\"replay\":false,\"showcontrols\":true}",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0,
"showCaption" : true
}, {
"codeName" : "rawitem6",
"contentType" : "DIVIDER",
"detailStyle" : "DEFAULT",
"detailType" : "RAWITEM",
"name" : "rawitem6",
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"getPSRawItem" : {
"contentType" : "DIVIDER",
"name" : "rawitem6",
"rawContent" : "{\"contentPosition\":\"center\",\"html\":\"\"}",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0
},
"rawContent" : "{\"contentPosition\":\"center\",\"html\":\"\"}",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0,
"showCaption" : true
}, {
"codeName" : "rawitem3",
"contentType" : "IMAGE",
"detailStyle" : "DEFAULT",
"detailType" : "RAWITEM",
"name" : "rawitem3",
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"getPSRawItem" : {
"contentType" : "IMAGE",
"name" : "rawitem3",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0
},
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0,
"showCaption" : true
}, {
"codeName" : "rawitem7",
"contentType" : "INFO",
"detailStyle" : "DEFAULT",
"detailType" : "RAWITEM",
"name" : "rawitem7",
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"getPSRawItem" : {
"contentType" : "INFO",
"name" : "rawitem7",
"rawContent" : "{\"title\":\"\",\"closeabled\":true,\"showIcon\":true}",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0
},
"rawContent" : "{\"title\":\"\",\"closeabled\":true,\"showIcon\":true}",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0,
"showCaption" : true
}, {
"codeName" : "rawitem8",
"contentType" : "WARNING",
"detailStyle" : "DEFAULT",
"detailType" : "RAWITEM",
"name" : "rawitem8",
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"getPSRawItem" : {
"contentType" : "WARNING",
"name" : "rawitem8",
"rawContent" : "{\"title\":\"\",\"closeabled\":true,\"showIcon\":true}",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0
},
"rawContent" : "{\"title\":\"\",\"closeabled\":true,\"showIcon\":true}",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0,
"showCaption" : true
}, {
"codeName" : "rawitem9",
"contentType" : "ERROR",
"detailStyle" : "DEFAULT",
"detailType" : "RAWITEM",
"name" : "rawitem9",
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"getPSRawItem" : {
"contentType" : "ERROR",
"name" : "rawitem9",
"rawContent" : "{\"title\":\"\",\"closeabled\":true,\"showIcon\":true}",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0
},
"rawContent" : "{\"title\":\"\",\"closeabled\":true,\"showIcon\":true}",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0,
"showCaption" : true
}, {
"codeName" : "rawitem2",
"contentType" : "HTML",
"detailStyle" : "DEFAULT",
"detailType" : "RAWITEM",
"name" : "rawitem2",
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"getPSRawItem" : {
"contentType" : "HTML",
"name" : "rawitem2",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0
},
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0,
"showCaption" : true
}, {
"codeName" : "rawitem5",
"contentType" : "PLACEHOLDER",
"detailStyle" : "DEFAULT",
"detailType" : "RAWITEM",
"name" : "rawitem5",
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"getPSRawItem" : {
"contentType" : "PLACEHOLDER",
"name" : "rawitem5",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0
},
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0,
"showCaption" : true
}, {
"codeName" : "rawitem1",
"contentType" : "RAW",
"detailStyle" : "DEFAULT",
"detailType" : "RAWITEM",
"name" : "rawitem1",
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"getPSRawItem" : {
"contentType" : "RAW",
"name" : "rawitem1",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0
},
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0,
"showCaption" : true
} ],
"getPSLayout" : {
"childColMD" : 24,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colMD" : 24, "colMD" : 24,
"layout" : "TABLE_24COL" "layout" : "TABLE_24COL"
}, },
"infoGroupMode" : false, "getPSRawItem" : {
"caption" : "直接",
"contentType" : "RAW",
"name" : "rawitem1",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0
},
"rawContent" : "直接",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0,
"showCaption" : true "showCaption" : true
}, { }, {
"codeName" : "formitem", "getCapPSLanguageRes" : {
"lanResTag" : "DEF.LNAME.PHONETYPE"
},
"caption" : "手机型号",
"codeName" : "phonetype",
"dataType" : 25, "dataType" : 25,
"detailStyle" : "DEFAULT", "detailStyle" : "DEFAULT",
"detailType" : "FORMITEM", "detailType" : "FORMITEM",
...@@ -50199,11 +50047,19 @@ ...@@ -50199,11 +50047,19 @@
"ignoreInput" : 0, "ignoreInput" : 0,
"labelPos" : "LEFT", "labelPos" : "LEFT",
"labelWidth" : 130, "labelWidth" : 130,
"name" : "formitem", "name" : "phonetype",
"noPrivDisplayMode" : 1, "noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "PHONETYPE",
"codeName" : "Phonetype"
},
"getPSEditor" : { "getPSEditor" : {
"editorType" : "DROPDOWNLIST", "editorType" : "DROPDOWNLIST",
"name" : "formitem", "name" : "phonetype",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/common__PhoneType.json"
},
"singleSelect" : true "singleSelect" : true
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
...@@ -135438,8 +135294,6 @@ ...@@ -135438,8 +135294,6 @@
}, { }, {
"actionMode" : "READ", "actionMode" : "READ",
"actionType" : "BUILTIN", "actionType" : "BUILTIN",
"afterCode" : "console.log('执行后附加代码')",
"beforeCode" : "console.log('执行前附加代码')",
"codeName" : "Get", "codeName" : "Get",
"methodType" : "DEACTION", "methodType" : "DEACTION",
"name" : "Get", "name" : "Get",
...@@ -135473,8 +135327,6 @@ ...@@ -135473,8 +135327,6 @@
}, { }, {
"actionMode" : "GETDRAFT", "actionMode" : "GETDRAFT",
"actionType" : "BUILTIN", "actionType" : "BUILTIN",
"afterCode" : "console.log('执行后附加代码')",
"beforeCode" : "console.log('执行前附加代码')",
"codeName" : "GetDraft", "codeName" : "GetDraft",
"methodType" : "DEACTION", "methodType" : "DEACTION",
"name" : "GetDraft", "name" : "GetDraft",
...@@ -139598,8 +139450,6 @@ ...@@ -139598,8 +139450,6 @@
}, { }, {
"actionMode" : "READ", "actionMode" : "READ",
"actionType" : "BUILTIN", "actionType" : "BUILTIN",
"afterCode" : "console.log('执行后附加代码')",
"beforeCode" : "console.log('执行前附加代码')",
"codeName" : "Get", "codeName" : "Get",
"methodType" : "DEACTION", "methodType" : "DEACTION",
"name" : "Get", "name" : "Get",
...@@ -139633,8 +139483,6 @@ ...@@ -139633,8 +139483,6 @@
}, { }, {
"actionMode" : "GETDRAFT", "actionMode" : "GETDRAFT",
"actionType" : "BUILTIN", "actionType" : "BUILTIN",
"afterCode" : "console.log('执行后附加代码')",
"beforeCode" : "console.log('执行前附加代码')",
"codeName" : "GetDraft", "codeName" : "GetDraft",
"methodType" : "DEACTION", "methodType" : "DEACTION",
"name" : "GetDraft", "name" : "GetDraft",
trainsys-provider/pom.xml
浏览文件 @ 14cb77d8
...@@ -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
浏览文件 @ 14cb77d8
...@@ -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
浏览文件 @ 14cb77d8
...@@ -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
浏览文件 @ 14cb77d8
...@@ -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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或