Skip to content

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

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

上级 6df71031
显示空白字符变更
内嵌 并排
正在显示 包含 568 行增加 和 382 行删除
config.xml
浏览文件 @ dab2e362
......@@ -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/Web/PSAPPDATAENTITIES/Student/PSDASHBOARDS/ScreenDashboardView_Dashboard.json
浏览文件 @ dab2e362
......@@ -1737,9 +1737,11 @@
}, {
"id" : "field_datepicker"
}, {
"id" : "field_text_dynamic"
"id" : "field_text_dynamic",
"viewFieldName" : "number"
}, {
"id" : "field_text_dynamic1"
"id" : "field_text_dynamic1",
"viewFieldName" : "number"
} ],
"codeName" : "Usr0807407624",
"controlType" : "VIEWLAYOUTPANEL",
......@@ -1934,6 +1936,20 @@
},
"valueFormat" : "YYYY-MM"
}, {
"caption" : "单项数据容器",
"dataRegionType" : "SINGLEDATA",
"dataSourceType" : "CUSTOM",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container_singledata",
"getPSLayout" : {
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSPanelItems" : [ {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
"itemType" : "FIELD",
......@@ -1951,7 +1967,8 @@
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
}
},
"viewFieldName" : "number"
}, {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
......@@ -1967,7 +1984,11 @@
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
}
},
"viewFieldName" : "number"
} ],
"predefinedType" : "CONTAINER_SINGLEDATA",
"scriptCode" : "{number:\"13246\"}"
}, {
"caption" : "图表",
"itemStyle" : "DEFAULT",
......@@ -3127,9 +3148,11 @@
}, {
"id" : "field_datepicker"
}, {
"id" : "field_text_dynamic"
"id" : "field_text_dynamic",
"viewFieldName" : "number"
}, {
"id" : "field_text_dynamic1"
"id" : "field_text_dynamic1",
"viewFieldName" : "number"
} ],
"codeName" : "Usr0807407624",
"controlType" : "VIEWLAYOUTPANEL",
......@@ -3324,6 +3347,20 @@
},
"valueFormat" : "YYYY-MM"
}, {
"caption" : "单项数据容器",
"dataRegionType" : "SINGLEDATA",
"dataSourceType" : "CUSTOM",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container_singledata",
"getPSLayout" : {
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSPanelItems" : [ {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
"itemType" : "FIELD",
......@@ -3341,7 +3378,8 @@
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
}
},
"viewFieldName" : "number"
}, {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
......@@ -3357,7 +3395,11 @@
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
}
},
"viewFieldName" : "number"
} ],
"predefinedType" : "CONTAINER_SINGLEDATA",
"scriptCode" : "{number:\"13246\"}"
}, {
"caption" : "图表",
"itemStyle" : "DEFAULT",
......@@ -3875,9 +3917,11 @@
}, {
"id" : "field_datepicker"
}, {
"id" : "field_text_dynamic"
"id" : "field_text_dynamic",
"viewFieldName" : "number"
}, {
"id" : "field_text_dynamic1"
"id" : "field_text_dynamic1",
"viewFieldName" : "number"
} ],
"codeName" : "Usr0807407624",
"controlType" : "VIEWLAYOUTPANEL",
......@@ -4072,6 +4116,20 @@
},
"valueFormat" : "YYYY-MM"
}, {
"caption" : "单项数据容器",
"dataRegionType" : "SINGLEDATA",
"dataSourceType" : "CUSTOM",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container_singledata",
"getPSLayout" : {
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSPanelItems" : [ {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
"itemType" : "FIELD",
......@@ -4089,7 +4147,8 @@
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
}
},
"viewFieldName" : "number"
}, {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
......@@ -4105,7 +4164,11 @@
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
}
},
"viewFieldName" : "number"
} ],
"predefinedType" : "CONTAINER_SINGLEDATA",
"scriptCode" : "{number:\"13246\"}"
}, {
"caption" : "图表",
"itemStyle" : "DEFAULT",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/studentScreenDashboardView.json
浏览文件 @ dab2e362
......@@ -1895,9 +1895,11 @@
}, {
"id" : "field_datepicker"
}, {
"id" : "field_text_dynamic"
"id" : "field_text_dynamic",
"viewFieldName" : "number"
}, {
"id" : "field_text_dynamic1"
"id" : "field_text_dynamic1",
"viewFieldName" : "number"
} ],
"codeName" : "Usr0807407624",
"controlType" : "VIEWLAYOUTPANEL",
......@@ -2092,6 +2094,20 @@
},
"valueFormat" : "YYYY-MM"
}, {
"caption" : "单项数据容器",
"dataRegionType" : "SINGLEDATA",
"dataSourceType" : "CUSTOM",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container_singledata",
"getPSLayout" : {
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSPanelItems" : [ {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
"itemType" : "FIELD",
......@@ -2109,7 +2125,8 @@
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
}
},
"viewFieldName" : "number"
}, {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
......@@ -2125,7 +2142,11 @@
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
}
},
"viewFieldName" : "number"
} ],
"predefinedType" : "CONTAINER_SINGLEDATA",
"scriptCode" : "{number:\"13246\"}"
}, {
"caption" : "图表",
"itemStyle" : "DEFAULT",
......@@ -3285,9 +3306,11 @@
}, {
"id" : "field_datepicker"
}, {
"id" : "field_text_dynamic"
"id" : "field_text_dynamic",
"viewFieldName" : "number"
}, {
"id" : "field_text_dynamic1"
"id" : "field_text_dynamic1",
"viewFieldName" : "number"
} ],
"codeName" : "Usr0807407624",
"controlType" : "VIEWLAYOUTPANEL",
......@@ -3482,6 +3505,20 @@
},
"valueFormat" : "YYYY-MM"
}, {
"caption" : "单项数据容器",
"dataRegionType" : "SINGLEDATA",
"dataSourceType" : "CUSTOM",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container_singledata",
"getPSLayout" : {
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSPanelItems" : [ {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
"itemType" : "FIELD",
......@@ -3499,7 +3536,8 @@
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
}
},
"viewFieldName" : "number"
}, {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
......@@ -3515,7 +3553,11 @@
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
}
},
"viewFieldName" : "number"
} ],
"predefinedType" : "CONTAINER_SINGLEDATA",
"scriptCode" : "{number:\"13246\"}"
}, {
"caption" : "图表",
"itemStyle" : "DEFAULT",
......@@ -4033,9 +4075,11 @@
}, {
"id" : "field_datepicker"
}, {
"id" : "field_text_dynamic"
"id" : "field_text_dynamic",
"viewFieldName" : "number"
}, {
"id" : "field_text_dynamic1"
"id" : "field_text_dynamic1",
"viewFieldName" : "number"
} ],
"codeName" : "Usr0807407624",
"controlType" : "VIEWLAYOUTPANEL",
......@@ -4230,6 +4274,20 @@
},
"valueFormat" : "YYYY-MM"
}, {
"caption" : "单项数据容器",
"dataRegionType" : "SINGLEDATA",
"dataSourceType" : "CUSTOM",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container_singledata",
"getPSLayout" : {
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSPanelItems" : [ {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
"itemType" : "FIELD",
......@@ -4247,7 +4305,8 @@
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
}
},
"viewFieldName" : "number"
}, {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
......@@ -4263,7 +4322,11 @@
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
}
},
"viewFieldName" : "number"
} ],
"predefinedType" : "CONTAINER_SINGLEDATA",
"scriptCode" : "{number:\"13246\"}"
}, {
"caption" : "图表",
"itemStyle" : "DEFAULT",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/studentUsr08078912ChartView.json
浏览文件 @ dab2e362
......@@ -20,9 +20,11 @@
}, {
"id" : "field_datepicker"
}, {
"id" : "field_text_dynamic"
"id" : "field_text_dynamic",
"viewFieldName" : "number"
}, {
"id" : "field_text_dynamic1"
"id" : "field_text_dynamic1",
"viewFieldName" : "number"
} ],
"codeName" : "Usr0807407624",
"controlType" : "VIEWLAYOUTPANEL",
......@@ -217,6 +219,20 @@
},
"valueFormat" : "YYYY-MM"
}, {
"caption" : "单项数据容器",
"dataRegionType" : "SINGLEDATA",
"dataSourceType" : "CUSTOM",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container_singledata",
"getPSLayout" : {
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSPanelItems" : [ {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
"itemType" : "FIELD",
......@@ -234,7 +250,8 @@
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
}
},
"viewFieldName" : "number"
}, {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
......@@ -250,7 +267,11 @@
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
}
},
"viewFieldName" : "number"
} ],
"predefinedType" : "CONTAINER_SINGLEDATA",
"scriptCode" : "{number:\"13246\"}"
}, {
"caption" : "图表",
"itemStyle" : "DEFAULT",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ dab2e362
......@@ -14589,9 +14589,11 @@
}, {
"id" : "field_datepicker"
}, {
"id" : "field_text_dynamic"
"id" : "field_text_dynamic",
"viewFieldName" : "number"
}, {
"id" : "field_text_dynamic1"
"id" : "field_text_dynamic1",
"viewFieldName" : "number"
} ],
"codeName" : "Usr0807407624",
"controlType" : "VIEWLAYOUTPANEL",
......@@ -14786,6 +14788,20 @@
},
"valueFormat" : "YYYY-MM"
}, {
"caption" : "单项数据容器",
"dataRegionType" : "SINGLEDATA",
"dataSourceType" : "CUSTOM",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container_singledata",
"getPSLayout" : {
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSPanelItems" : [ {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
"itemType" : "FIELD",
......@@ -14803,7 +14819,8 @@
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
}
},
"viewFieldName" : "number"
}, {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
......@@ -14819,7 +14836,11 @@
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
}
},
"viewFieldName" : "number"
} ],
"predefinedType" : "CONTAINER_SINGLEDATA",
"scriptCode" : "{number:\"13246\"}"
}, {
"caption" : "图表",
"itemStyle" : "DEFAULT",
......@@ -84639,9 +84660,11 @@
}, {
"id" : "field_datepicker"
}, {
"id" : "field_text_dynamic"
"id" : "field_text_dynamic",
"viewFieldName" : "number"
}, {
"id" : "field_text_dynamic1"
"id" : "field_text_dynamic1",
"viewFieldName" : "number"
} ],
"codeName" : "Usr0807407624",
"controlType" : "VIEWLAYOUTPANEL",
......@@ -84836,6 +84859,20 @@
},
"valueFormat" : "YYYY-MM"
}, {
"caption" : "单项数据容器",
"dataRegionType" : "SINGLEDATA",
"dataSourceType" : "CUSTOM",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container_singledata",
"getPSLayout" : {
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSPanelItems" : [ {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
"itemType" : "FIELD",
......@@ -84853,7 +84890,8 @@
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
}
},
"viewFieldName" : "number"
}, {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
......@@ -84869,7 +84907,11 @@
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
}
},
"viewFieldName" : "number"
} ],
"predefinedType" : "CONTAINER_SINGLEDATA",
"scriptCode" : "{number:\"13246\"}"
}, {
"caption" : "图表",
"itemStyle" : "DEFAULT",
......@@ -86029,9 +86071,11 @@
}, {
"id" : "field_datepicker"
}, {
"id" : "field_text_dynamic"
"id" : "field_text_dynamic",
"viewFieldName" : "number"
}, {
"id" : "field_text_dynamic1"
"id" : "field_text_dynamic1",
"viewFieldName" : "number"
} ],
"codeName" : "Usr0807407624",
"controlType" : "VIEWLAYOUTPANEL",
......@@ -86226,6 +86270,20 @@
},
"valueFormat" : "YYYY-MM"
}, {
"caption" : "单项数据容器",
"dataRegionType" : "SINGLEDATA",
"dataSourceType" : "CUSTOM",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container_singledata",
"getPSLayout" : {
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSPanelItems" : [ {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
"itemType" : "FIELD",
......@@ -86243,7 +86301,8 @@
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
}
},
"viewFieldName" : "number"
}, {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
......@@ -86259,7 +86318,11 @@
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
}
},
"viewFieldName" : "number"
} ],
"predefinedType" : "CONTAINER_SINGLEDATA",
"scriptCode" : "{number:\"13246\"}"
}, {
"caption" : "图表",
"itemStyle" : "DEFAULT",
......@@ -86777,9 +86840,11 @@
}, {
"id" : "field_datepicker"
}, {
"id" : "field_text_dynamic"
"id" : "field_text_dynamic",
"viewFieldName" : "number"
}, {
"id" : "field_text_dynamic1"
"id" : "field_text_dynamic1",
"viewFieldName" : "number"
} ],
"codeName" : "Usr0807407624",
"controlType" : "VIEWLAYOUTPANEL",
......@@ -86974,6 +87039,20 @@
},
"valueFormat" : "YYYY-MM"
}, {
"caption" : "单项数据容器",
"dataRegionType" : "SINGLEDATA",
"dataSourceType" : "CUSTOM",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container_singledata",
"getPSLayout" : {
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSPanelItems" : [ {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
"itemType" : "FIELD",
......@@ -86991,7 +87070,8 @@
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
}
},
"viewFieldName" : "number"
}, {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
......@@ -87007,7 +87087,11 @@
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
}
},
"viewFieldName" : "number"
} ],
"predefinedType" : "CONTAINER_SINGLEDATA",
"scriptCode" : "{number:\"13246\"}"
}, {
"caption" : "图表",
"itemStyle" : "DEFAULT",
trainsys-provider/pom.xml
浏览文件 @ dab2e362
......@@ -33,7 +33,7 @@
<profiles>
<profile>
<id>trainsys</id>
<id>runtime</id>
<build>
<resources>
<resource>
......
trainsys-provider/src/main/docker/Dockerfile
浏览文件 @ dab2e362
......@@ -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
浏览文件 @ dab2e362
......@@ -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
浏览文件 @ dab2e362
......@@ -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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或