Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
T
TrainSys
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
苏州培训方案
TrainSys
提交
b613a20c
提交
b613a20c
编写于
1年前
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
tony001 发布系统代码 [TrainSys,网页端]
上级
6ce65ac1
master
无相关合并请求
变更
9
隐藏空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
53 行增加
和
127 行删除
+53
-127
config.xml
config.xml
+0
-6
TestEditView_Form.json
...PSAPPDATAENTITIES/TESTGRID/PSFORMS/TestEditView_Form.json
+5
-5
TESTGRIDTestEditView.json
...nsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGRIDTestEditView.json
+5
-5
PSSYSAPP.json
...ces/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+36
-56
PSSYSAPP.simple.json
...el/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.simple.json
+0
-9
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
浏览文件 @
b613a20c
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID/PSFORMS/TestEditView_Form.json
浏览文件 @
b613a20c
...
...
@@ -258,16 +258,13 @@
"getPSEditor"
:
{
"editorParams"
:
{
"max"
:
"200"
,
"precision"
:
"6"
,
"readonly"
:
"true"
,
"showpercentage"
:
"true"
},
"editorStyle"
:
"PROGRESSPERCENTAGE"
,
"editorType"
:
"SLIDER"
,
"name"
:
"formitem"
,
"getPSSysPFPlugin"
:
{
"pluginType"
:
"EDITOR_CUSTOMSTYLE"
,
"pluginCode"
:
"PROGRESSPERCENTAGE"
},
"precision"
:
6
,
"stepValue"
:
1.0
,
"readOnly"
:
true
},
...
...
@@ -275,6 +272,9 @@
"colMD"
:
24
,
"layout"
:
"TABLE_24COL"
},
"getPSSysCss"
:
{
"cssName"
:
"slider-progress-percentage"
},
"allowEmpty"
:
true
,
"showCaption"
:
true
}
],
...
...
This diff is collapsed.
Click to expand it.
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGRIDTestEditView.json
浏览文件 @
b613a20c
...
...
@@ -376,16 +376,13 @@
"getPSEditor"
:
{
"editorParams"
:
{
"max"
:
"200"
,
"precision"
:
"6"
,
"readonly"
:
"true"
,
"showpercentage"
:
"true"
},
"editorStyle"
:
"PROGRESSPERCENTAGE"
,
"editorType"
:
"SLIDER"
,
"name"
:
"formitem"
,
"getPSSysPFPlugin"
:
{
"pluginType"
:
"EDITOR_CUSTOMSTYLE"
,
"pluginCode"
:
"PROGRESSPERCENTAGE"
},
"precision"
:
6
,
"stepValue"
:
1.0
,
"readOnly"
:
true
},
...
...
@@ -393,6 +390,9 @@
"colMD"
:
24
,
"layout"
:
"TABLE_24COL"
},
"getPSSysCss"
:
{
"cssName"
:
"slider-progress-percentage"
},
"allowEmpty"
:
true
,
"showCaption"
:
true
}
],
...
...
This diff is collapsed.
Click to expand it.
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @
b613a20c
...
...
@@ -2492,17 +2492,6 @@
},
"pluginCode" : "ORGSELECT",
"styleCode" : "ORGSELECT"
}, {
"codeName" : "PROGRESSPERCENTAGE",
"containerType" : "FORMITEM",
"editorType" : "SLIDER",
"name" : "进度百分比显示",
"getPSSysPFPlugin" : {
"pluginType" : "EDITOR_CUSTOMSTYLE",
"pluginCode" : "PROGRESSPERCENTAGE"
},
"pluginCode" : "PROGRESSPERCENTAGE",
"styleCode" : "PROGRESSPERCENTAGE"
}, {
"codeName" : "editorTest",
"containerType" : "FORMITEM",
...
...
@@ -5087,15 +5076,6 @@
"pluginCode" : "DATA_PICKER_CUSTOM_SELECT",
"pluginType" : "AC_ITEM",
"refMode" : "DEACMODE"
}, {
"name" : "滑动输入进度百分比显示",
"getPSSysPFPlugin" : {
"pluginType" : "EDITOR_CUSTOMSTYLE",
"pluginCode" : "PROGRESSPERCENTAGE"
},
"pluginCode" : "PROGRESSPERCENTAGE",
"pluginType" : "EDITOR_CUSTOMSTYLE",
"refMode" : "EDITORSTYPE"
}, {
"name" : "看板分组插件",
"getPSSysPFPlugin" : {
...
...
@@ -12336,10 +12316,10 @@
"codeName" : "VMGroup3",
"name" : "视图消息类型测试",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息类型-
警告
信息",
"name" : "消息类型-
常规
信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg
5
"
"id" : "ViewMsg
4
"
}
}, {
"name" : "消息类型-错误信息",
...
...
@@ -12348,10 +12328,10 @@
"id" : "ViewMsg6"
}
}, {
"name" : "消息类型-
常规
信息",
"name" : "消息类型-
警告
信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg
4
"
"id" : "ViewMsg
5
"
}
} ]
}, {
...
...
@@ -12368,6 +12348,18 @@
"codeName" : "VMGroup4",
"name" : "视图消息位置测试",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg8"
}
}, {
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
}
}, {
"name" : "消息位置-视图上方",
"getPSAppViewMsg" : {
"modelref" : true,
...
...
@@ -12379,11 +12371,28 @@
"modelref" : true,
"id" : "ViewMsg10"
}
} ]
}, {
"codeName" : "VMGroup8",
"name" : "【静态测试】",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息类型-常规信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg4"
},
"position" : "POPUP"
}, {
"name" : "
消息位置-视图下方
",
"name" : "
关闭模式-无删除-上方-常规
",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg8"
"id" : "ViewMsg11"
}
}, {
"name" : "关闭模式-默认删除-上方-错误",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
}
}, {
"name" : "消息位置-视图内容区",
...
...
@@ -12391,11 +12400,7 @@
"modelref" : true,
"id" : "ViewMsg9"
}
} ]
}, {
"codeName" : "VMGroup8",
"name" : "【静态测试】",
"getPSAppViewMsgGroupDetails" : [ {
}, {
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
...
...
@@ -12421,31 +12426,6 @@
"id" : "ViewMsg6"
},
"position" : "POPUP"
}, {
"name" : "消息类型-常规信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg4"
},
"position" : "POPUP"
}, {
"name" : "关闭模式-无删除-上方-常规",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg11"
}
}, {
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
}
}, {
"name" : "关闭模式-默认删除-上方-错误",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
}
} ]
}, {
"codeName" : "VMGroup5",
This diff is collapsed.
Click to expand it.
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.simple.json
浏览文件 @
b613a20c
...
...
@@ -284,15 +284,6 @@
"pluginCode"
:
"DATA_PICKER_CUSTOM_SELECT"
,
"pluginType"
:
"AC_ITEM"
,
"refMode"
:
"DEACMODE"
},
{
"name"
:
"滑动输入进度百分比显示"
,
"getPSSysPFPlugin"
:
{
"pluginType"
:
"EDITOR_CUSTOMSTYLE"
,
"pluginCode"
:
"PROGRESSPERCENTAGE"
},
"pluginCode"
:
"PROGRESSPERCENTAGE"
,
"pluginType"
:
"EDITOR_CUSTOMSTYLE"
,
"refMode"
:
"EDITORSTYPE"
},
{
"name"
:
"看板分组插件"
,
"getPSSysPFPlugin"
:
{
...
...
This diff is collapsed.
Click to expand it.
trainsys-provider/pom.xml
浏览文件 @
b613a20c
...
...
@@ -33,7 +33,7 @@
<profiles>
<profile>
<id>
trainsys
</id>
<id>
runtime
</id>
<build>
<resources>
<resource>
...
...
This diff is collapsed.
Click to expand it.
trainsys-provider/src/main/docker/Dockerfile
浏览文件 @
b613a20c
...
...
@@ -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
This diff is collapsed.
Click to expand it.
trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
浏览文件 @
b613a20c
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
浏览文件 @
b613a20c
...
...
@@ -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
:
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录