Skip to content

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

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

上级 8c7946a1
隐藏空白字符变更
内嵌 并排
正在显示 包含 425 行增加 和 8 行删除
config.xml
浏览文件 @ 1ea32be9
...@@ -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/TEST/PSFORMS/Usr04119448EditView_Form.json
浏览文件 @ 1ea32be9
...@@ -119,6 +119,41 @@ ...@@ -119,6 +119,41 @@
"name" : "TESTNAME", "name" : "TESTNAME",
"codeName" : "TESTName" "codeName" : "TESTName"
} }
}, {
"id" : "field8",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "FIELD8",
"codeName" : "Field8"
}
}, {
"id" : "field13",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "FIELD13",
"codeName" : "FIELD13"
}
}, {
"id" : "field7",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "FIELD7",
"codeName" : "Field7"
}
}, {
"id" : "field20",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "FIELD20",
"codeName" : "FIELD20"
}
}, {
"id" : "field24",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "FIELD24",
"codeName" : "FIELD24"
}
}, { }, {
"id" : "createman", "id" : "createman",
"dataType" : 25, "dataType" : 25,
...@@ -196,6 +231,141 @@ ...@@ -196,6 +231,141 @@
}, },
"allowEmpty" : true, "allowEmpty" : true,
"showCaption" : true "showCaption" : true
}, {
"caption" : "属性8",
"codeName" : "field8",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "field8",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "FIELD8",
"codeName" : "Field8"
},
"getPSEditor" : {
"editorType" : "TEXTBOX",
"maxLength" : 100,
"name" : "field8"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "属性13",
"codeName" : "field13",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "field13",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "FIELD13",
"codeName" : "FIELD13"
},
"getPSEditor" : {
"editorType" : "TEXTBOX",
"maxLength" : 100,
"name" : "field13"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "属性7",
"codeName" : "field7",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "field7",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "FIELD7",
"codeName" : "Field7"
},
"getPSEditor" : {
"editorType" : "TEXTBOX",
"maxLength" : 100,
"name" : "field7"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "属性20",
"codeName" : "field20",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "field20",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "FIELD20",
"codeName" : "FIELD20"
},
"getPSEditor" : {
"editorType" : "TEXTBOX",
"maxLength" : 100,
"name" : "field20"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "属性24",
"codeName" : "field24",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "field24",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "FIELD24",
"codeName" : "FIELD24"
},
"getPSEditor" : {
"editorType" : "TEXTBOX",
"maxLength" : 100,
"name" : "field24"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"showCaption" : true
} ], } ],
"getPSLayout" : { "getPSLayout" : {
"childColLG" : -1, "childColLG" : -1,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSGRIDS/Usr04114651GridExpView_Grid.json
浏览文件 @ 1ea32be9
...@@ -22,6 +22,11 @@ ...@@ -22,6 +22,11 @@
"groupMode" : "NONE", "groupMode" : "NONE",
"hookEventNames" : [ "SELECTIONCHANGE", "LOAD" ], "hookEventNames" : [ "SELECTIONCHANGE", "LOAD" ],
"logicName" : "动态代码表刷新_表格", "logicName" : "动态代码表刷新_表格",
"getNavPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr04119448EditView.json",
"viewType" : "DEEDITVIEW"
},
"getPSAppDataEntity" : { "getPSAppDataEntity" : {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr04114651GridExpView.json
浏览文件 @ 1ea32be9
...@@ -49,6 +49,15 @@ ...@@ -49,6 +49,15 @@
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}, },
"getPSAppViewRefs" : [ {
"name" : "EXPITEM:DEFAULT",
"realTitle" : "动态代码表刷新编辑器",
"getRefPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr04119448EditView.json",
"viewType" : "DEEDITVIEW"
}
} ],
"getPSControlHandler" : { "getPSControlHandler" : {
"enableDEFieldPrivilege" : false, "enableDEFieldPrivilege" : false,
"id" : "gridexpbar" "id" : "gridexpbar"
...@@ -82,6 +91,11 @@ ...@@ -82,6 +91,11 @@
"groupMode" : "NONE", "groupMode" : "NONE",
"hookEventNames" : [ "SELECTIONCHANGE", "LOAD" ], "hookEventNames" : [ "SELECTIONCHANGE", "LOAD" ],
"logicName" : "动态代码表刷新_表格", "logicName" : "动态代码表刷新_表格",
"getNavPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr04119448EditView.json",
"viewType" : "DEEDITVIEW"
},
"getPSAppDataEntity" : { "getPSAppDataEntity" : {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr04119448EditView.json
浏览文件 @ 1ea32be9
...@@ -237,6 +237,41 @@ ...@@ -237,6 +237,41 @@
"name" : "TESTNAME", "name" : "TESTNAME",
"codeName" : "TESTName" "codeName" : "TESTName"
} }
}, {
"id" : "field8",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "FIELD8",
"codeName" : "Field8"
}
}, {
"id" : "field13",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "FIELD13",
"codeName" : "FIELD13"
}
}, {
"id" : "field7",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "FIELD7",
"codeName" : "Field7"
}
}, {
"id" : "field20",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "FIELD20",
"codeName" : "FIELD20"
}
}, {
"id" : "field24",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "FIELD24",
"codeName" : "FIELD24"
}
}, { }, {
"id" : "createman", "id" : "createman",
"dataType" : 25, "dataType" : 25,
...@@ -314,6 +349,141 @@ ...@@ -314,6 +349,141 @@
}, },
"allowEmpty" : true, "allowEmpty" : true,
"showCaption" : true "showCaption" : true
}, {
"caption" : "属性8",
"codeName" : "field8",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "field8",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "FIELD8",
"codeName" : "Field8"
},
"getPSEditor" : {
"editorType" : "TEXTBOX",
"maxLength" : 100,
"name" : "field8"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "属性13",
"codeName" : "field13",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "field13",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "FIELD13",
"codeName" : "FIELD13"
},
"getPSEditor" : {
"editorType" : "TEXTBOX",
"maxLength" : 100,
"name" : "field13"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "属性7",
"codeName" : "field7",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "field7",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "FIELD7",
"codeName" : "Field7"
},
"getPSEditor" : {
"editorType" : "TEXTBOX",
"maxLength" : 100,
"name" : "field7"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "属性20",
"codeName" : "field20",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "field20",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "FIELD20",
"codeName" : "FIELD20"
},
"getPSEditor" : {
"editorType" : "TEXTBOX",
"maxLength" : 100,
"name" : "field20"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "属性24",
"codeName" : "field24",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "field24",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "FIELD24",
"codeName" : "FIELD24"
},
"getPSEditor" : {
"editorType" : "TEXTBOX",
"maxLength" : 100,
"name" : "field24"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"showCaption" : true
} ], } ],
"getPSLayout" : { "getPSLayout" : {
"childColLG" : -1, "childColLG" : -1,
...@@ -607,7 +777,6 @@ ...@@ -607,7 +777,6 @@
"layoutPanel" : true, "layoutPanel" : true,
"useDefaultLayout" : true "useDefaultLayout" : true
}, },
"refFlag" : false,
"title" : "动态代码表刷新编辑器", "title" : "动态代码表刷新编辑器",
"viewStyle" : "DEFAULT", "viewStyle" : "DEFAULT",
"viewType" : "DEEDITVIEW", "viewType" : "DEEDITVIEW",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ 1ea32be9
...@@ -62068,6 +62068,15 @@ ...@@ -62068,6 +62068,15 @@
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}, },
"getPSAppViewRefs" : [ {
"name" : "EXPITEM:DEFAULT",
"realTitle" : "动态代码表刷新编辑器",
"getRefPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr04119448EditView.json",
"viewType" : "DEEDITVIEW"
}
} ],
"getPSControlHandler" : { "getPSControlHandler" : {
"enableDEFieldPrivilege" : false, "enableDEFieldPrivilege" : false,
"id" : "gridexpbar" "id" : "gridexpbar"
...@@ -62101,6 +62110,11 @@ ...@@ -62101,6 +62110,11 @@
"groupMode" : "NONE", "groupMode" : "NONE",
"hookEventNames" : [ "SELECTIONCHANGE", "LOAD" ], "hookEventNames" : [ "SELECTIONCHANGE", "LOAD" ],
"logicName" : "动态代码表刷新_表格", "logicName" : "动态代码表刷新_表格",
"getNavPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr04119448EditView.json",
"viewType" : "DEEDITVIEW"
},
"getPSAppDataEntity" : { "getPSAppDataEntity" : {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
trainsys-provider/pom.xml
浏览文件 @ 1ea32be9
...@@ -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
浏览文件 @ 1ea32be9
...@@ -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
浏览文件 @ 1ea32be9
...@@ -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
浏览文件 @ 1ea32be9
...@@ -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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或