提交 8f01d91c 编写于 作者: ibizdev's avatar ibizdev

tony001 发布系统代码 [TrainSys,网页端]

上级 89eb4b0c
......@@ -55,12 +55,6 @@
git clone -b master $para2 trainsys/
export NODE_OPTIONS=--max-old-space-size=4096
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>
</hudson.tasks.Shell>
</builders>
......
......@@ -4,6 +4,9 @@
"getPSAppBICubes" : [ {
"modelref" : true,
"path" : "PSSYSAPPS/TemplatePublish/PSAPPBISCHEMES/BIScheme/PSAPPBICUBES/Cube.json"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/TemplatePublish/PSAPPBISCHEMES/BIScheme/PSAPPBICUBES/Cube2.json"
} ],
"getPSAppBIReports" : [ {
"modelref" : true,
......
......@@ -5,7 +5,7 @@
"getPSAppBICubeDimensions" : [ {
"codeName" : "Dimension",
"dimensionType" : "COMMON",
"name" : "abc",
"name" : "编号",
"getPSAppDEField" : {
"name" : "SN",
"codeName" : "SN"
......@@ -15,7 +15,7 @@
"aggMode" : "COUNT",
"codeName" : "Measure",
"measureType" : "COMMON",
"name" : "test",
"name" : "指标",
"getPSAppDEField" : {
"name" : "SN",
"codeName" : "SN"
......
{
"codeName" : "Cube2",
"dynaModelFilePath" : "PSSYSAPPS/TemplatePublish/PSAPPBISCHEMES/BIScheme/PSAPPBICUBES/Cube2.json",
"name" : "测试立方体2",
"getPSAppBICubeDimensions" : [ {
"codeName" : "Dimension",
"dimensionType" : "COMMON",
"name" : "维度2",
"getPSAppDEField" : {
"name" : "SN",
"codeName" : "SN"
}
}, {
"codeName" : "Dimension2",
"dimensionType" : "COMMON",
"name" : "维度3",
"getPSAppDEField" : {
"name" : "SN",
"codeName" : "SN"
}
} ],
"getPSAppBICubeMeasures" : [ {
"aggMode" : "MAX",
"codeName" : "Measure",
"measureType" : "COMMON",
"name" : "指标2",
"getPSAppDEField" : {
"name" : "SN",
"codeName" : "SN"
}
}, {
"aggMode" : "AVG",
"codeName" : "Measure2",
"measureType" : "COMMON",
"name" : "指标3",
"getPSAppDEField" : {
"name" : "SN",
"codeName" : "SN"
}
} ],
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/BXD.json"
}
}
\ No newline at end of file
{
"dynaModelFilePath" : "PSSYSAPPS/TemplatePublish/PSAPPBISCHEMES/BIScheme2.json",
"name" : "智能报表2",
"getPSAppBICubes" : [ {
"modelref" : true,
"path" : "PSSYSAPPS/TemplatePublish/PSAPPBISCHEMES/BIScheme2/PSAPPBICUBES/Cube.json"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/TemplatePublish/PSAPPBISCHEMES/BIScheme2/PSAPPBICUBES/Cube2.json"
} ],
"uniqueTag" : "BIScheme2"
}
\ No newline at end of file
{
"codeName" : "Cube",
"dynaModelFilePath" : "PSSYSAPPS/TemplatePublish/PSAPPBISCHEMES/BIScheme2/PSAPPBICUBES/Cube.json",
"name" : "立方体A",
"getPSAppBICubeDimensions" : [ {
"codeName" : "Dimension",
"dimensionType" : "COMMON",
"name" : "维度A",
"getPSAppDEField" : {
"name" : "SN",
"codeName" : "SN"
}
} ],
"getPSAppBICubeMeasures" : [ {
"aggMode" : "SUM",
"codeName" : "Measure",
"measureType" : "COMMON",
"name" : "指标A",
"getPSAppDEField" : {
"name" : "SN",
"codeName" : "SN"
}
} ],
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/BXD.json"
}
}
\ No newline at end of file
{
"codeName" : "Cube2",
"dynaModelFilePath" : "PSSYSAPPS/TemplatePublish/PSAPPBISCHEMES/BIScheme2/PSAPPBICUBES/Cube2.json",
"name" : "立方体B",
"getPSAppBICubeDimensions" : [ {
"codeName" : "Dimension",
"dimensionType" : "COMMON",
"name" : "维度B",
"getPSAppDEField" : {
"name" : "SN",
"codeName" : "SN"
}
} ],
"getPSAppBICubeMeasures" : [ {
"aggMode" : "COUNT",
"codeName" : "Measure",
"measureType" : "COMMON",
"name" : "指标B",
"getPSAppDEField" : {
"name" : "SN",
"codeName" : "SN"
}
} ],
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/BXD.json"
}
}
\ No newline at end of file
......@@ -2,6 +2,9 @@
"getAllPSAppBISchemes" : [ {
"modelref" : true,
"path" : "PSSYSAPPS/TemplatePublish/PSAPPBISCHEMES/BIScheme.json"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/TemplatePublish/PSAPPBISCHEMES/BIScheme2.json"
} ],
"getAllPSAppCodeLists" : [ {
"codeListTag" : "ModelRepository__CodeList44",
......
......@@ -4,6 +4,9 @@
"getPSAppBICubes" : [ {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPBISCHEMES/BIScheme/PSAPPBICUBES/Cube.json"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPBISCHEMES/BIScheme/PSAPPBICUBES/Cube2.json"
} ],
"getPSAppBIReports" : [ {
"modelref" : true,
......
......@@ -5,7 +5,7 @@
"getPSAppBICubeDimensions" : [ {
"codeName" : "Dimension",
"dimensionType" : "COMMON",
"name" : "abc",
"name" : "编号",
"getPSAppDEField" : {
"name" : "SN",
"codeName" : "SN"
......@@ -15,7 +15,7 @@
"aggMode" : "COUNT",
"codeName" : "Measure",
"measureType" : "COMMON",
"name" : "test",
"name" : "指标",
"getPSAppDEField" : {
"name" : "SN",
"codeName" : "SN"
......
{
"codeName" : "Cube2",
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPBISCHEMES/BIScheme/PSAPPBICUBES/Cube2.json",
"name" : "测试立方体2",
"getPSAppBICubeDimensions" : [ {
"codeName" : "Dimension",
"dimensionType" : "COMMON",
"name" : "维度2",
"getPSAppDEField" : {
"name" : "SN",
"codeName" : "SN"
}
}, {
"codeName" : "Dimension2",
"dimensionType" : "COMMON",
"name" : "维度3",
"getPSAppDEField" : {
"name" : "SN",
"codeName" : "SN"
}
} ],
"getPSAppBICubeMeasures" : [ {
"aggMode" : "MAX",
"codeName" : "Measure",
"measureType" : "COMMON",
"name" : "指标2",
"getPSAppDEField" : {
"name" : "SN",
"codeName" : "SN"
}
}, {
"aggMode" : "AVG",
"codeName" : "Measure2",
"measureType" : "COMMON",
"name" : "指标3",
"getPSAppDEField" : {
"name" : "SN",
"codeName" : "SN"
}
} ],
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
}
}
\ No newline at end of file
{
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPBISCHEMES/BIScheme2.json",
"name" : "智能报表2",
"getPSAppBICubes" : [ {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPBISCHEMES/BIScheme2/PSAPPBICUBES/Cube.json"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPBISCHEMES/BIScheme2/PSAPPBICUBES/Cube2.json"
} ],
"uniqueTag" : "BIScheme2"
}
\ No newline at end of file
{
"codeName" : "Cube",
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPBISCHEMES/BIScheme2/PSAPPBICUBES/Cube.json",
"name" : "立方体A",
"getPSAppBICubeDimensions" : [ {
"codeName" : "Dimension",
"dimensionType" : "COMMON",
"name" : "维度A",
"getPSAppDEField" : {
"name" : "SN",
"codeName" : "SN"
}
} ],
"getPSAppBICubeMeasures" : [ {
"aggMode" : "SUM",
"codeName" : "Measure",
"measureType" : "COMMON",
"name" : "指标A",
"getPSAppDEField" : {
"name" : "SN",
"codeName" : "SN"
}
} ],
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
}
}
\ No newline at end of file
{
"codeName" : "Cube2",
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPBISCHEMES/BIScheme2/PSAPPBICUBES/Cube2.json",
"name" : "立方体B",
"getPSAppBICubeDimensions" : [ {
"codeName" : "Dimension",
"dimensionType" : "COMMON",
"name" : "维度B",
"getPSAppDEField" : {
"name" : "SN",
"codeName" : "SN"
}
} ],
"getPSAppBICubeMeasures" : [ {
"aggMode" : "COUNT",
"codeName" : "Measure",
"measureType" : "COMMON",
"name" : "指标B",
"getPSAppDEField" : {
"name" : "SN",
"codeName" : "SN"
}
} ],
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
}
}
\ No newline at end of file
......@@ -3,6 +3,9 @@
"getAllPSAppBISchemes" : [ {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPBISCHEMES/BIScheme.json"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPBISCHEMES/BIScheme2.json"
} ],
"getAllPSAppCodeLists" : [ {
"codeListTag" : "CodeList46",
......@@ -40,7 +40,7 @@
"getAllPSSysBICubeDimensions" : [ {
"codeName" : "Dimension",
"dimensionType" : "COMMON",
"name" : "abc",
"name" : "编号",
"getPSDEField" : {
"name" : "SN",
"codeName" : "SN"
......@@ -50,7 +50,7 @@
"aggMode" : "COUNT",
"codeName" : "Measure",
"measureType" : "COMMON",
"name" : "test",
"name" : "指标",
"getPSDEField" : {
"name" : "SN",
"codeName" : "SN"
......@@ -62,10 +62,53 @@
"modelref" : true,
"path" : "PSMODULES/common/PSDATAENTITIES/BXD.json"
}
}, {
"getAllPSSysBICubeDimensions" : [ {
"codeName" : "Dimension",
"dimensionType" : "COMMON",
"name" : "维度2",
"getPSDEField" : {
"name" : "SN",
"codeName" : "SN"
}
}, {
"codeName" : "Dimension2",
"dimensionType" : "COMMON",
"name" : "维度3",
"getPSDEField" : {
"name" : "SN",
"codeName" : "SN"
}
} ],
"getAllPSSysBICubeMeasures" : [ {
"aggMode" : "MAX",
"codeName" : "Measure",
"measureType" : "COMMON",
"name" : "指标2",
"getPSDEField" : {
"name" : "SN",
"codeName" : "SN"
}
}, {
"aggMode" : "AVG",
"codeName" : "Measure2",
"measureType" : "COMMON",
"name" : "指标3",
"getPSDEField" : {
"name" : "SN",
"codeName" : "SN"
}
} ],
"codeName" : "Cube2",
"name" : "测试立方体2",
"getPSDataEntity" : {
"modelref" : true,
"path" : "PSMODULES/common/PSDATAENTITIES/BXD.json"
}
} ],
"getAllPSSysBIDimensions" : [ {
"codeName" : "Dimension",
"name" : "test"
"name" : "测试维度"
} ],
"getAllPSSysBIReports" : [ {
"codeName" : "BIReport",
......
{
"getAllPSSysBICubes" : [ {
"getAllPSSysBICubeDimensions" : [ {
"codeName" : "Dimension",
"dimensionType" : "COMMON",
"name" : "维度A",
"getPSDEField" : {
"name" : "SN",
"codeName" : "SN"
}
} ],
"getAllPSSysBICubeMeasures" : [ {
"aggMode" : "SUM",
"codeName" : "Measure",
"measureType" : "COMMON",
"name" : "指标A",
"getPSDEField" : {
"name" : "SN",
"codeName" : "SN"
}
} ],
"codeName" : "Cube",
"name" : "立方体A",
"getPSDataEntity" : {
"modelref" : true,
"path" : "PSMODULES/common/PSDATAENTITIES/BXD.json"
}
}, {
"getAllPSSysBICubeDimensions" : [ {
"codeName" : "Dimension",
"dimensionType" : "COMMON",
"name" : "维度B",
"getPSDEField" : {
"name" : "SN",
"codeName" : "SN"
}
} ],
"getAllPSSysBICubeMeasures" : [ {
"aggMode" : "COUNT",
"codeName" : "Measure",
"measureType" : "COMMON",
"name" : "指标B",
"getPSDEField" : {
"name" : "SN",
"codeName" : "SN"
}
} ],
"codeName" : "Cube2",
"name" : "立方体B",
"getPSDataEntity" : {
"modelref" : true,
"path" : "PSMODULES/common/PSDATAENTITIES/BXD.json"
}
} ],
"bIEngineType" : "USER",
"codeName" : "BIScheme2",
"dynaModelFilePath" : "PSSYSBISCHEMES/BIScheme2.json",
"name" : "智能报表2",
"uniqueTag" : "BIScheme2"
}
\ No newline at end of file
......@@ -707,6 +707,9 @@
"getAllPSSysBISchemes" : [ {
"modelref" : true,
"path" : "PSSYSBISCHEMES/BIScheme.json"
}, {
"modelref" : true,
"path" : "PSSYSBISCHEMES/BIScheme2.json"
} ],
"getAllPSSysBackServices" : [ {
"modelref" : true,
......
......@@ -33,7 +33,7 @@
<profiles>
<profile>
<id>trainsys</id>
<id>runtime</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 50000
EXPOSE 8081
ADD trainsys-provider.jar /trainsys-provider.jar
......@@ -22,32 +22,7 @@ spec:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
imagePullPolicy: Always
ports:
- 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"
- containerPort: 8081
---
apiVersion: v1
......@@ -60,9 +35,9 @@ spec:
type: NodePort
ports:
- name: http
port: 50000
targetPort: 50000
nodePort: 50000
port: 8081
targetPort: 8081
nodePort: 8081
protocol: TCP
selector:
app: trainsys-provider
......
......@@ -3,23 +3,9 @@ services:
trainsys-provider:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
ports:
- "50000:50000"
- "8081:8081"
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 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册