Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
T
TrainSys
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
苏州培训方案
TrainSys
提交
dfdb5ee9
提交
dfdb5ee9
编写于
8月 24, 2023
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fangzhihao 发布系统代码 [TrainSys,网页端]
上级
8e722a2c
变更
8
显示空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
10 行增加
和
67 行删除
+10
-67
config.xml
config.xml
+0
-6
Usr08223952GridView1_Grid.json
...AENTITIES/TESTGRID/PSGRIDS/Usr08223952GridView1_Grid.json
+1
-5
TESTGRIDUsr08223952GridView.json
...SYSAPPS/Web/PSAPPDEVIEWS/TESTGRIDUsr08223952GridView.json
+1
-5
TESTGRIDUsr08223952GridView1.json
...YSAPPS/Web/PSAPPDEVIEWS/TESTGRIDUsr08223952GridView1.json
+1
-5
pom.xml
trainsys-provider/pom.xml
+1
-1
Dockerfile
trainsys-provider/src/main/docker/Dockerfile
+1
-1
trainsys-provider-trainsys-k8s.yaml
...vider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
+4
-29
trainsys-provider-trainsys.yaml
...-provider/src/main/docker/trainsys-provider-trainsys.yaml
+1
-15
未找到文件。
config.xml
浏览文件 @
dfdb5ee9
...
@@ -55,12 +55,6 @@
...
@@ -55,12 +55,6 @@
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/TESTGRID/PSGRIDS/Usr08223952GridView1_Grid.json
浏览文件 @
dfdb5ee9
{
{
"aggMode"
:
"
PAG
E"
,
"aggMode"
:
"
NON
E"
,
"codeName"
:
"Usr08223952GridView1_Grid"
,
"codeName"
:
"Usr08223952GridView1_Grid"
,
"columnEnableFilter"
:
2
,
"columnEnableFilter"
:
2
,
"columnEnableLink"
:
0
,
"columnEnableLink"
:
0
,
...
@@ -1225,7 +1225,6 @@
...
@@ -1225,7 +1225,6 @@
"widthUnit"
:
"PX"
,
"widthUnit"
:
"PX"
,
"enableSort"
:
true
"enableSort"
:
true
},
{
},
{
"aggMode"
:
"SUM"
,
"align"
:
"LEFT"
,
"align"
:
"LEFT"
,
"cLConvertMode"
:
"FRONT"
,
"cLConvertMode"
:
"FRONT"
,
"caption"
:
"属性4"
,
"caption"
:
"属性4"
,
...
@@ -1248,7 +1247,6 @@
...
@@ -1248,7 +1247,6 @@
"enableRowEdit"
:
true
,
"enableRowEdit"
:
true
,
"enableSort"
:
true
"enableSort"
:
true
},
{
},
{
"aggMode"
:
"AVG"
,
"align"
:
"LEFT"
,
"align"
:
"LEFT"
,
"cLConvertMode"
:
"NONE"
,
"cLConvertMode"
:
"NONE"
,
"caption"
:
"属性3"
,
"caption"
:
"属性3"
,
...
@@ -1296,7 +1294,6 @@
...
@@ -1296,7 +1294,6 @@
"enableRowEdit"
:
true
,
"enableRowEdit"
:
true
,
"enableSort"
:
true
"enableSort"
:
true
},
{
},
{
"aggMode"
:
"MAX"
,
"align"
:
"LEFT"
,
"align"
:
"LEFT"
,
"cLConvertMode"
:
"NONE"
,
"cLConvertMode"
:
"NONE"
,
"caption"
:
"属性2"
,
"caption"
:
"属性2"
,
...
@@ -1364,7 +1361,6 @@
...
@@ -1364,7 +1361,6 @@
"widthUnit"
:
"PX"
,
"widthUnit"
:
"PX"
,
"enableSort"
:
true
"enableSort"
:
true
},
{
},
{
"aggMode"
:
"MIN"
,
"align"
:
"LEFT"
,
"align"
:
"LEFT"
,
"cLConvertMode"
:
"NONE"
,
"cLConvertMode"
:
"NONE"
,
"caption"
:
"属性"
,
"caption"
:
"属性"
,
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGRIDUsr08223952GridView.json
浏览文件 @
dfdb5ee9
...
@@ -664,7 +664,7 @@
...
@@ -664,7 +664,7 @@
"modelid"
:
"1A4F8562-DE58-4233-94B4-7A2AD215B3BF"
,
"modelid"
:
"1A4F8562-DE58-4233-94B4-7A2AD215B3BF"
,
"modeltype"
:
"PSDETOOLBAR"
"modeltype"
:
"PSDETOOLBAR"
},
{
},
{
"aggMode"
:
"
PAG
E"
,
"aggMode"
:
"
NON
E"
,
"codeName"
:
"Usr08223952GridView1_Grid"
,
"codeName"
:
"Usr08223952GridView1_Grid"
,
"columnEnableFilter"
:
2
,
"columnEnableFilter"
:
2
,
"columnEnableLink"
:
0
,
"columnEnableLink"
:
0
,
...
@@ -1977,7 +1977,6 @@
...
@@ -1977,7 +1977,6 @@
"widthUnit"
:
"PX"
,
"widthUnit"
:
"PX"
,
"enableSort"
:
true
"enableSort"
:
true
},
{
},
{
"aggMode"
:
"SUM"
,
"align"
:
"LEFT"
,
"align"
:
"LEFT"
,
"cLConvertMode"
:
"FRONT"
,
"cLConvertMode"
:
"FRONT"
,
"caption"
:
"属性4"
,
"caption"
:
"属性4"
,
...
@@ -2000,7 +1999,6 @@
...
@@ -2000,7 +1999,6 @@
"enableRowEdit"
:
true
,
"enableRowEdit"
:
true
,
"enableSort"
:
true
"enableSort"
:
true
},
{
},
{
"aggMode"
:
"AVG"
,
"align"
:
"LEFT"
,
"align"
:
"LEFT"
,
"cLConvertMode"
:
"NONE"
,
"cLConvertMode"
:
"NONE"
,
"caption"
:
"属性3"
,
"caption"
:
"属性3"
,
...
@@ -2048,7 +2046,6 @@
...
@@ -2048,7 +2046,6 @@
"enableRowEdit"
:
true
,
"enableRowEdit"
:
true
,
"enableSort"
:
true
"enableSort"
:
true
},
{
},
{
"aggMode"
:
"MAX"
,
"align"
:
"LEFT"
,
"align"
:
"LEFT"
,
"cLConvertMode"
:
"NONE"
,
"cLConvertMode"
:
"NONE"
,
"caption"
:
"属性2"
,
"caption"
:
"属性2"
,
...
@@ -2116,7 +2113,6 @@
...
@@ -2116,7 +2113,6 @@
"widthUnit"
:
"PX"
,
"widthUnit"
:
"PX"
,
"enableSort"
:
true
"enableSort"
:
true
},
{
},
{
"aggMode"
:
"MIN"
,
"align"
:
"LEFT"
,
"align"
:
"LEFT"
,
"cLConvertMode"
:
"NONE"
,
"cLConvertMode"
:
"NONE"
,
"caption"
:
"属性"
,
"caption"
:
"属性"
,
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGRIDUsr08223952GridView1.json
浏览文件 @
dfdb5ee9
...
@@ -664,7 +664,7 @@
...
@@ -664,7 +664,7 @@
"modelid"
:
"1A4F8562-DE58-4233-94B4-7A2AD215B3BF"
,
"modelid"
:
"1A4F8562-DE58-4233-94B4-7A2AD215B3BF"
,
"modeltype"
:
"PSDETOOLBAR"
"modeltype"
:
"PSDETOOLBAR"
},
{
},
{
"aggMode"
:
"
PAG
E"
,
"aggMode"
:
"
NON
E"
,
"codeName"
:
"Usr08223952GridView1_Grid"
,
"codeName"
:
"Usr08223952GridView1_Grid"
,
"columnEnableFilter"
:
2
,
"columnEnableFilter"
:
2
,
"columnEnableLink"
:
0
,
"columnEnableLink"
:
0
,
...
@@ -1977,7 +1977,6 @@
...
@@ -1977,7 +1977,6 @@
"widthUnit"
:
"PX"
,
"widthUnit"
:
"PX"
,
"enableSort"
:
true
"enableSort"
:
true
},
{
},
{
"aggMode"
:
"SUM"
,
"align"
:
"LEFT"
,
"align"
:
"LEFT"
,
"cLConvertMode"
:
"FRONT"
,
"cLConvertMode"
:
"FRONT"
,
"caption"
:
"属性4"
,
"caption"
:
"属性4"
,
...
@@ -2000,7 +1999,6 @@
...
@@ -2000,7 +1999,6 @@
"enableRowEdit"
:
true
,
"enableRowEdit"
:
true
,
"enableSort"
:
true
"enableSort"
:
true
},
{
},
{
"aggMode"
:
"AVG"
,
"align"
:
"LEFT"
,
"align"
:
"LEFT"
,
"cLConvertMode"
:
"NONE"
,
"cLConvertMode"
:
"NONE"
,
"caption"
:
"属性3"
,
"caption"
:
"属性3"
,
...
@@ -2048,7 +2046,6 @@
...
@@ -2048,7 +2046,6 @@
"enableRowEdit"
:
true
,
"enableRowEdit"
:
true
,
"enableSort"
:
true
"enableSort"
:
true
},
{
},
{
"aggMode"
:
"MAX"
,
"align"
:
"LEFT"
,
"align"
:
"LEFT"
,
"cLConvertMode"
:
"NONE"
,
"cLConvertMode"
:
"NONE"
,
"caption"
:
"属性2"
,
"caption"
:
"属性2"
,
...
@@ -2116,7 +2113,6 @@
...
@@ -2116,7 +2113,6 @@
"widthUnit"
:
"PX"
,
"widthUnit"
:
"PX"
,
"enableSort"
:
true
"enableSort"
:
true
},
{
},
{
"aggMode"
:
"MIN"
,
"align"
:
"LEFT"
,
"align"
:
"LEFT"
,
"cLConvertMode"
:
"NONE"
,
"cLConvertMode"
:
"NONE"
,
"caption"
:
"属性"
,
"caption"
:
"属性"
,
...
...
trainsys-provider/pom.xml
浏览文件 @
dfdb5ee9
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
<profiles>
<profiles>
<profile>
<profile>
<id>
trainsys
</id>
<id>
runtime
</id>
<build>
<build>
<resources>
<resources>
<resource>
<resource>
...
...
trainsys-provider/src/main/docker/Dockerfile
浏览文件 @
dfdb5ee9
...
@@ -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
50000
EXPOSE
8081
ADD
trainsys-provider.jar /trainsys-provider.jar
ADD
trainsys-provider.jar /trainsys-provider.jar
trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
浏览文件 @
dfdb5ee9
...
@@ -22,32 +22,7 @@ spec:
...
@@ -22,32 +22,7 @@ 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
:
50000
-
containerPort
:
8081
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
...
@@ -60,9 +35,9 @@ spec:
...
@@ -60,9 +35,9 @@ spec:
type
:
NodePort
type
:
NodePort
ports
:
ports
:
-
name
:
http
-
name
:
http
port
:
50000
port
:
8081
targetPort
:
50000
targetPort
:
8081
nodePort
:
50000
nodePort
:
8081
protocol
:
TCP
protocol
:
TCP
selector
:
selector
:
app
:
trainsys-provider
app
:
trainsys-provider
...
...
trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
浏览文件 @
dfdb5ee9
...
@@ -3,23 +3,9 @@ services:
...
@@ -3,23 +3,9 @@ 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
:
-
"
50000:50000
"
-
"
8081:8081
"
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
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录