Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
T
TrainSys
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
苏州培训方案
TrainSys
提交
84a1b1de
提交
84a1b1de
编写于
1月 02, 2024
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fangzhihao 发布系统代码 [TrainSys,网页端]
上级
157c7afa
变更
18
展开全部
隐藏空白字符变更
内嵌
并排
正在显示
18 个修改的文件
包含
1626 行增加
和
102 行删除
+1626
-102
config.xml
config.xml
+0
-6
Book.json
...bizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book.json
+12
-0
PSSYSAPP.json
.../ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
+4
-4
Book.json
...bizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json
+8
-0
Usr07257969EditView_Form.json
...PPDATAENTITIES/Book/PSFORMS/Usr07257969EditView_Form.json
+2
-2
Usr01028811MPickupView2_PickupGridView_Grid.json
.../PSGRIDS/Usr01028811MPickupView2_PickupGridView_Grid.json
+190
-0
Usr01021431_SearchForm.json
...TAENTITIES/Book/PSSEARCHFORMS/Usr01021431_SearchForm.json
+43
-0
Usr01028811MPickupView2_TreeView.json
...ES/Book/PSTREEVIEWS/Usr01028811MPickupView2_TreeView.json
+126
-0
bookUsr01028811MPickupView2.json
...SYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028811MPickupView2.json
+724
-0
bookUsr01028811MPickupView2_PickupGridView.json
...PPDEVIEWS/bookUsr01028811MPickupView2_PickupGridView.json
+443
-0
bookUsr01028976MPickupView2.json
...SYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028976MPickupView2.json
+2
-0
bookUsr01028976MPickupView2_PickupGridView.json
...PPDEVIEWS/bookUsr01028976MPickupView2_PickupGridView.json
+1
-0
bookUsr07257969EditView.json
...s/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr07257969EditView.json
+2
-2
PSSYSAPP.json
...ces/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+62
-42
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
浏览文件 @
84a1b1de
...
...
@@ -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/PSMODULES/common/PSDATAENTITIES/Book.json
浏览文件 @
84a1b1de
...
...
@@ -7291,6 +7291,12 @@
"name"
:
"移动端编辑器测试"
,
"realModelSubType"
:
"DEMOBEDITVIEW"
,
"realModelType"
:
"PSDEVIEWBASE"
},
{
"codeName"
:
"Usr01028811MPickupView2"
,
"logicName"
:
"测试多项数据选择视图2"
,
"name"
:
"测试多项数据选择视图2"
,
"realModelSubType"
:
"DEMPICKUPVIEW2"
,
"realModelType"
:
"PSDEVIEWBASE"
},
{
"codeName"
:
"Usr11EditView"
,
"logicName"
:
"书实体编辑视图(飘窗)"
,
...
...
@@ -7382,6 +7388,12 @@
"name"
:
"书实体卡片视图导航视图"
,
"realModelSubType"
:
"DEDATAVIEWEXPVIEW"
,
"realModelType"
:
"PSDEVIEWBASE"
},
{
"codeName"
:
"Usr01028811MPickupView2_PickupGridView"
,
"logicName"
:
"测试多项数据选择视图2_选择数据视图"
,
"name"
:
"测试多项数据选择视图2_选择数据视图"
,
"realModelSubType"
:
"DEPICKUPGRIDVIEW"
,
"realModelType"
:
"PSDEVIEWBASE"
},
{
"codeName"
:
"Usr12129176EditView"
,
"logicName"
:
"人员选择测试"
,
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
浏览文件 @
84a1b1de
...
...
@@ -1517,16 +1517,16 @@
"codeName"
:
"VMGroup2"
,
"name"
:
"视图消息组2"
,
"getPSAppViewMsgGroupDetails"
:
[
{
"name"
:
"视图消息"
,
"name"
:
"视图消息
2
"
,
"getPSAppViewMsg"
:
{
"modelref"
:
true
,
"id"
:
"ViewMsg
2
"
"id"
:
"ViewMsg
3
"
}
},
{
"name"
:
"视图消息
2
"
,
"name"
:
"视图消息"
,
"getPSAppViewMsg"
:
{
"modelref"
:
true
,
"id"
:
"ViewMsg
3
"
"id"
:
"ViewMsg
2
"
}
}
]
},
{
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json
浏览文件 @
84a1b1de
...
...
@@ -4719,6 +4719,10 @@
"modelref"
:
true
,
"path"
:
"PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr11178840CustomView.json"
,
"viewType"
:
"DECUSTOMVIEW"
},
{
"modelref"
:
true
,
"path"
:
"PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028811MPickupView2_PickupGridView.json"
,
"viewType"
:
"DEPICKUPGRIDVIEW"
},
{
"modelref"
:
true
,
"path"
:
"PSSYSAPPS/Web/PSAPPDEVIEWS/bookOptionView.json"
,
...
...
@@ -4779,6 +4783,10 @@
"modelref"
:
true
,
"path"
:
"PSSYSAPPS/Web/PSAPPDEVIEWS/bookTabExpView9.json"
,
"viewType"
:
"DETABEXPVIEW9"
},
{
"modelref"
:
true
,
"path"
:
"PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028811MPickupView2.json"
,
"viewType"
:
"DEMPICKUPVIEW2"
},
{
"modelref"
:
true
,
"path"
:
"PSSYSAPPS/Web/PSAPPDEVIEWS/bookRepeatEditView.json"
,
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/Usr07257969EditView_Form.json
浏览文件 @
84a1b1de
...
...
@@ -1415,8 +1415,8 @@
"name"
:
"formitem2"
,
"getPickupPSAppView"
:
{
"modelref"
:
true
,
"path"
:
"PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028
976MPickupView2
.json"
,
"viewType"
:
"DE
MPICKUPVIEW2
"
"path"
:
"PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028
811MPickupView2_PickupGridView
.json"
,
"viewType"
:
"DE
PICKUPGRIDVIEW
"
},
"enableAC"
:
true
,
"enablePickupView"
:
true
,
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSGRIDS/Usr01028811MPickupView2_PickupGridView_Grid.json
0 → 100644
浏览文件 @
84a1b1de
{
"aggMode"
:
"NONE"
,
"codeName"
:
"Usr01028811MPickupView2_PickupGridView_Grid"
,
"columnEnableFilter"
:
2
,
"columnEnableLink"
:
2
,
"controlType"
:
"GRID"
,
"dynaModelFilePath"
:
"PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSGRIDS/Usr01028811MPickupView2_PickupGridView_Grid.json"
,
"getFetchPSControlAction"
:
{
"modelref"
:
true
,
"id"
:
"fetch"
,
"actionType"
:
"DEDATASET"
,
"name"
:
"fetch"
,
"getPSAppDEMethod"
:
{
"modelref"
:
true
,
"id"
:
"FetchDefault"
},
"getPSAppDataEntity"
:
{
"modelref"
:
true
,
"path"
:
"PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
}
},
"groupMode"
:
"NONE"
,
"logicName"
:
"测试多项数据选择视图2_选择数据视图_表格"
,
"getPSAppDataEntity"
:
{
"modelref"
:
true
,
"path"
:
"PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
},
"getPSDEGridColumns"
:
[
{
"align"
:
"LEFT"
,
"cLConvertMode"
:
"NONE"
,
"caption"
:
"书名称"
,
"codeName"
:
"bookname"
,
"columnType"
:
"DEFGRIDCOLUMN"
,
"dataItemName"
:
"bookname"
,
"excelCaption"
:
"书名称"
,
"name"
:
"bookname"
,
"noPrivDisplayMode"
:
1
,
"getPSAppDEField"
:
{
"name"
:
"BOOKNAME"
,
"codeName"
:
"BookName"
},
"width"
:
150
,
"widthUnit"
:
"PX"
,
"enableSort"
:
true
},
{
"align"
:
"LEFT"
,
"cLConvertMode"
:
"FRONT"
,
"caption"
:
"更新人"
,
"codeName"
:
"updateman"
,
"columnType"
:
"DEFGRIDCOLUMN"
,
"dataItemName"
:
"updateman"
,
"excelCaption"
:
"更新人"
,
"name"
:
"updateman"
,
"noPrivDisplayMode"
:
1
,
"getPSAppCodeList"
:
{
"modelref"
:
true
,
"path"
:
"PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
},
"getPSAppDEField"
:
{
"name"
:
"UPDATEMAN"
,
"codeName"
:
"UpdateMan"
},
"width"
:
150
,
"widthUnit"
:
"PX"
,
"enableSort"
:
true
},
{
"align"
:
"LEFT"
,
"cLConvertMode"
:
"NONE"
,
"caption"
:
"更新时间"
,
"codeName"
:
"updatedate"
,
"columnType"
:
"DEFGRIDCOLUMN"
,
"dataItemName"
:
"updatedate"
,
"excelCaption"
:
"更新时间"
,
"name"
:
"updatedate"
,
"noPrivDisplayMode"
:
1
,
"getPSAppDEField"
:
{
"name"
:
"UPDATEDATE"
,
"codeName"
:
"UpdateDate"
},
"valueFormat"
:
"YYYY-MM-DD HH:mm:ss"
,
"width"
:
150
,
"widthUnit"
:
"PX"
,
"enableSort"
:
true
}
],
"getPSDEGridDataItems"
:
[
{
"dataType"
:
25
,
"name"
:
"bookname"
,
"getPSAppDEField"
:
{
"name"
:
"BOOKNAME"
,
"codeName"
:
"BookName"
}
},
{
"dataType"
:
25
,
"name"
:
"updateman"
,
"getPSAppDEField"
:
{
"name"
:
"UPDATEMAN"
,
"codeName"
:
"UpdateMan"
}
},
{
"format"
:
"YYYY-MM-DD HH:mm:ss"
,
"dataType"
:
5
,
"name"
:
"updatedate"
,
"getPSAppDEField"
:
{
"name"
:
"UPDATEDATE"
,
"codeName"
:
"UpdateDate"
}
},
{
"dataType"
:
25
,
"name"
:
"srfkey"
,
"getPSAppDEField"
:
{
"name"
:
"BOOKID"
,
"codeName"
:
"BookId"
}
},
{
"dataType"
:
25
,
"name"
:
"srfdataaccaction"
,
"getPSAppDEField"
:
{
"name"
:
"BOOKID"
,
"codeName"
:
"BookId"
},
"dataAccessAction"
:
true
},
{
"dataType"
:
25
,
"name"
:
"phoneid"
,
"getPSAppDEField"
:
{
"name"
:
"PHONEID"
,
"codeName"
:
"PhoneId"
}
},
{
"dataType"
:
25
,
"name"
:
"pbookid"
,
"getPSAppDEField"
:
{
"name"
:
"PBOOKID"
,
"codeName"
:
"Pbookid"
}
},
{
"dataType"
:
25
,
"name"
:
"srfmajortext"
,
"getPSAppDEField"
:
{
"name"
:
"BOOKNAME"
,
"codeName"
:
"BookName"
}
}
],
"getPSDEGridEditItems"
:
[
{
"caption"
:
"书标识"
,
"codeName"
:
"srfkey"
,
"enableCond"
:
3
,
"ignoreInput"
:
0
,
"name"
:
"srfkey"
,
"getPSAppDEField"
:
{
"name"
:
"BOOKID"
,
"codeName"
:
"BookId"
},
"getPSEditor"
:
{
"editorType"
:
"HIDDEN"
,
"name"
:
"srfkey"
},
"allowEmpty"
:
true
}
],
"pagingSize"
:
20
,
"getRemovePSControlAction"
:
{
"actionName"
:
"Remove"
,
"actionType"
:
"DEACTION"
,
"dataAccessAction"
:
"DELETE"
,
"name"
:
"remove"
,
"getPSAppDEMethod"
:
{
"modelref"
:
true
,
"id"
:
"Remove"
},
"getPSAppDataEntity"
:
{
"modelref"
:
true
,
"path"
:
"PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
}
},
"sortMode"
:
"REMOTE"
,
"hasWFDataItems"
:
false
,
"enableColFilter"
:
false
,
"enableCustomized"
:
true
,
"enableGroup"
:
false
,
"enablePagingBar"
:
true
,
"enableRowEdit"
:
false
,
"enableRowEditOrder"
:
false
,
"enableRowNew"
:
false
,
"forceFit"
:
false
,
"hideHeader"
:
false
,
"noSort"
:
false
,
"singleSelect"
:
false
,
"modelid"
:
"6F9CAF73-DD98-45B7-973C-C4D2372170ED"
,
"modeltype"
:
"PSDEGRID"
}
\ No newline at end of file
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSSEARCHFORMS/Usr01021431_SearchForm.json
0 → 100644
浏览文件 @
84a1b1de
{
"codeName"
:
"Usr01021431_SearchForm"
,
"controlType"
:
"SEARCHFORM"
,
"defaultLabelWidth"
:
130
,
"dynaModelFilePath"
:
"PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSSEARCHFORMS/Usr01021431_SearchForm.json"
,
"logicName"
:
"测试多项数据选择视图2_选择数据视图_搜索表单"
,
"getPSAppDataEntity"
:
{
"modelref"
:
true
,
"path"
:
"PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
},
"getPSDEFormPages"
:
[
{
"caption"
:
"常规条件"
,
"codeName"
:
"formpage1"
,
"detailStyle"
:
"DEFAULT"
,
"detailType"
:
"FORMPAGE"
,
"name"
:
"formpage1"
,
"getPSLayout"
:
{
"childColLG"
:
-1
,
"childColMD"
:
24
,
"childColSM"
:
-1
,
"childColXS"
:
-1
,
"columnCount"
:
24
,
"layout"
:
"TABLE_24COL"
},
"infoGroupMode"
:
false
}
],
"getPSLayout"
:
{
"childColLG"
:
-1
,
"childColMD"
:
24
,
"childColSM"
:
-1
,
"childColXS"
:
-1
,
"columnCount"
:
24
,
"layout"
:
"TABLE_24COL"
},
"searchButtonStyle"
:
"DEFAULT"
,
"tabHeaderPos"
:
"TOP"
,
"enableAdvanceSearch"
:
false
,
"enableAutoSearch"
:
false
,
"enableFilterSave"
:
false
,
"noTabHeader"
:
true
,
"modelid"
:
"DA481836-2E5C-4718-BE2D-62F2E1C9D325"
,
"modeltype"
:
"PSDEFORM_SEARCHFORM"
}
\ No newline at end of file
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSTREEVIEWS/Usr01028811MPickupView2_TreeView.json
0 → 100644
浏览文件 @
84a1b1de
{
"codeName"
:
"Usr01028811MPickupView2_TreeView"
,
"controlType"
:
"TREEVIEW"
,
"getCreatePSControlAction"
:
{
"modelref"
:
true
,
"id"
:
"create"
,
"actionName"
:
"Create"
,
"actionType"
:
"DEACTION"
,
"dataAccessAction"
:
"CREATE"
,
"name"
:
"create"
,
"getPSAppDEMethod"
:
{
"modelref"
:
true
,
"id"
:
"Create"
},
"getPSAppDataEntity"
:
{
"modelref"
:
true
,
"path"
:
"PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
}
},
"dynaModelFilePath"
:
"PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSTREEVIEWS/Usr01028811MPickupView2_TreeView.json"
,
"getFetchPSControlAction"
:
{
"modelref"
:
true
,
"id"
:
"fetch"
,
"actionType"
:
"DEDATASET"
,
"name"
:
"fetch"
,
"getPSAppDataEntity"
:
{
"modelref"
:
true
,
"path"
:
"PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
}
},
"getGetPSControlAction"
:
{
"modelref"
:
true
,
"id"
:
"load"
,
"actionName"
:
"Get"
,
"actionType"
:
"DEACTION"
,
"dataAccessAction"
:
"READ"
,
"name"
:
"load"
,
"getPSAppDEMethod"
:
{
"modelref"
:
true
,
"id"
:
"Get"
},
"getPSAppDataEntity"
:
{
"modelref"
:
true
,
"path"
:
"PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
}
},
"hookEventNames"
:
[
"SELECTIONCHANGE"
,
"LOAD"
],
"logicName"
:
"测试多项数据选择视图2_树视图"
,
"getPSAppDataEntity"
:
{
"modelref"
:
true
,
"path"
:
"PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
},
"getPSControlLogics"
:
[
{
"eventNames"
:
"SELECTIONCHANGE"
,
"logicTag"
:
"treeexpbar_tree"
,
"logicType"
:
"CUSTOM"
,
"name"
:
"treeexpbar_selectionchange"
},
{
"eventNames"
:
"LOAD"
,
"logicTag"
:
"treeexpbar_tree"
,
"logicType"
:
"CUSTOM"
,
"name"
:
"treeexpbar_load"
}
],
"getPSDETreeNodes"
:
[
{
"counterMode"
:
0
,
"name"
:
"默认根节点"
,
"nodeType"
:
"ROOT"
,
"nodeValue"
:
"root"
,
"text"
:
"默认根节点"
,
"treeNodeType"
:
"STATIC"
,
"hasPSDETreeNodeRSs"
:
false
,
"appendPNodeId"
:
false
,
"disableSelect"
:
false
,
"enableCheck"
:
false
,
"enableEditData"
:
false
,
"enableNewData"
:
false
,
"enableQuickCreate"
:
false
,
"enableQuickSearch"
:
false
,
"enableRemoveData"
:
false
,
"enableViewData"
:
false
,
"expandFirstOnly"
:
false
,
"expanded"
:
false
,
"rootNode"
:
true
,
"selectFirstOnly"
:
false
,
"selected"
:
false
,
"id"
:
"ROOT"
}
],
"getRemovePSControlAction"
:
{
"modelref"
:
true
,
"id"
:
"remove"
,
"actionName"
:
"Remove"
,
"actionType"
:
"DEACTION"
,
"dataAccessAction"
:
"DELETE"
,
"name"
:
"remove"
,
"getPSAppDEMethod"
:
{
"modelref"
:
true
,
"id"
:
"Remove"
},
"getPSAppDataEntity"
:
{
"modelref"
:
true
,
"path"
:
"PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
}
},
"treeGridMode"
:
0
,
"getUpdatePSControlAction"
:
{
"modelref"
:
true
,
"id"
:
"update"
,
"actionName"
:
"Update"
,
"actionType"
:
"DEACTION"
,
"dataAccessAction"
:
"UPDATE"
,
"name"
:
"update"
,
"getPSAppDEMethod"
:
{
"modelref"
:
true
,
"id"
:
"Update"
},
"getPSAppDataEntity"
:
{
"modelref"
:
true
,
"path"
:
"PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
}
},
"enableRootSelect"
:
false
,
"outputIconDefault"
:
true
,
"rootVisible"
:
false
,
"modelid"
:
"086B5E80-C3A1-4B31-ADE1-097EBADCBC71"
,
"modeltype"
:
"PSDETREEVIEW"
}
\ No newline at end of file
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028811MPickupView2.json
0 → 100644
浏览文件 @
84a1b1de
此差异已折叠。
点击以展开。
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028811MPickupView2_PickupGridView.json
0 → 100644
浏览文件 @
84a1b1de
此差异已折叠。
点击以展开。
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028976MPickupView2.json
浏览文件 @
84a1b1de
...
...
@@ -884,6 +884,7 @@
"layoutPanel"
:
true
,
"useDefaultLayout"
:
true
},
"refFlag"
:
false
,
"title"
:
"测试多项数据选择视图_选择数据视图"
,
"viewStyle"
:
"DEFAULT"
,
"viewType"
:
"DEPICKUPGRIDVIEW"
,
...
...
@@ -1616,6 +1617,7 @@
"getPSControlParam"
:
{
}
}
]
},
"refFlag"
:
false
,
"title"
:
"测试多项数据选择视图"
,
"viewStyle"
:
"DEFAULT"
,
"viewType"
:
"DEMPICKUPVIEW2"
,
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028976MPickupView2_PickupGridView.json
浏览文件 @
84a1b1de
...
...
@@ -425,6 +425,7 @@
"layoutPanel"
:
true
,
"useDefaultLayout"
:
true
},
"refFlag"
:
false
,
"title"
:
"测试多项数据选择视图_选择数据视图"
,
"viewStyle"
:
"DEFAULT"
,
"viewType"
:
"DEPICKUPGRIDVIEW"
,
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr07257969EditView.json
浏览文件 @
84a1b1de
...
...
@@ -1594,8 +1594,8 @@
"name"
:
"formitem2"
,
"getPickupPSAppView"
:
{
"modelref"
:
true
,
"path"
:
"PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028
976MPickupView2
.json"
,
"viewType"
:
"DE
MPICKUPVIEW2
"
"path"
:
"PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028
811MPickupView2_PickupGridView
.json"
,
"viewType"
:
"DE
PICKUPGRIDVIEW
"
},
"enableAC"
:
true
,
"enablePickupView"
:
true
,
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @
84a1b1de
...
...
@@ -12453,16 +12453,16 @@
"codeName" : "VMGroup2",
"name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息",
"name" : "视图消息
2
",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg
2
"
"id" : "ViewMsg
3
"
}
}, {
"name" : "视图消息
2
",
"name" : "视图消息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg
3
"
"id" : "ViewMsg
2
"
}
} ]
}, {
...
...
@@ -12523,53 +12523,45 @@
"codeName" : "VMGroup4",
"name" : "视图消息位置测试",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-
弹出
",
"name" : "消息位置-
视图上方
",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg
10
"
"id" : "ViewMsg
7
"
}
}, {
"name" : "消息位置-
视图内容区
",
"name" : "消息位置-
弹出
",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg
9
"
"id" : "ViewMsg
10
"
}
}, {
"name" : "消息位置-视图
上
方",
"name" : "消息位置-视图
下
方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg
7
"
"id" : "ViewMsg
8
"
}
}, {
"name" : "消息位置-视图
下方
",
"name" : "消息位置-视图
内容区
",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg
8
"
"id" : "ViewMsg
9
"
}
} ]
}, {
"codeName" : "VMGroup8",
"name" : "【静态测试】",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息类型-错误信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg6"
},
"position" : "POPUP"
}, {
"name" : "关闭模式-无删除-上方-常规",
"name" : "关闭模式-默认删除-上方-错误",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg1
1
"
"id" : "ViewMsg1
2
"
}
}, {
"name" : "消息
类型-常规信息
",
"name" : "消息
位置-视图内容区
",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg4"
},
"position" : "POPUP"
"id" : "ViewMsg9"
}
}, {
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
...
...
@@ -12577,30 +12569,38 @@
"id" : "ViewMsg8"
}
}, {
"name" : "关闭模式-
默认删除-上方-错误
",
"name" : "关闭模式-
本次删除-上方-警告
",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg1
2
"
"id" : "ViewMsg1
3
"
}
}, {
"name" : "消息
位置-视图内容区
",
"name" : "消息
类型-警告信息
",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
}
"id" : "ViewMsg5"
},
"position" : "POPUP"
}, {
"name" : "消息类型-
警告
信息",
"name" : "消息类型-
错误
信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg
5
"
"id" : "ViewMsg
6
"
},
"position" : "POPUP"
}, {
"name" : "关闭模式-
本次删除-上方-警告
",
"name" : "关闭模式-
无删除-上方-常规
",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg1
3
"
"id" : "ViewMsg1
1
"
}
}, {
"name" : "消息类型-常规信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg4"
},
"position" : "POPUP"
} ]
}, {
"codeName" : "VMGroup5",
...
...
@@ -12612,32 +12612,32 @@
"id" : "ViewMsg11"
}
}, {
"name" : "关闭模式-
默认
删除",
"name" : "关闭模式-
本次
删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg1
2
"
"id" : "ViewMsg1
3
"
}
}, {
"name" : "关闭模式-
本次
删除",
"name" : "关闭模式-
默认
删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg1
3
"
"id" : "ViewMsg1
2
"
}
} ]
}, {
"codeName" : "VMGroup6",
"name" : "视图消息动态模式测试",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "动态模式-
实体数据集
",
"name" : "动态模式-
静态内容
",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg1
4
"
"id" : "ViewMsg1
5
"
}
}, {
"name" : "动态模式-
静态内容
",
"name" : "动态模式-
实体数据集
",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg1
5
"
"id" : "ViewMsg1
4
"
}
} ]
} ],
...
...
@@ -14146,6 +14146,12 @@
"viewType" : "DECUSTOMVIEW",
"resource" : "Book",
"view" : "Usr11178840CustomView"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028811MPickupView2_PickupGridView.json",
"viewType" : "DEPICKUPGRIDVIEW",
"resource" : "Book",
"view" : "Usr01028811MPickupView2_PickupGridView"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookOptionView.json",
...
...
@@ -14781,6 +14787,12 @@
"viewType" : "DETABEXPVIEW9",
"resource" : "Book",
"view" : "TabExpView9"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028811MPickupView2.json",
"viewType" : "DEMPICKUPVIEW2",
"resource" : "Book",
"view" : "Usr01028811MPickupView2"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookRepeatEditView.json",
...
...
@@ -58267,6 +58279,10 @@
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr11178840CustomView.json",
"viewType" : "DECUSTOMVIEW"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028811MPickupView2_PickupGridView.json",
"viewType" : "DEPICKUPGRIDVIEW"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookOptionView.json",
...
...
@@ -58327,6 +58343,10 @@
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookTabExpView9.json",
"viewType" : "DETABEXPVIEW9"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028811MPickupView2.json",
"viewType" : "DEMPICKUPVIEW2"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookRepeatEditView.json",
trainsys-provider/pom.xml
浏览文件 @
84a1b1de
...
...
@@ -33,7 +33,7 @@
<profiles>
<profile>
<id>
trainsys
</id>
<id>
runtime
</id>
<build>
<resources>
<resource>
...
...
trainsys-provider/src/main/docker/Dockerfile
浏览文件 @
84a1b1de
...
...
@@ -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
浏览文件 @
84a1b1de
...
...
@@ -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
浏览文件 @
84a1b1de
...
...
@@ -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
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录