提交 44c49ff2 编写于 作者: ibizdev's avatar ibizdev

lengyuace 部署微服务接口 [TrainSys,默认服务接口]

上级 d4f362c4
......@@ -55,15 +55,12 @@
git clone -b master $para2 trainsys/
export NODE_OPTIONS=--max-old-space-size=4096
cd trainsys/
mkdir -p /var/lib/jenkins/appcache/A3064A91-F42D-4D7F-BC1C-4173A4F5772C
if [ -e app_Web/.dynamic ]
then
cd app_Web
else
cd app_Web/app
fi
sed -i "s#dstimage#registry.cn-shanghai.aliyuncs.com/ibizsys/ibizcloud-standardsys-app-webapp:2022.09.01.001#g" swarm.yaml
docker -H $para1 stack deploy --compose-file=swarm.yaml ebsx --with-registry-auth
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>
</hudson.tasks.Shell>
</builders>
......
......@@ -1424,18 +1424,6 @@
"logicName" : "更新",
"name" : "UPDATE"
} ],
"getAllPSDESearches" : [ {
"dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/BXD/PSDESEARCHES/test__search1.json",
"name" : "BXD",
"getPSSysSearchDE" : {
"modelref" : true,
"id" : "Usr0315853911"
},
"getPSSysSearchScheme" : {
"modelref" : true,
"path" : "PSSYSSEARCHSCHEMES/test.json"
}
} ],
"getAllPSDEUserRoles" : [ {
"dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/BXD/PSDEUSERROLES/ALL_R.json",
"name" : "全部数据(读)",
......
......@@ -4353,18 +4353,6 @@
"name" : "Report2",
"reportType" : "JR"
} ],
"getAllPSDESearches" : [ {
"dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDESEARCHES/test__search1.json",
"name" : "PHONE",
"getPSSysSearchDE" : {
"modelref" : true,
"id" : "Usr0315403470"
},
"getPSSysSearchScheme" : {
"modelref" : true,
"path" : "PSSYSSEARCHSCHEMES/test.json"
}
} ],
"getAllPSDEUserRoles" : [ {
"dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEUSERROLES/ALL_R.json",
"name" : "全部数据(读)",
......
......@@ -77,6 +77,10 @@
"type" : "grid",
"id" : "0"
} ],
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"showLegend" : true,
......
......@@ -257,6 +257,10 @@
"showBusyIndicator" : true,
"id" : "CHART"
},
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"showLegend" : true,
......
......@@ -77,6 +77,10 @@
"type" : "grid",
"id" : "0"
} ],
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"showLegend" : true,
......
......@@ -257,6 +257,10 @@
"showBusyIndicator" : true,
"id" : "CHART"
},
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"showLegend" : true,
......
......@@ -352,6 +352,10 @@
"autoLoad" : true,
"showBusyIndicator" : true
},
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"showLegend" : true,
......@@ -758,6 +762,10 @@
"autoLoad" : true,
"showBusyIndicator" : true
},
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"legendPos" : "TOP",
......
......@@ -58,6 +58,10 @@
} ],
"id" : "0"
} ],
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"showLegend" : true,
......
......@@ -2203,6 +2203,10 @@
"autoLoad" : true,
"showBusyIndicator" : true
},
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"showLegend" : true,
......
......@@ -117,6 +117,10 @@
"type" : "numeric",
"id" : "0"
} ],
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"legendPos" : "BOTTOM",
......
......@@ -62,6 +62,10 @@
} ],
"id" : "0"
} ],
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"showLegend" : true,
......
......@@ -83,6 +83,10 @@
"type" : "radar",
"id" : "0"
} ],
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"legendPos" : "LEFT",
......
......@@ -122,6 +122,10 @@
"type" : "numeric",
"id" : "0"
} ],
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"showLegend" : true,
......
......@@ -63,6 +63,10 @@
} ],
"id" : "0"
} ],
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"legendPos" : "TOP",
......
......@@ -116,6 +116,10 @@
"type" : "numeric",
"id" : "0"
} ],
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"legendPos" : "RIGHT",
......
......@@ -125,6 +125,10 @@
"type" : "numeric",
"id" : "0"
} ],
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"legendPos" : "BOTTOM",
......
......@@ -77,6 +77,10 @@
"type" : "grid",
"id" : "0"
} ],
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"showLegend" : true,
......
......@@ -383,6 +383,10 @@
"autoLoad" : true,
"showBusyIndicator" : true
},
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"showLegend" : true,
......@@ -789,6 +793,10 @@
"autoLoad" : true,
"showBusyIndicator" : true
},
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"legendPos" : "TOP",
......
......@@ -243,6 +243,10 @@
"showBusyIndicator" : true,
"id" : "CHART"
},
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"showLegend" : true,
......
......@@ -278,6 +278,10 @@
"showBusyIndicator" : true,
"id" : "chartexpbar_chart"
},
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"showLegend" : true,
......
......@@ -470,6 +470,10 @@
"showBusyIndicator" : true,
"id" : "CHART"
},
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"legendPos" : "BOTTOM",
......
......@@ -416,6 +416,10 @@
"showBusyIndicator" : true,
"id" : "CHART"
},
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"legendPos" : "TOP",
......
......@@ -304,6 +304,10 @@
"showBusyIndicator" : true,
"id" : "CHART"
},
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"legendPos" : "BOTTOM",
......
......@@ -262,6 +262,10 @@
"showBusyIndicator" : true,
"id" : "CHART"
},
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"legendPos" : "LEFT",
......
......@@ -488,6 +488,10 @@
"showBusyIndicator" : true,
"id" : "CHART"
},
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"showLegend" : true,
......
......@@ -241,6 +241,10 @@
"showBusyIndicator" : true,
"id" : "CHART"
},
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"showLegend" : true,
......
......@@ -401,6 +401,10 @@
"showBusyIndicator" : true,
"id" : "CHART"
},
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"legendPos" : "RIGHT",
......
......@@ -265,6 +265,10 @@
"showBusyIndicator" : true,
"id" : "chartexpbar_chart"
},
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"legendPos" : "RIGHT",
......
......@@ -256,6 +256,10 @@
"showBusyIndicator" : true,
"id" : "CHART"
},
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"showLegend" : true,
......
......@@ -2234,6 +2234,10 @@
"autoLoad" : true,
"showBusyIndicator" : true
},
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"showLegend" : true,
......
......@@ -2234,6 +2234,10 @@
"autoLoad" : true,
"showBusyIndicator" : true
},
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"showLegend" : true,
......
......@@ -451,6 +451,10 @@
"showBusyIndicator" : true,
"id" : "CHART"
},
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"showLegend" : true,
......
......@@ -4359,6 +4359,10 @@
"autoLoad" : true,
"showBusyIndicator" : true
},
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"showLegend" : true,
......
......@@ -9922,6 +9922,10 @@
"autoLoad" : true,
"showBusyIndicator" : true
},
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"showLegend" : true,
......@@ -13126,6 +13130,10 @@
"autoLoad" : true,
"showBusyIndicator" : true
},
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"legendPos" : "TOP",
......@@ -28075,6 +28083,10 @@
"autoLoad" : true,
"showBusyIndicator" : true
},
"getPSDEChartDataGrid" : {
"index" : 0,
"id" : "0"
},
"getPSDEChartLegend" : {
"index" : 0,
"showLegend" : true,
......@@ -1343,10 +1343,6 @@
"modelref" : true,
"path" : "PSSYSSAMPLEVALUES/SampleValue4.json"
} ],
"getAllPSSysSearchSchemes" : [ {
"modelref" : true,
"path" : "PSSYSSEARCHSCHEMES/test.json"
} ],
"getAllPSSysServiceAPIs" : [ {
"modelref" : true,
"path" : "PSSYSSERVICEAPIS/TrainSys.json"
......
......@@ -33,7 +33,7 @@
<profiles>
<profile>
<id>runtime</id>
<id>trainsys</id>
<build>
<resources>
<resource>
......
......@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
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
......@@ -22,7 +22,32 @@ spec:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
imagePullPolicy: Always
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
......@@ -35,9 +60,9 @@ spec:
type: NodePort
ports:
- name: http
port: 8081
targetPort: 8081
nodePort: 8081
port: 50000
targetPort: 50000
nodePort: 50000
protocol: TCP
selector:
app: trainsys-provider
......
......@@ -3,9 +3,23 @@ services:
trainsys-provider:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
ports:
- "8081:8081"
- "50000:50000"
networks:
- 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:
resources:
limits:
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册