Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
T
TrainSys
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
苏州培训方案
TrainSys
提交
b1150e82
提交
b1150e82
编写于
12月 18, 2023
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
tony001 发布系统代码 [TrainSys,网页端]
上级
9a4c6fca
变更
20
隐藏空白字符变更
内嵌
并排
正在显示
20 个修改的文件
包含
247 行增加
和
83 行删除
+247
-83
config.xml
config.xml
+0
-6
CondType.json
...izlab/trainsys/PSSYSAPPS/Web/PSAPPCODELISTS/CondType.json
+19
-0
TestCtrlPlugCalendarView_Calendar.json
...S/Book/PSCALENDARS/TestCtrlPlugCalendarView_Calendar.json
+2
-1
TestCtrlPlugDayCalendarView_Calendar.json
...ook/PSCALENDARS/TestCtrlPlugDayCalendarView_Calendar.json
+2
-1
Timeline_CalendarView_Calendar.json
...TIES/Book/PSCALENDARS/Timeline_CalendarView_Calendar.json
+2
-1
WeekCalendarView_Calendar.json
...AENTITIES/Book/PSCALENDARS/WeekCalendarView_Calendar.json
+2
-1
Main.json
...SSYSAPPS/Web/PSAPPDATAENTITIES/SubTest2/PSFORMS/Main.json
+39
-0
SingleCondEditView_Form.json
...ATAENTITIES/SubTest2/PSFORMS/SingleCondEditView_Form.json
+40
-1
SubTest2EditView.json
...trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/SubTest2EditView.json
+39
-0
SubTest2SingleCondEditView.json
...SSYSAPPS/Web/PSAPPDEVIEWS/SubTest2SingleCondEditView.json
+40
-1
bookTestCtrlPlugCalendarView.json
...YSAPPS/Web/PSAPPDEVIEWS/bookTestCtrlPlugCalendarView.json
+2
-1
bookTestCtrlPlugDayCalendarView.json
...PPS/Web/PSAPPDEVIEWS/bookTestCtrlPlugDayCalendarView.json
+2
-1
booktimeline_CalendarView.json
...PSSYSAPPS/Web/PSAPPDEVIEWS/booktimeline_CalendarView.json
+2
-1
bookweekCalendarView.json
...nsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookweekCalendarView.json
+2
-1
PSSYSAPP.json
...ces/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+41
-19
PSSYSAPP.simple.json
...el/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.simple.json
+6
-2
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
浏览文件 @
b1150e82
...
@@ -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/PSAPPCODELISTS/CondType.json
0 → 100644
浏览文件 @
b1150e82
{
"codeListTag"
:
"Test__CondType"
,
"codeListType"
:
"STATIC"
,
"codeName"
:
"CondType"
,
"dynaInstMode"
:
0
,
"dynaModelFilePath"
:
"PSSYSAPPS/Web/PSAPPCODELISTS/CondType.json"
,
"emptyText"
:
"未定义"
,
"name"
:
"条件类型"
,
"getPSCodeItems"
:
[
{
"codeName"
:
"Group"
,
"text"
:
"条件组"
,
"value"
:
"GROUP"
},
{
"codeName"
:
"Single"
,
"text"
:
"单个条件"
,
"value"
:
"SINGLE"
}
],
"enableCache"
:
true
}
\ No newline at end of file
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSCALENDARS/TestCtrlPlugCalendarView_Calendar.json
浏览文件 @
b1150e82
...
@@ -217,7 +217,8 @@
...
@@ -217,7 +217,8 @@
}
],
}
],
"getPSSysPFPlugin"
:
{
"getPSSysPFPlugin"
:
{
"pluginType"
:
"CUSTOM"
,
"pluginType"
:
"CUSTOM"
,
"pluginCode"
:
"LIGHT_CALENDAR"
"pluginCode"
:
"LIGHT_CALENDAR"
,
"runtimeObject"
:
true
},
},
"enableGroup"
:
false
,
"enableGroup"
:
false
,
"modelid"
:
"56F6024E-D9F7-4A95-A422-5AEC791F397C"
,
"modelid"
:
"56F6024E-D9F7-4A95-A422-5AEC791F397C"
,
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSCALENDARS/TestCtrlPlugDayCalendarView_Calendar.json
浏览文件 @
b1150e82
...
@@ -552,7 +552,8 @@
...
@@ -552,7 +552,8 @@
}
],
}
],
"getPSSysPFPlugin"
:
{
"getPSSysPFPlugin"
:
{
"pluginType"
:
"CUSTOM"
,
"pluginType"
:
"CUSTOM"
,
"pluginCode"
:
"LIGHT_CALENDAR"
"pluginCode"
:
"LIGHT_CALENDAR"
,
"runtimeObject"
:
true
},
},
"enableGroup"
:
false
,
"enableGroup"
:
false
,
"modelid"
:
"48CB0996-1395-41B4-8529-1E98C1B9FB62"
,
"modelid"
:
"48CB0996-1395-41B4-8529-1E98C1B9FB62"
,
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSCALENDARS/Timeline_CalendarView_Calendar.json
浏览文件 @
b1150e82
...
@@ -125,7 +125,8 @@
...
@@ -125,7 +125,8 @@
}
],
}
],
"getPSSysPFPlugin"
:
{
"getPSSysPFPlugin"
:
{
"pluginType"
:
"CUSTOM"
,
"pluginType"
:
"CUSTOM"
,
"pluginCode"
:
"LIGHT_CALENDAR"
"pluginCode"
:
"LIGHT_CALENDAR"
,
"runtimeObject"
:
true
},
},
"enableGroup"
:
false
,
"enableGroup"
:
false
,
"modelid"
:
"CBCB0EF8-7840-42CD-A7F5-ED7182AC1BAF"
,
"modelid"
:
"CBCB0EF8-7840-42CD-A7F5-ED7182AC1BAF"
,
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSCALENDARS/WeekCalendarView_Calendar.json
浏览文件 @
b1150e82
...
@@ -217,7 +217,8 @@
...
@@ -217,7 +217,8 @@
}
],
}
],
"getPSSysPFPlugin"
:
{
"getPSSysPFPlugin"
:
{
"pluginType"
:
"CUSTOM"
,
"pluginType"
:
"CUSTOM"
,
"pluginCode"
:
"LIGHT_CALENDAR"
"pluginCode"
:
"LIGHT_CALENDAR"
,
"runtimeObject"
:
true
},
},
"enableGroup"
:
false
,
"enableGroup"
:
false
,
"modelid"
:
"22B2AC4A-938D-40C0-9B62-817EFB5631E7"
,
"modelid"
:
"22B2AC4A-938D-40C0-9B62-817EFB5631E7"
,
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/SubTest2/PSFORMS/Main.json
浏览文件 @
b1150e82
...
@@ -130,6 +130,13 @@
...
@@ -130,6 +130,13 @@
},
{
},
{
"id"
:
"formitem"
,
"id"
:
"formitem"
,
"dataType"
:
25
"dataType"
:
25
},
{
"id"
:
"condtype"
,
"dataType"
:
25
,
"getPSAppDEField"
:
{
"name"
:
"CONDTYPE"
,
"codeName"
:
"CondType"
}
},
{
},
{
"id"
:
"createman"
,
"id"
:
"createman"
,
"dataType"
:
25
,
"dataType"
:
25
,
...
@@ -315,6 +322,38 @@
...
@@ -315,6 +322,38 @@
"valueItemName"
:
"testid"
,
"valueItemName"
:
"testid"
,
"allowEmpty"
:
true
,
"allowEmpty"
:
true
,
"showCaption"
:
true
"showCaption"
:
true
},
{
"caption"
:
"条件类型"
,
"codeName"
:
"condtype"
,
"dataType"
:
25
,
"detailStyle"
:
"DEFAULT"
,
"detailType"
:
"FORMITEM"
,
"enableCond"
:
3
,
"ignoreInput"
:
0
,
"labelPos"
:
"LEFT"
,
"labelWidth"
:
130
,
"name"
:
"condtype"
,
"noPrivDisplayMode"
:
1
,
"getPSAppDEField"
:
{
"name"
:
"CONDTYPE"
,
"codeName"
:
"CondType"
},
"getPSEditor"
:
{
"editorType"
:
"DROPDOWNLIST"
,
"name"
:
"condtype"
,
"getPSAppCodeList"
:
{
"modelref"
:
true
,
"path"
:
"PSSYSAPPS/Web/PSAPPCODELISTS/CondType.json"
},
"singleSelect"
:
true
},
"getPSLayoutPos"
:
{
"colMD"
:
24
,
"layout"
:
"TABLE_24COL"
},
"allowEmpty"
:
true
,
"needCodeListConfig"
:
true
,
"showCaption"
:
true
}
],
}
],
"getPSLayout"
:
{
"getPSLayout"
:
{
"childColLG"
:
-1
,
"childColLG"
:
-1
,
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/SubTest2/PSFORMS/SingleCondEditView_Form.json
浏览文件 @
b1150e82
...
@@ -112,6 +112,13 @@
...
@@ -112,6 +112,13 @@
"id"
:
"srfsourcekey"
,
"id"
:
"srfsourcekey"
,
"hidden"
:
true
,
"hidden"
:
true
,
"dataType"
:
25
"dataType"
:
25
},
{
"id"
:
"condtype"
,
"dataType"
:
25
,
"getPSAppDEField"
:
{
"name"
:
"CONDTYPE"
,
"codeName"
:
"CondType"
}
},
{
},
{
"id"
:
"subtest2name"
,
"id"
:
"subtest2name"
,
"dataType"
:
25
,
"dataType"
:
25
,
...
@@ -164,12 +171,44 @@
...
@@ -164,12 +171,44 @@
"name"
:
"formpage1"
,
"name"
:
"formpage1"
,
"getPSDEFormDetails"
:
[
{
"getPSDEFormDetails"
:
[
{
"actionGroupExtractMode"
:
"ITEM"
,
"actionGroupExtractMode"
:
"ITEM"
,
"caption"
:
"
子测试实体基本信息
"
,
"caption"
:
"
单个条件
"
,
"codeName"
:
"group1"
,
"codeName"
:
"group1"
,
"detailStyle"
:
"DEFAULT"
,
"detailStyle"
:
"DEFAULT"
,
"detailType"
:
"GROUPPANEL"
,
"detailType"
:
"GROUPPANEL"
,
"name"
:
"group1"
,
"name"
:
"group1"
,
"getPSDEFormDetails"
:
[
{
"getPSDEFormDetails"
:
[
{
"caption"
:
"条件类型"
,
"codeName"
:
"condtype"
,
"dataType"
:
25
,
"detailStyle"
:
"DEFAULT"
,
"detailType"
:
"FORMITEM"
,
"enableCond"
:
3
,
"ignoreInput"
:
0
,
"labelPos"
:
"LEFT"
,
"labelWidth"
:
130
,
"name"
:
"condtype"
,
"noPrivDisplayMode"
:
1
,
"getPSAppDEField"
:
{
"name"
:
"CONDTYPE"
,
"codeName"
:
"CondType"
},
"getPSEditor"
:
{
"editorType"
:
"DROPDOWNLIST"
,
"name"
:
"condtype"
,
"getPSAppCodeList"
:
{
"modelref"
:
true
,
"path"
:
"PSSYSAPPS/Web/PSAPPCODELISTS/CondType.json"
},
"singleSelect"
:
true
},
"getPSLayoutPos"
:
{
"colMD"
:
24
,
"layout"
:
"TABLE_24COL"
},
"allowEmpty"
:
true
,
"needCodeListConfig"
:
true
,
"showCaption"
:
true
},
{
"getCapPSLanguageRes"
:
{
"getCapPSLanguageRes"
:
{
"defaultContent"
:
"子测试实体名称"
,
"defaultContent"
:
"子测试实体名称"
,
"lanResTag"
:
"DEF.LNAME.SUBTEST2NAME"
,
"lanResTag"
:
"DEF.LNAME.SUBTEST2NAME"
,
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/SubTest2EditView.json
浏览文件 @
b1150e82
...
@@ -242,6 +242,13 @@
...
@@ -242,6 +242,13 @@
},
{
},
{
"id"
:
"formitem"
,
"id"
:
"formitem"
,
"dataType"
:
25
"dataType"
:
25
},
{
"id"
:
"condtype"
,
"dataType"
:
25
,
"getPSAppDEField"
:
{
"name"
:
"CONDTYPE"
,
"codeName"
:
"CondType"
}
},
{
},
{
"id"
:
"createman"
,
"id"
:
"createman"
,
"dataType"
:
25
,
"dataType"
:
25
,
...
@@ -427,6 +434,38 @@
...
@@ -427,6 +434,38 @@
"valueItemName"
:
"testid"
,
"valueItemName"
:
"testid"
,
"allowEmpty"
:
true
,
"allowEmpty"
:
true
,
"showCaption"
:
true
"showCaption"
:
true
},
{
"caption"
:
"条件类型"
,
"codeName"
:
"condtype"
,
"dataType"
:
25
,
"detailStyle"
:
"DEFAULT"
,
"detailType"
:
"FORMITEM"
,
"enableCond"
:
3
,
"ignoreInput"
:
0
,
"labelPos"
:
"LEFT"
,
"labelWidth"
:
130
,
"name"
:
"condtype"
,
"noPrivDisplayMode"
:
1
,
"getPSAppDEField"
:
{
"name"
:
"CONDTYPE"
,
"codeName"
:
"CondType"
},
"getPSEditor"
:
{
"editorType"
:
"DROPDOWNLIST"
,
"name"
:
"condtype"
,
"getPSAppCodeList"
:
{
"modelref"
:
true
,
"path"
:
"PSSYSAPPS/Web/PSAPPCODELISTS/CondType.json"
},
"singleSelect"
:
true
},
"getPSLayoutPos"
:
{
"colMD"
:
24
,
"layout"
:
"TABLE_24COL"
},
"allowEmpty"
:
true
,
"needCodeListConfig"
:
true
,
"showCaption"
:
true
}
],
}
],
"getPSLayout"
:
{
"getPSLayout"
:
{
"childColLG"
:
-1
,
"childColLG"
:
-1
,
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/SubTest2SingleCondEditView.json
浏览文件 @
b1150e82
...
@@ -239,6 +239,13 @@
...
@@ -239,6 +239,13 @@
"id"
:
"srfsourcekey"
,
"id"
:
"srfsourcekey"
,
"hidden"
:
true
,
"hidden"
:
true
,
"dataType"
:
25
"dataType"
:
25
},
{
"id"
:
"condtype"
,
"dataType"
:
25
,
"getPSAppDEField"
:
{
"name"
:
"CONDTYPE"
,
"codeName"
:
"CondType"
}
},
{
},
{
"id"
:
"subtest2name"
,
"id"
:
"subtest2name"
,
"dataType"
:
25
,
"dataType"
:
25
,
...
@@ -291,12 +298,44 @@
...
@@ -291,12 +298,44 @@
"name"
:
"formpage1"
,
"name"
:
"formpage1"
,
"getPSDEFormDetails"
:
[
{
"getPSDEFormDetails"
:
[
{
"actionGroupExtractMode"
:
"ITEM"
,
"actionGroupExtractMode"
:
"ITEM"
,
"caption"
:
"
子测试实体基本信息
"
,
"caption"
:
"
单个条件
"
,
"codeName"
:
"group1"
,
"codeName"
:
"group1"
,
"detailStyle"
:
"DEFAULT"
,
"detailStyle"
:
"DEFAULT"
,
"detailType"
:
"GROUPPANEL"
,
"detailType"
:
"GROUPPANEL"
,
"name"
:
"group1"
,
"name"
:
"group1"
,
"getPSDEFormDetails"
:
[
{
"getPSDEFormDetails"
:
[
{
"caption"
:
"条件类型"
,
"codeName"
:
"condtype"
,
"dataType"
:
25
,
"detailStyle"
:
"DEFAULT"
,
"detailType"
:
"FORMITEM"
,
"enableCond"
:
3
,
"ignoreInput"
:
0
,
"labelPos"
:
"LEFT"
,
"labelWidth"
:
130
,
"name"
:
"condtype"
,
"noPrivDisplayMode"
:
1
,
"getPSAppDEField"
:
{
"name"
:
"CONDTYPE"
,
"codeName"
:
"CondType"
},
"getPSEditor"
:
{
"editorType"
:
"DROPDOWNLIST"
,
"name"
:
"condtype"
,
"getPSAppCodeList"
:
{
"modelref"
:
true
,
"path"
:
"PSSYSAPPS/Web/PSAPPCODELISTS/CondType.json"
},
"singleSelect"
:
true
},
"getPSLayoutPos"
:
{
"colMD"
:
24
,
"layout"
:
"TABLE_24COL"
},
"allowEmpty"
:
true
,
"needCodeListConfig"
:
true
,
"showCaption"
:
true
},
{
"getCapPSLanguageRes"
:
{
"getCapPSLanguageRes"
:
{
"defaultContent"
:
"子测试实体名称"
,
"defaultContent"
:
"子测试实体名称"
,
"lanResTag"
:
"DEF.LNAME.SUBTEST2NAME"
,
"lanResTag"
:
"DEF.LNAME.SUBTEST2NAME"
,
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookTestCtrlPlugCalendarView.json
浏览文件 @
b1150e82
...
@@ -274,7 +274,8 @@
...
@@ -274,7 +274,8 @@
}
],
}
],
"getPSSysPFPlugin"
:
{
"getPSSysPFPlugin"
:
{
"pluginType"
:
"CUSTOM"
,
"pluginType"
:
"CUSTOM"
,
"pluginCode"
:
"LIGHT_CALENDAR"
"pluginCode"
:
"LIGHT_CALENDAR"
,
"runtimeObject"
:
true
},
},
"enableGroup"
:
false
,
"enableGroup"
:
false
,
"name"
:
"calendar"
,
"name"
:
"calendar"
,
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookTestCtrlPlugDayCalendarView.json
浏览文件 @
b1150e82
...
@@ -617,7 +617,8 @@
...
@@ -617,7 +617,8 @@
}
],
}
],
"getPSSysPFPlugin"
:
{
"getPSSysPFPlugin"
:
{
"pluginType"
:
"CUSTOM"
,
"pluginType"
:
"CUSTOM"
,
"pluginCode"
:
"LIGHT_CALENDAR"
"pluginCode"
:
"LIGHT_CALENDAR"
,
"runtimeObject"
:
true
},
},
"enableGroup"
:
false
,
"enableGroup"
:
false
,
"name"
:
"calendar"
,
"name"
:
"calendar"
,
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/booktimeline_CalendarView.json
浏览文件 @
b1150e82
...
@@ -182,7 +182,8 @@
...
@@ -182,7 +182,8 @@
}
],
}
],
"getPSSysPFPlugin"
:
{
"getPSSysPFPlugin"
:
{
"pluginType"
:
"CUSTOM"
,
"pluginType"
:
"CUSTOM"
,
"pluginCode"
:
"LIGHT_CALENDAR"
"pluginCode"
:
"LIGHT_CALENDAR"
,
"runtimeObject"
:
true
},
},
"enableGroup"
:
false
,
"enableGroup"
:
false
,
"name"
:
"calendar"
,
"name"
:
"calendar"
,
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookweekCalendarView.json
浏览文件 @
b1150e82
...
@@ -274,7 +274,8 @@
...
@@ -274,7 +274,8 @@
}
],
}
],
"getPSSysPFPlugin"
:
{
"getPSSysPFPlugin"
:
{
"pluginType"
:
"CUSTOM"
,
"pluginType"
:
"CUSTOM"
,
"pluginCode"
:
"LIGHT_CALENDAR"
"pluginCode"
:
"LIGHT_CALENDAR"
,
"runtimeObject"
:
true
},
},
"enableGroup"
:
false
,
"enableGroup"
:
false
,
"name"
:
"calendar"
,
"name"
:
"calendar"
,
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @
b1150e82
...
@@ -376,6 +376,24 @@
...
@@ -376,6 +376,24 @@
"value" : "CANCELED"
"value" : "CANCELED"
} ],
} ],
"enableCache" : true
"enableCache" : true
}, {
"codeListTag" : "Test__CondType",
"codeListType" : "STATIC",
"codeName" : "CondType",
"dynaInstMode" : 0,
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/CondType.json",
"emptyText" : "未定义",
"name" : "条件类型",
"getPSCodeItems" : [ {
"codeName" : "Group",
"text" : "条件组",
"value" : "GROUP"
}, {
"codeName" : "Single",
"text" : "单个条件",
"value" : "SINGLE"
} ],
"enableCache" : true
}, {
}, {
"codeListTag" : "Test__FileType",
"codeListTag" : "Test__FileType",
"codeListType" : "STATIC",
"codeListType" : "STATIC",
...
@@ -5103,12 +5121,16 @@
...
@@ -5103,12 +5121,16 @@
"name" : "轻量级日历部件插件",
"name" : "轻量级日历部件插件",
"getPSSysPFPlugin" : {
"getPSSysPFPlugin" : {
"pluginType" : "CUSTOM",
"pluginType" : "CUSTOM",
"pluginCode" : "LIGHT_CALENDAR"
"pluginCode" : "LIGHT_CALENDAR",
"runtimeObject" : true
},
},
"pluginCode" : "LIGHT_CALENDAR",
"pluginCode" : "LIGHT_CALENDAR",
"pluginType" : "CUSTOM",
"pluginType" : "CUSTOM",
"rTObjectName" : "IBizLightCalendar",
"rTObjectRepo" : "@ibiz-template-plugin/light-calendar@0.0.10-alpha.15",
"refMode" : "CONTROL",
"refMode" : "CONTROL",
"refTag" : "CALENDAR"
"refTag" : "CALENDAR",
"runtimeObject" : true
}, {
}, {
"name" : "运行时部件(出来)",
"name" : "运行时部件(出来)",
"getPSSysPFPlugin" : {
"getPSSysPFPlugin" : {
...
@@ -12169,6 +12191,12 @@
...
@@ -12169,6 +12191,12 @@
"codeName" : "VMGroup4",
"codeName" : "VMGroup4",
"name" : "视图消息位置测试",
"name" : "视图消息位置测试",
"getPSAppViewMsgGroupDetails" : [ {
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-视图上方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg7"
}
}, {
"name" : "消息位置-弹出",
"name" : "消息位置-弹出",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
...
@@ -12186,17 +12214,18 @@
...
@@ -12186,17 +12214,18 @@
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg9"
"id" : "ViewMsg9"
}
}
}, {
"name" : "消息位置-视图上方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg7"
}
} ]
} ]
}, {
}, {
"codeName" : "VMGroup8",
"codeName" : "VMGroup8",
"name" : "【静态测试】",
"name" : "【静态测试】",
"getPSAppViewMsgGroupDetails" : [ {
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
},
"position" : "POPUP"
}, {
"name" : "消息类型-错误信息",
"name" : "消息类型-错误信息",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
...
@@ -12240,13 +12269,6 @@
...
@@ -12240,13 +12269,6 @@
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg13"
"id" : "ViewMsg13"
}
}
}, {
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
},
"position" : "POPUP"
} ]
} ]
}, {
}, {
"codeName" : "VMGroup5",
"codeName" : "VMGroup5",
...
@@ -12274,16 +12296,16 @@
...
@@ -12274,16 +12296,16 @@
"codeName" : "VMGroup6",
"codeName" : "VMGroup6",
"name" : "视图消息动态模式测试",
"name" : "视图消息动态模式测试",
"getPSAppViewMsgGroupDetails" : [ {
"getPSAppViewMsgGroupDetails" : [ {
"name" : "动态模式-
实体数据集
",
"name" : "动态模式-
静态内容
",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg1
4
"
"id" : "ViewMsg1
5
"
}
}
}, {
}, {
"name" : "动态模式-
静态内容
",
"name" : "动态模式-
实体数据集
",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg1
5
"
"id" : "ViewMsg1
4
"
}
}
} ]
} ]
} ],
} ],
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.simple.json
浏览文件 @
b1150e82
...
@@ -453,12 +453,16 @@
...
@@ -453,12 +453,16 @@
"name"
:
"轻量级日历部件插件"
,
"name"
:
"轻量级日历部件插件"
,
"getPSSysPFPlugin"
:
{
"getPSSysPFPlugin"
:
{
"pluginType"
:
"CUSTOM"
,
"pluginType"
:
"CUSTOM"
,
"pluginCode"
:
"LIGHT_CALENDAR"
"pluginCode"
:
"LIGHT_CALENDAR"
,
"runtimeObject"
:
true
},
},
"pluginCode"
:
"LIGHT_CALENDAR"
,
"pluginCode"
:
"LIGHT_CALENDAR"
,
"pluginType"
:
"CUSTOM"
,
"pluginType"
:
"CUSTOM"
,
"rTObjectName"
:
"IBizLightCalendar"
,
"rTObjectRepo"
:
"@ibiz-template-plugin/light-calendar@0.0.10-alpha.15"
,
"refMode"
:
"CONTROL"
,
"refMode"
:
"CONTROL"
,
"refTag"
:
"CALENDAR"
"refTag"
:
"CALENDAR"
,
"runtimeObject"
:
true
},
{
},
{
"name"
:
"运行时部件(出来)"
,
"name"
:
"运行时部件(出来)"
,
"getPSSysPFPlugin"
:
{
"getPSSysPFPlugin"
:
{
...
...
trainsys-provider/pom.xml
浏览文件 @
b1150e82
...
@@ -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
浏览文件 @
b1150e82
...
@@ -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
浏览文件 @
b1150e82
...
@@ -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
浏览文件 @
b1150e82
...
@@ -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
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录