Skip to content

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

tony001 部署微服务接口 [TrainSys，默认服务接口]

上级 b1150e82
隐藏空白字符变更
内嵌 并排
正在显示 包含 272 行增加 和 9 行删除
config.xml
浏览文件 @ c99d2353
...@@ -55,6 +55,12 @@ ...@@ -55,6 +55,12 @@
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/SubTest2/PSFORMS/CondGroupEditView_Form.json
浏览文件 @ c99d2353
...@@ -112,6 +112,13 @@ ...@@ -112,6 +112,13 @@
"id" : "srfsourcekey", "id" : "srfsourcekey",
"hidden" : true, "hidden" : true,
"dataType" : 25 "dataType" : 25
}, {
"id" : "condtype",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "CONDTYPE",
"codeName" : "CondType"
}
}, { }, {
"id" : "subtest2name", "id" : "subtest2name",
"dataType" : 25, "dataType" : 25,
...@@ -119,6 +126,14 @@ ...@@ -119,6 +126,14 @@
"name" : "SUBTEST2NAME", "name" : "SUBTEST2NAME",
"codeName" : "SubTest2Name" "codeName" : "SubTest2Name"
} }
}, {
"id" : "psubtest2id",
"hidden" : true,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "PSUBTEST2ID",
"codeName" : "Psubtest2id"
}
}, { }, {
"id" : "createman", "id" : "createman",
"dataType" : 25, "dataType" : 25,
...@@ -164,12 +179,44 @@ ...@@ -164,12 +179,44 @@
"name" : "formpage1", "name" : "formpage1",
"getPSDEFormDetails" : [ { "getPSDEFormDetails" : [ {
"actionGroupExtractMode" : "ITEM", "actionGroupExtractMode" : "ITEM",
"caption" : "子测试实体基本信息", "caption" : "条件组",
"codeName" : "group1", "codeName" : "group1",
"detailStyle" : "DEFAULT", "detailStyle" : "DEFAULT",
"detailType" : "GROUPPANEL", "detailType" : "GROUPPANEL",
"name" : "group1", "name" : "group1",
"getPSDEFormDetails" : [ { "getPSDEFormDetails" : [ {
"caption" : "条件类型",
"codeName" : "condtype",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "condtype",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "CONDTYPE",
"codeName" : "CondType"
},
"getPSEditor" : {
"editorType" : "DROPDOWNLIST",
"name" : "condtype",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CondType.json"
},
"singleSelect" : true
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"needCodeListConfig" : true,
"showCaption" : true
}, {
"getCapPSLanguageRes" : { "getCapPSLanguageRes" : {
"defaultContent" : "子测试实体名称", "defaultContent" : "子测试实体名称",
"lanResTag" : "DEF.LNAME.SUBTEST2NAME", "lanResTag" : "DEF.LNAME.SUBTEST2NAME",
...@@ -203,6 +250,33 @@ ...@@ -203,6 +250,33 @@
}, },
"allowEmpty" : true, "allowEmpty" : true,
"showCaption" : true "showCaption" : true
}, {
"caption" : "父节点",
"codeName" : "psubtest2id",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "psubtest2id",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "PSUBTEST2ID",
"codeName" : "Psubtest2id"
},
"getPSEditor" : {
"editorType" : "HIDDEN",
"name" : "psubtest2id"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"hidden" : true,
"showCaption" : true
} ], } ],
"getPSLayout" : { "getPSLayout" : {
"childColLG" : -1, "childColLG" : -1,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/SubTest2/PSFORMS/SingleCondEditView_Form.json
浏览文件 @ c99d2353
...@@ -126,6 +126,14 @@ ...@@ -126,6 +126,14 @@
"name" : "SUBTEST2NAME", "name" : "SUBTEST2NAME",
"codeName" : "SubTest2Name" "codeName" : "SubTest2Name"
} }
}, {
"id" : "psubtest2id",
"hidden" : true,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "PSUBTEST2ID",
"codeName" : "Psubtest2id"
}
}, { }, {
"id" : "createman", "id" : "createman",
"dataType" : 25, "dataType" : 25,
...@@ -242,6 +250,33 @@ ...@@ -242,6 +250,33 @@
}, },
"allowEmpty" : true, "allowEmpty" : true,
"showCaption" : true "showCaption" : true
}, {
"caption" : "父节点",
"codeName" : "psubtest2id",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "psubtest2id",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "PSUBTEST2ID",
"codeName" : "Psubtest2id"
},
"getPSEditor" : {
"editorType" : "HIDDEN",
"name" : "psubtest2id"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"hidden" : true,
"showCaption" : true
} ], } ],
"getPSLayout" : { "getPSLayout" : {
"childColLG" : -1, "childColLG" : -1,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/SubTest2CondGroupEditView.json
浏览文件 @ c99d2353
...@@ -239,6 +239,13 @@ ...@@ -239,6 +239,13 @@
"id" : "srfsourcekey", "id" : "srfsourcekey",
"hidden" : true, "hidden" : true,
"dataType" : 25 "dataType" : 25
}, {
"id" : "condtype",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "CONDTYPE",
"codeName" : "CondType"
}
}, { }, {
"id" : "subtest2name", "id" : "subtest2name",
"dataType" : 25, "dataType" : 25,
...@@ -246,6 +253,14 @@ ...@@ -246,6 +253,14 @@
"name" : "SUBTEST2NAME", "name" : "SUBTEST2NAME",
"codeName" : "SubTest2Name" "codeName" : "SubTest2Name"
} }
}, {
"id" : "psubtest2id",
"hidden" : true,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "PSUBTEST2ID",
"codeName" : "Psubtest2id"
}
}, { }, {
"id" : "createman", "id" : "createman",
"dataType" : 25, "dataType" : 25,
...@@ -291,12 +306,44 @@ ...@@ -291,12 +306,44 @@
"name" : "formpage1", "name" : "formpage1",
"getPSDEFormDetails" : [ { "getPSDEFormDetails" : [ {
"actionGroupExtractMode" : "ITEM", "actionGroupExtractMode" : "ITEM",
"caption" : "子测试实体基本信息", "caption" : "条件组",
"codeName" : "group1", "codeName" : "group1",
"detailStyle" : "DEFAULT", "detailStyle" : "DEFAULT",
"detailType" : "GROUPPANEL", "detailType" : "GROUPPANEL",
"name" : "group1", "name" : "group1",
"getPSDEFormDetails" : [ { "getPSDEFormDetails" : [ {
"caption" : "条件类型",
"codeName" : "condtype",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "condtype",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "CONDTYPE",
"codeName" : "CondType"
},
"getPSEditor" : {
"editorType" : "DROPDOWNLIST",
"name" : "condtype",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CondType.json"
},
"singleSelect" : true
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"needCodeListConfig" : true,
"showCaption" : true
}, {
"getCapPSLanguageRes" : { "getCapPSLanguageRes" : {
"defaultContent" : "子测试实体名称", "defaultContent" : "子测试实体名称",
"lanResTag" : "DEF.LNAME.SUBTEST2NAME", "lanResTag" : "DEF.LNAME.SUBTEST2NAME",
...@@ -330,6 +377,33 @@ ...@@ -330,6 +377,33 @@
}, },
"allowEmpty" : true, "allowEmpty" : true,
"showCaption" : true "showCaption" : true
}, {
"caption" : "父节点",
"codeName" : "psubtest2id",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "psubtest2id",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "PSUBTEST2ID",
"codeName" : "Psubtest2id"
},
"getPSEditor" : {
"editorType" : "HIDDEN",
"name" : "psubtest2id"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"hidden" : true,
"showCaption" : true
} ], } ],
"getPSLayout" : { "getPSLayout" : {
"childColLG" : -1, "childColLG" : -1,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/SubTest2SingleCondEditView.json
浏览文件 @ c99d2353
...@@ -253,6 +253,14 @@ ...@@ -253,6 +253,14 @@
"name" : "SUBTEST2NAME", "name" : "SUBTEST2NAME",
"codeName" : "SubTest2Name" "codeName" : "SubTest2Name"
} }
}, {
"id" : "psubtest2id",
"hidden" : true,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "PSUBTEST2ID",
"codeName" : "Psubtest2id"
}
}, { }, {
"id" : "createman", "id" : "createman",
"dataType" : 25, "dataType" : 25,
...@@ -369,6 +377,33 @@ ...@@ -369,6 +377,33 @@
}, },
"allowEmpty" : true, "allowEmpty" : true,
"showCaption" : true "showCaption" : true
}, {
"caption" : "父节点",
"codeName" : "psubtest2id",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "psubtest2id",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "PSUBTEST2ID",
"codeName" : "Psubtest2id"
},
"getPSEditor" : {
"editorType" : "HIDDEN",
"name" : "psubtest2id"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"hidden" : true,
"showCaption" : true
} ], } ],
"getPSLayout" : { "getPSLayout" : {
"childColLG" : -1, "childColLG" : -1,
......
trainsys-provider/pom.xml
浏览文件 @ c99d2353
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<profiles> <profiles>
<profile> <profile>
<id>runtime</id> <id>trainsys</id>
<build> <build>
<resources> <resources>
<resource> <resource>
......
trainsys-provider/src/main/docker/Dockerfile
浏览文件 @ c99d2353
...@@ -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 8081 EXPOSE 50000
ADD trainsys-provider.jar /trainsys-provider.jar ADD trainsys-provider.jar /trainsys-provider.jar
trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
浏览文件 @ c99d2353
...@@ -22,7 +22,32 @@ spec: ...@@ -22,7 +22,32 @@ 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: 8081 - containerPort: 50000
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
...@@ -35,9 +60,9 @@ spec: ...@@ -35,9 +60,9 @@ spec:
type: NodePort type: NodePort
ports: ports:
- name: http - name: http
port: 8081 port: 50000
targetPort: 8081 targetPort: 50000
nodePort: 8081 nodePort: 50000
protocol: TCP protocol: TCP
selector: selector:
app: trainsys-provider app: trainsys-provider
......
trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
浏览文件 @ c99d2353
...@@ -3,9 +3,23 @@ services: ...@@ -3,9 +3,23 @@ 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:
- "8081:8081" - "50000:50000"
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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或