Skip to content

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

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

上级 c5eca03e
显示空白字符变更
内嵌 并排
正在显示 包含 112 行增加 和 87 行删除
config.xml
浏览文件 @ 72258a46
......@@ -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>
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
浏览文件 @ 72258a46
......@@ -1049,16 +1049,16 @@
"codeName" : "VMGroup2",
"name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息",
"name" : "视图消息2",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg2"
"id" : "ViewMsg3"
}
}, {
"name" : "视图消息2",
"name" : "视图消息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg3"
"id" : "ViewMsg2"
}
} ]
}, {
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Usr0301410774.json
浏览文件 @ 72258a46
......@@ -17,7 +17,6 @@
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
}
},
"height" : 500.0,
"hookEventNames" : [ "LOAD", "BEFORELOAD" ],
"logicName" : "Chart4",
"getPSAppDataEntity" : {
......@@ -119,7 +118,6 @@
"showTitle" : true,
"id" : "0"
},
"width" : 1000.0,
"readOnly" : true,
"modelid" : "6274794F-8C07-4A0E-B93D-C8D67964F846",
"modeltype" : "PSDECHART",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Usr0301490997.json
浏览文件 @ 72258a46
......@@ -5,12 +5,21 @@
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Usr0301490997.json",
"getFetchPSControlAction" : {
"modelref" : true,
"id" : "fetch"
"id" : "fetch",
"actionType" : "DEDATASET",
"name" : "fetch",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "FetchDefault"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
}
},
"height" : 500.0,
"hookEventNames" : [ "LOAD", "BEFORELOAD" ],
"logicName" : "Chart21",
"mOSFilePath" : "psmodules/common/psdataentities/REGINFO/psdecharts/Usr0301490997",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
......@@ -174,7 +183,6 @@
"showTitle" : true,
"id" : "0"
},
"rTMOSFilePath" : "pssysapps/Web/psappdeviews/ReginfoUsr0301959097ChartView/psappviewctrls/chart",
"width" : 1000.0,
"readOnly" : true,
"modelid" : "CBB33879-C789-40F7-862D-83DE2C0DF65C",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr0301959097ChartView.json
浏览文件 @ 72258a46
......@@ -228,10 +228,10 @@
"modelid" : "1732CB55-845D-4656-8C7D-3C76D610F062",
"modeltype" : "PSDEFORM_SEARCHFORM"
}, {
"codeName" : "Usr0301410774",
"codeName" : "Usr0301490997",
"controlType" : "CHART",
"coordinateSystem" : "NONE",
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Usr0301410774.json",
"coordinateSystem" : "XY",
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Usr0301490997.json",
"getFetchPSControlAction" : {
"modelref" : true,
"id" : "fetch",
......@@ -248,16 +248,34 @@
},
"height" : 500.0,
"hookEventNames" : [ "LOAD", "BEFORELOAD" ],
"logicName" : "Chart4",
"logicName" : "Chart21",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
},
"getPSChartCoordinateSystems" : [ {
"eChartsType" : "none",
"eChartsType" : "cartesian2d",
"index" : 0,
"name" : "[pie_0]无坐标系[0]",
"type" : "NONE",
"name" : "[line_0]直角坐标系[0]",
"getPSChartGrid" : {
"index" : 0,
"name" : "[line_0]直角坐标系[0]",
"getPSChartCoordinateSystem" : {
"modelref" : true,
"id" : "0"
},
"getPSChartGridXAxis0" : {
"modelref" : true,
"id" : "0"
},
"getPSChartGridYAxis0" : {
"modelref" : true,
"id" : "0"
},
"type" : "grid",
"id" : "0"
},
"type" : "XY",
"id" : "0"
} ],
"getPSChartDataSetGroups" : [ {
......@@ -275,7 +293,7 @@
} ],
"getPSChartDataSets" : [ {
"index" : 0,
"name" : "pie_0-DEFAULT",
"name" : "line_0-DEFAULT",
"getPSChartDataSetFields" : [ {
"index" : 0,
"name" : "NAME",
......@@ -293,6 +311,42 @@
} ],
"id" : "0"
} ],
"getPSChartGrids" : [ {
"index" : 0,
"name" : "[line_0]直角坐标系[0]",
"getPSChartCoordinateSystem" : {
"modelref" : true,
"id" : "0"
},
"getPSChartGridXAxis0" : {
"modelref" : true,
"id" : "0"
},
"getPSChartGridYAxis0" : {
"modelref" : true,
"id" : "0"
},
"type" : "grid",
"id" : "0"
} ],
"getPSChartXAxises" : [ {
"eChartsPos" : "xAxis",
"eChartsType" : "category",
"index" : 0,
"name" : "axis_xAxis_0",
"position" : "bottom",
"type" : "category",
"id" : "0"
} ],
"getPSChartYAxises" : [ {
"eChartsPos" : "yAxis",
"eChartsType" : "value",
"index" : 0,
"name" : "axis_yAxis_0",
"position" : "left",
"type" : "numeric",
"id" : "0"
} ],
"getPSControlHandler" : {
"getPSHandlerActions" : [ {
"actionName" : "Get",
......@@ -381,20 +435,20 @@
},
"getPSDEChartLegend" : {
"index" : 0,
"legendPos" : "TOP",
"legendPos" : "RIGHT",
"showLegend" : true,
"id" : "0"
},
"getPSDEChartSerieses" : [ {
"caption" : "访问来源",
"caption" : "学生年龄信息",
"catalogField" : "NAME",
"getCatalogPSCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
},
"eChartsType" : "pie",
"eChartsType" : "line",
"index" : 0,
"name" : "pie_0",
"name" : "line_0",
"getPSChartCoordinateSystem" : {
"modelref" : true,
"id" : "0"
......@@ -404,33 +458,43 @@
"id" : "0"
},
"getPSChartSeriesEncode" : {
"category" : "NAME",
"index" : 0,
"name" : "坐标系编码",
"type" : "NONE",
"value" : "AGE",
"getPSChartXAxis" : {
"modelref" : true,
"id" : "0"
},
"getPSChartYAxis" : {
"modelref" : true,
"id" : "0"
},
"type" : "XY",
"x" : [ "NAME" ],
"y" : [ "AGE" ],
"id" : "0"
},
"seriesLayoutBy" : "column",
"seriesType" : "pie",
"seriesType" : "line",
"step" : true,
"valueField" : "AGE",
"enableChartDataSet" : true
"enableChartDataSet" : true,
"stack" : false
} ],
"getPSDEChartTitle" : {
"index" : 0,
"subTitle" : "学生分类",
"title" : "饼图_图表",
"titlePos" : "RIGHT",
"subTitle" : "学生年龄信息",
"title" : "折线图_图表",
"titlePos" : "TOP",
"showTitle" : true,
"id" : "0"
},
"width" : 1000.0,
"readOnly" : true,
"name" : "chart",
"modelid" : "6274794F-8C07-4A0E-B93D-C8D67964F846",
"modelid" : "CBB33879-C789-40F7-862D-83DE2C0DF65C",
"modeltype" : "PSDECHART",
"getUserParam" : {
"EC.textStyle" : "{\"color\":\"#F5DF9D\",\"fontSize\":16}",
"EC.textStyle" : "{\"color\":\"#BBF4EC\",\"fontSize\":16}",
"EC.color" : "[\"#5470c6\",\"#91cc75\",\"#fac858\",\"#ee6666\",\"#73c0de\",\"#3ba272\",\"#fc8452\",\"#9a60b4\",\"#ea7ccc\",\"#5470c6\",\"#91cc75\"]"
}
}, {
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ 72258a46
......@@ -2271,16 +2271,16 @@
"codeName" : "VMGroup2",
"name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息",
"name" : "视图消息2",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg2"
"id" : "ViewMsg3"
}
}, {
"name" : "视图消息2",
"name" : "视图消息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg3"
"id" : "ViewMsg2"
}
} ]
} ],
......
trainsys-provider/pom.xml
浏览文件 @ 72258a46
......@@ -33,7 +33,7 @@
<profiles>
<profile>
<id>trainsys</id>
<id>runtime</id>
<build>
<resources>
<resource>
......
trainsys-provider/src/main/docker/Dockerfile
浏览文件 @ 72258a46
......@@ -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
trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
浏览文件 @ 72258a46
......@@ -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
......
trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
浏览文件 @ 72258a46
......@@ -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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或