提交 3d0c9f86 编写于 作者: ibizdev's avatar ibizdev

zhujiamin 发布系统代码 [TrainSys,网页端]

上级 2c2039b8
...@@ -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>
......
...@@ -5890,6 +5890,12 @@ ...@@ -5890,6 +5890,12 @@
"name" : "测试实体实体分页导航视图(左侧)", "name" : "测试实体实体分页导航视图(左侧)",
"realModelSubType" : "DETABEXPVIEW", "realModelSubType" : "DETABEXPVIEW",
"realModelType" : "PSDEVIEWBASE" "realModelType" : "PSDEVIEWBASE"
}, {
"codeName" : "Usr02058437MPickupView",
"logicName" : "树下拉多选测试视图",
"name" : "树下拉多选测试视图",
"realModelSubType" : "DEMPICKUPVIEW",
"realModelType" : "PSDEVIEWBASE"
}, { }, {
"codeName" : "TreeExpView", "codeName" : "TreeExpView",
"logicName" : "测试树导航", "logicName" : "测试树导航",
...@@ -6222,6 +6228,12 @@ ...@@ -6222,6 +6228,12 @@
"name" : "测试实体实体编辑视图(编辑表单基础-默认处理-编辑)", "name" : "测试实体实体编辑视图(编辑表单基础-默认处理-编辑)",
"realModelSubType" : "DEEDITVIEW", "realModelSubType" : "DEEDITVIEW",
"realModelType" : "PSDEVIEWBASE" "realModelType" : "PSDEVIEWBASE"
}, {
"codeName" : "Usr02058437MPickupView_PickupGridView",
"logicName" : "树下拉多选测试视图_选择数据视图",
"name" : "树下拉多选测试视图_选择数据视图",
"realModelSubType" : "DEPICKUPGRIDVIEW",
"realModelType" : "PSDEVIEWBASE"
}, { }, {
"codeName" : "LogicGridView", "codeName" : "LogicGridView",
"logicName" : "逻辑测试表格视图", "logicName" : "逻辑测试表格视图",
......
...@@ -464,11 +464,11 @@ ...@@ -464,11 +464,11 @@
"id" : "TOOLBAR" "id" : "TOOLBAR"
}, },
"getPSDEToolbarItems" : [ { "getPSDEToolbarItems" : [ {
"caption" : "1111", "caption" : "分组1",
"itemType" : "ITEMS", "itemType" : "ITEMS",
"name" : "items1", "name" : "items1",
"getPSDEToolbarItems" : [ { "getPSDEToolbarItems" : [ {
"caption" : "2222", "caption" : "分组2",
"itemType" : "ITEMS", "itemType" : "ITEMS",
"name" : "items2", "name" : "items2",
"getPSDEToolbarItems" : [ { "getPSDEToolbarItems" : [ {
...@@ -532,43 +532,147 @@ ...@@ -532,43 +532,147 @@
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
"tooltip" : "2222", "tooltip" : "分组2",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
"tooltip" : "1111", "tooltip" : "分组1",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
}, { }, {
"caption" : "数据导入", "caption" : "分组3",
"itemType" : "ITEMS",
"name" : "items3",
"getPSDEToolbarItems" : [ {
"getCapPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TEXT.*.EXPORT",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EXPORT]",
"refFlag" : true
},
"caption" : "导出",
"groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION",
"name" : "deuiaction2",
"noPrivDisplayMode" : 2,
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "toolbar_deuiaction2"
},
"getPSSysImage" : {
"glyph" : "xf1c3@FontAwesome",
"cssClass" : "fa fa-file-excel-o"
},
"getPSUIAction" : {
"getCapPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TEXT.*.EXPORT",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EXPORT]",
"refFlag" : true
},
"caption" : "导出",
"codeName" : "ExportExcel",
"fullCodeName" : "ExportExcel",
"name" : "表格界面_导出操作(Excel)",
"getPSSysImage" : {
"glyph" : "xf1c3@FontAwesome",
"cssClass" : "fa fa-file-excel-o"
},
"predefinedType" : "GRIDVIEW_EXPORTACTION",
"timeout" : 60000,
"getTooltipPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TOOLTIP.*.EXPORT",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EXPORT]",
"refFlag" : true
},
"uIActionMode" : "SYS",
"uIActionTag" : "ExportExcel",
"uIActionType" : "DEUIACTION"
},
"tooltip" : "导出",
"getTooltipPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TOOLTIP.*.EXPORT",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EXPORT]",
"refFlag" : true
},
"showCaption" : true,
"showIcon" : true
}, {
"caption" : "数据导入",
"groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION",
"name" : "deuiaction3",
"noPrivDisplayMode" : 2,
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "toolbar_deuiaction3"
},
"getPSSysImage" : {
"glyph" : "xf093@FontAwesome",
"cssClass" : "fa fa-upload"
},
"getPSUIAction" : {
"caption" : "数据导入",
"codeName" : "Import",
"fullCodeName" : "Import",
"name" : "表格界面_数据导入栏",
"getPSSysImage" : {
"glyph" : "xf093@FontAwesome",
"cssClass" : "fa fa-upload"
},
"predefinedType" : "GRIDVIEW_IMPORTBAR",
"timeout" : 60000,
"uIActionMode" : "SYS",
"uIActionTag" : "Import",
"uIActionType" : "DEUIACTION"
},
"tooltip" : "数据导入",
"showCaption" : true,
"showIcon" : true
} ],
"tooltip" : "分组3",
"showCaption" : true,
"showIcon" : true
}, {
"itemType" : "SEPERATOR",
"name" : "seperator1",
"spanMode" : false
}, {
"caption" : "百度",
"groupExtractMode" : "ITEM", "groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION", "itemType" : "DEUIACTION",
"name" : "deuiaction2", "name" : "deuiaction4",
"noPrivDisplayMode" : 2, "noPrivDisplayMode" : 2,
"getPSAppViewUIAction" : { "getPSAppViewUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "toolbar_deuiaction2" "id" : "toolbar_deuiaction4"
},
"getPSSysImage" : {
"glyph" : "xf093@FontAwesome",
"cssClass" : "fa fa-upload"
}, },
"getPSUIAction" : { "getPSUIAction" : {
"caption" : "数据导入", "actionTarget" : "NONE",
"codeName" : "Import", "caption" : "百度",
"fullCodeName" : "Import", "codeName" : "openBaidu",
"name" : "表格界面_数据导入栏", "counterId" : "openBaidu",
"getPSSysImage" : { "frontProcessType" : "OPENHTMLPAGE",
"glyph" : "xf093@FontAwesome", "fullCodeName" : "openBaidu",
"cssClass" : "fa fa-upload" "htmlPageUrl" : "https://www.baidu.com/",
"name" : "百度",
"getPSAppCounter" : {
"modelref" : true,
"path" : "PSSYSAPPS/TemplatePublish/PSAPPCOUNTERS/UIActionCounter.json"
}, },
"predefinedType" : "GRIDVIEW_IMPORTBAR",
"timeout" : 60000, "timeout" : 60000,
"uIActionMode" : "SYS", "uIActionMode" : "FRONT",
"uIActionTag" : "Import", "uIActionTag" : "openBaidu",
"uIActionType" : "DEUIACTION" "uIActionType" : "DEUIACTION"
}, },
"tooltip" : "数据导入", "tooltip" : "百度",
"uIActionTarget" : "NONE",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
......
...@@ -114,11 +114,11 @@ ...@@ -114,11 +114,11 @@
"id" : "TOOLBAR" "id" : "TOOLBAR"
}, },
"getPSDEToolbarItems" : [ { "getPSDEToolbarItems" : [ {
"caption" : "1111", "caption" : "分组1",
"itemType" : "ITEMS", "itemType" : "ITEMS",
"name" : "items1", "name" : "items1",
"getPSDEToolbarItems" : [ { "getPSDEToolbarItems" : [ {
"caption" : "2222", "caption" : "分组2",
"itemType" : "ITEMS", "itemType" : "ITEMS",
"name" : "items2", "name" : "items2",
"getPSDEToolbarItems" : [ { "getPSDEToolbarItems" : [ {
...@@ -182,43 +182,147 @@ ...@@ -182,43 +182,147 @@
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
"tooltip" : "2222", "tooltip" : "分组2",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
"tooltip" : "1111", "tooltip" : "分组1",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
}, { }, {
"caption" : "数据导入", "caption" : "分组3",
"itemType" : "ITEMS",
"name" : "items3",
"getPSDEToolbarItems" : [ {
"getCapPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TEXT.*.EXPORT",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EXPORT]",
"refFlag" : true
},
"caption" : "导出",
"groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION",
"name" : "deuiaction2",
"noPrivDisplayMode" : 2,
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "toolbar_deuiaction2"
},
"getPSSysImage" : {
"glyph" : "xf1c3@FontAwesome",
"cssClass" : "fa fa-file-excel-o"
},
"getPSUIAction" : {
"getCapPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TEXT.*.EXPORT",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EXPORT]",
"refFlag" : true
},
"caption" : "导出",
"codeName" : "ExportExcel",
"fullCodeName" : "ExportExcel",
"name" : "表格界面_导出操作(Excel)",
"getPSSysImage" : {
"glyph" : "xf1c3@FontAwesome",
"cssClass" : "fa fa-file-excel-o"
},
"predefinedType" : "GRIDVIEW_EXPORTACTION",
"timeout" : 60000,
"getTooltipPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TOOLTIP.*.EXPORT",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EXPORT]",
"refFlag" : true
},
"uIActionMode" : "SYS",
"uIActionTag" : "ExportExcel",
"uIActionType" : "DEUIACTION"
},
"tooltip" : "导出",
"getTooltipPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TOOLTIP.*.EXPORT",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EXPORT]",
"refFlag" : true
},
"showCaption" : true,
"showIcon" : true
}, {
"caption" : "数据导入",
"groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION",
"name" : "deuiaction3",
"noPrivDisplayMode" : 2,
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "toolbar_deuiaction3"
},
"getPSSysImage" : {
"glyph" : "xf093@FontAwesome",
"cssClass" : "fa fa-upload"
},
"getPSUIAction" : {
"caption" : "数据导入",
"codeName" : "Import",
"fullCodeName" : "Import",
"name" : "表格界面_数据导入栏",
"getPSSysImage" : {
"glyph" : "xf093@FontAwesome",
"cssClass" : "fa fa-upload"
},
"predefinedType" : "GRIDVIEW_IMPORTBAR",
"timeout" : 60000,
"uIActionMode" : "SYS",
"uIActionTag" : "Import",
"uIActionType" : "DEUIACTION"
},
"tooltip" : "数据导入",
"showCaption" : true,
"showIcon" : true
} ],
"tooltip" : "分组3",
"showCaption" : true,
"showIcon" : true
}, {
"itemType" : "SEPERATOR",
"name" : "seperator1",
"spanMode" : false
}, {
"caption" : "百度",
"groupExtractMode" : "ITEM", "groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION", "itemType" : "DEUIACTION",
"name" : "deuiaction2", "name" : "deuiaction4",
"noPrivDisplayMode" : 2, "noPrivDisplayMode" : 2,
"getPSAppViewUIAction" : { "getPSAppViewUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "toolbar_deuiaction2" "id" : "toolbar_deuiaction4"
},
"getPSSysImage" : {
"glyph" : "xf093@FontAwesome",
"cssClass" : "fa fa-upload"
}, },
"getPSUIAction" : { "getPSUIAction" : {
"caption" : "数据导入", "actionTarget" : "NONE",
"codeName" : "Import", "caption" : "百度",
"fullCodeName" : "Import", "codeName" : "openBaidu",
"name" : "表格界面_数据导入栏", "counterId" : "openBaidu",
"getPSSysImage" : { "frontProcessType" : "OPENHTMLPAGE",
"glyph" : "xf093@FontAwesome", "fullCodeName" : "openBaidu",
"cssClass" : "fa fa-upload" "htmlPageUrl" : "https://www.baidu.com/",
"name" : "百度",
"getPSAppCounter" : {
"modelref" : true,
"path" : "PSSYSAPPS/TemplatePublish/PSAPPCOUNTERS/UIActionCounter.json"
}, },
"predefinedType" : "GRIDVIEW_IMPORTBAR",
"timeout" : 60000, "timeout" : 60000,
"uIActionMode" : "SYS", "uIActionMode" : "FRONT",
"uIActionTag" : "Import", "uIActionTag" : "openBaidu",
"uIActionType" : "DEUIACTION" "uIActionType" : "DEUIACTION"
}, },
"tooltip" : "数据导入", "tooltip" : "百度",
"uIActionTarget" : "NONE",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
......
...@@ -1161,11 +1161,11 @@ ...@@ -1161,11 +1161,11 @@
"id" : "TOOLBAR" "id" : "TOOLBAR"
}, },
"getPSDEToolbarItems" : [ { "getPSDEToolbarItems" : [ {
"caption" : "1111", "caption" : "分组1",
"itemType" : "ITEMS", "itemType" : "ITEMS",
"name" : "items1", "name" : "items1",
"getPSDEToolbarItems" : [ { "getPSDEToolbarItems" : [ {
"caption" : "2222", "caption" : "分组2",
"itemType" : "ITEMS", "itemType" : "ITEMS",
"name" : "items2", "name" : "items2",
"getPSDEToolbarItems" : [ { "getPSDEToolbarItems" : [ {
...@@ -1229,43 +1229,147 @@ ...@@ -1229,43 +1229,147 @@
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
"tooltip" : "2222", "tooltip" : "分组2",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
"tooltip" : "1111", "tooltip" : "分组1",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
}, { }, {
"caption" : "数据导入", "caption" : "分组3",
"itemType" : "ITEMS",
"name" : "items3",
"getPSDEToolbarItems" : [ {
"getCapPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TEXT.*.EXPORT",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EXPORT]",
"refFlag" : true
},
"caption" : "导出",
"groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION",
"name" : "deuiaction2",
"noPrivDisplayMode" : 2,
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "toolbar_deuiaction2"
},
"getPSSysImage" : {
"glyph" : "xf1c3@FontAwesome",
"cssClass" : "fa fa-file-excel-o"
},
"getPSUIAction" : {
"getCapPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TEXT.*.EXPORT",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EXPORT]",
"refFlag" : true
},
"caption" : "导出",
"codeName" : "ExportExcel",
"fullCodeName" : "ExportExcel",
"name" : "表格界面_导出操作(Excel)",
"getPSSysImage" : {
"glyph" : "xf1c3@FontAwesome",
"cssClass" : "fa fa-file-excel-o"
},
"predefinedType" : "GRIDVIEW_EXPORTACTION",
"timeout" : 60000,
"getTooltipPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TOOLTIP.*.EXPORT",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EXPORT]",
"refFlag" : true
},
"uIActionMode" : "SYS",
"uIActionTag" : "ExportExcel",
"uIActionType" : "DEUIACTION"
},
"tooltip" : "导出",
"getTooltipPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TOOLTIP.*.EXPORT",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EXPORT]",
"refFlag" : true
},
"showCaption" : true,
"showIcon" : true
}, {
"caption" : "数据导入",
"groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION",
"name" : "deuiaction3",
"noPrivDisplayMode" : 2,
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "toolbar_deuiaction3"
},
"getPSSysImage" : {
"glyph" : "xf093@FontAwesome",
"cssClass" : "fa fa-upload"
},
"getPSUIAction" : {
"caption" : "数据导入",
"codeName" : "Import",
"fullCodeName" : "Import",
"name" : "表格界面_数据导入栏",
"getPSSysImage" : {
"glyph" : "xf093@FontAwesome",
"cssClass" : "fa fa-upload"
},
"predefinedType" : "GRIDVIEW_IMPORTBAR",
"timeout" : 60000,
"uIActionMode" : "SYS",
"uIActionTag" : "Import",
"uIActionType" : "DEUIACTION"
},
"tooltip" : "数据导入",
"showCaption" : true,
"showIcon" : true
} ],
"tooltip" : "分组3",
"showCaption" : true,
"showIcon" : true
}, {
"itemType" : "SEPERATOR",
"name" : "seperator1",
"spanMode" : false
}, {
"caption" : "百度",
"groupExtractMode" : "ITEM", "groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION", "itemType" : "DEUIACTION",
"name" : "deuiaction2", "name" : "deuiaction4",
"noPrivDisplayMode" : 2, "noPrivDisplayMode" : 2,
"getPSAppViewUIAction" : { "getPSAppViewUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "toolbar_deuiaction2" "id" : "toolbar_deuiaction4"
},
"getPSSysImage" : {
"glyph" : "xf093@FontAwesome",
"cssClass" : "fa fa-upload"
}, },
"getPSUIAction" : { "getPSUIAction" : {
"caption" : "数据导入", "actionTarget" : "NONE",
"codeName" : "Import", "caption" : "百度",
"fullCodeName" : "Import", "codeName" : "openBaidu",
"name" : "表格界面_数据导入栏", "counterId" : "openBaidu",
"getPSSysImage" : { "frontProcessType" : "OPENHTMLPAGE",
"glyph" : "xf093@FontAwesome", "fullCodeName" : "openBaidu",
"cssClass" : "fa fa-upload" "htmlPageUrl" : "https://www.baidu.com/",
"name" : "百度",
"getPSAppCounter" : {
"modelref" : true,
"path" : "PSSYSAPPS/TemplatePublish/PSAPPCOUNTERS/UIActionCounter.json"
}, },
"predefinedType" : "GRIDVIEW_IMPORTBAR",
"timeout" : 60000, "timeout" : 60000,
"uIActionMode" : "SYS", "uIActionMode" : "FRONT",
"uIActionTag" : "Import", "uIActionTag" : "openBaidu",
"uIActionType" : "DEUIACTION" "uIActionType" : "DEUIACTION"
}, },
"tooltip" : "数据导入", "tooltip" : "百度",
"uIActionTarget" : "NONE",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
......
...@@ -464,11 +464,11 @@ ...@@ -464,11 +464,11 @@
"id" : "TOOLBAR" "id" : "TOOLBAR"
}, },
"getPSDEToolbarItems" : [ { "getPSDEToolbarItems" : [ {
"caption" : "1111", "caption" : "分组1",
"itemType" : "ITEMS", "itemType" : "ITEMS",
"name" : "items1", "name" : "items1",
"getPSDEToolbarItems" : [ { "getPSDEToolbarItems" : [ {
"caption" : "2222", "caption" : "分组2",
"itemType" : "ITEMS", "itemType" : "ITEMS",
"name" : "items2", "name" : "items2",
"getPSDEToolbarItems" : [ { "getPSDEToolbarItems" : [ {
...@@ -532,43 +532,147 @@ ...@@ -532,43 +532,147 @@
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
"tooltip" : "2222", "tooltip" : "分组2",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
"tooltip" : "1111", "tooltip" : "分组1",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
}, { }, {
"caption" : "数据导入", "caption" : "分组3",
"itemType" : "ITEMS",
"name" : "items3",
"getPSDEToolbarItems" : [ {
"getCapPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TEXT.*.EXPORT",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EXPORT]",
"refFlag" : true
},
"caption" : "导出",
"groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION",
"name" : "deuiaction2",
"noPrivDisplayMode" : 2,
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "toolbar_deuiaction2"
},
"getPSSysImage" : {
"glyph" : "xf1c3@FontAwesome",
"cssClass" : "fa fa-file-excel-o"
},
"getPSUIAction" : {
"getCapPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TEXT.*.EXPORT",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EXPORT]",
"refFlag" : true
},
"caption" : "导出",
"codeName" : "ExportExcel",
"fullCodeName" : "ExportExcel",
"name" : "表格界面_导出操作(Excel)",
"getPSSysImage" : {
"glyph" : "xf1c3@FontAwesome",
"cssClass" : "fa fa-file-excel-o"
},
"predefinedType" : "GRIDVIEW_EXPORTACTION",
"timeout" : 60000,
"getTooltipPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TOOLTIP.*.EXPORT",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EXPORT]",
"refFlag" : true
},
"uIActionMode" : "SYS",
"uIActionTag" : "ExportExcel",
"uIActionType" : "DEUIACTION"
},
"tooltip" : "导出",
"getTooltipPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TOOLTIP.*.EXPORT",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EXPORT]",
"refFlag" : true
},
"showCaption" : true,
"showIcon" : true
}, {
"caption" : "数据导入",
"groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION",
"name" : "deuiaction3",
"noPrivDisplayMode" : 2,
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "toolbar_deuiaction3"
},
"getPSSysImage" : {
"glyph" : "xf093@FontAwesome",
"cssClass" : "fa fa-upload"
},
"getPSUIAction" : {
"caption" : "数据导入",
"codeName" : "Import",
"fullCodeName" : "Import",
"name" : "表格界面_数据导入栏",
"getPSSysImage" : {
"glyph" : "xf093@FontAwesome",
"cssClass" : "fa fa-upload"
},
"predefinedType" : "GRIDVIEW_IMPORTBAR",
"timeout" : 60000,
"uIActionMode" : "SYS",
"uIActionTag" : "Import",
"uIActionType" : "DEUIACTION"
},
"tooltip" : "数据导入",
"showCaption" : true,
"showIcon" : true
} ],
"tooltip" : "分组3",
"showCaption" : true,
"showIcon" : true
}, {
"itemType" : "SEPERATOR",
"name" : "seperator1",
"spanMode" : false
}, {
"caption" : "百度",
"groupExtractMode" : "ITEM", "groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION", "itemType" : "DEUIACTION",
"name" : "deuiaction2", "name" : "deuiaction4",
"noPrivDisplayMode" : 2, "noPrivDisplayMode" : 2,
"getPSAppViewUIAction" : { "getPSAppViewUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "toolbar_deuiaction2" "id" : "toolbar_deuiaction4"
},
"getPSSysImage" : {
"glyph" : "xf093@FontAwesome",
"cssClass" : "fa fa-upload"
}, },
"getPSUIAction" : { "getPSUIAction" : {
"caption" : "数据导入", "actionTarget" : "NONE",
"codeName" : "Import", "caption" : "百度",
"fullCodeName" : "Import", "codeName" : "openBaidu",
"name" : "表格界面_数据导入栏", "counterId" : "openBaidu",
"getPSSysImage" : { "frontProcessType" : "OPENHTMLPAGE",
"glyph" : "xf093@FontAwesome", "fullCodeName" : "openBaidu",
"cssClass" : "fa fa-upload" "htmlPageUrl" : "https://www.baidu.com/",
"name" : "百度",
"getPSAppCounter" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCOUNTERS/UIActionCounter.json"
}, },
"predefinedType" : "GRIDVIEW_IMPORTBAR",
"timeout" : 60000, "timeout" : 60000,
"uIActionMode" : "SYS", "uIActionMode" : "FRONT",
"uIActionTag" : "Import", "uIActionTag" : "openBaidu",
"uIActionType" : "DEUIACTION" "uIActionType" : "DEUIACTION"
}, },
"tooltip" : "数据导入", "tooltip" : "百度",
"uIActionTarget" : "NONE",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
......
...@@ -6530,6 +6530,10 @@ ...@@ -6530,6 +6530,10 @@
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr19EditView_8467.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr19EditView_8467.json",
"viewType" : "DEEDITVIEW" "viewType" : "DEEDITVIEW"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr02058437MPickupView.json",
"viewType" : "DEMPICKUPVIEW"
}, { }, {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTRowEditGridView.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTRowEditGridView.json",
...@@ -6746,6 +6750,10 @@ ...@@ -6746,6 +6750,10 @@
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTwfTestEditView.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTwfTestEditView.json",
"viewType" : "DEEDITVIEW" "viewType" : "DEEDITVIEW"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr02058437MPickupView_PickupGridView.json",
"viewType" : "DEPICKUPGRIDVIEW"
}, { }, {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView9.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView9.json",
......
{
"aggMode" : "NONE",
"codeName" : "Usr02058437MPickupView_PickupGridView_Grid",
"columnEnableFilter" : 2,
"columnEnableLink" : 2,
"controlType" : "GRID",
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSGRIDS/Usr02058437MPickupView_PickupGridView_Grid.json",
"getFetchPSControlAction" : {
"modelref" : true,
"id" : "fetch",
"actionType" : "DEDATASET",
"name" : "fetch",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "FetchDefault"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}
},
"groupMode" : "NONE",
"logicName" : "树下拉多选测试视图_选择数据视图_表格",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
},
"getPSDEDataImport" : {
"modelref" : true,
"id" : "DataImport"
},
"getPSDEGridColumns" : [ {
"align" : "LEFT",
"cLConvertMode" : "NONE",
"caption" : "测试实体名称",
"codeName" : "testname",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "testname",
"excelCaption" : "测试实体名称",
"name" : "testname",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "TESTNAME",
"codeName" : "TESTName"
},
"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" : "testname",
"getPSAppDEField" : {
"name" : "TESTNAME",
"codeName" : "TESTName"
}
}, {
"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" : "TESTID",
"codeName" : "TESTId"
}
}, {
"dataType" : 25,
"name" : "srfdataaccaction",
"getPSAppDEField" : {
"name" : "TESTID",
"codeName" : "TESTId"
},
"dataAccessAction" : true
}, {
"dataType" : 25,
"name" : "srfmajortext",
"getPSAppDEField" : {
"name" : "TESTNAME",
"codeName" : "TESTName"
}
} ],
"getPSDEGridEditItems" : [ {
"caption" : "测试实体标识",
"codeName" : "srfkey",
"enableCond" : 3,
"ignoreInput" : 0,
"name" : "srfkey",
"getPSAppDEField" : {
"name" : "TESTID",
"codeName" : "TESTId"
},
"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/TEST.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" : "3D17B86F-4A91-4723-B301-9E98823F6C66",
"modeltype" : "PSDEGRID"
}
\ No newline at end of file
{
"codeName" : "Usr02053545_SearchForm",
"controlType" : "SEARCHFORM",
"defaultLabelWidth" : 130,
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSSEARCHFORMS/Usr02053545_SearchForm.json",
"logicName" : "树下拉多选测试视图_选择数据视图_搜索表单",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.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" : "3DDC503A-5472-45E4-9075-DEF203275DDA",
"modeltype" : "PSDEFORM_SEARCHFORM"
}
\ No newline at end of file
...@@ -114,11 +114,11 @@ ...@@ -114,11 +114,11 @@
"id" : "TOOLBAR" "id" : "TOOLBAR"
}, },
"getPSDEToolbarItems" : [ { "getPSDEToolbarItems" : [ {
"caption" : "1111", "caption" : "分组1",
"itemType" : "ITEMS", "itemType" : "ITEMS",
"name" : "items1", "name" : "items1",
"getPSDEToolbarItems" : [ { "getPSDEToolbarItems" : [ {
"caption" : "2222", "caption" : "分组2",
"itemType" : "ITEMS", "itemType" : "ITEMS",
"name" : "items2", "name" : "items2",
"getPSDEToolbarItems" : [ { "getPSDEToolbarItems" : [ {
...@@ -182,43 +182,147 @@ ...@@ -182,43 +182,147 @@
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
"tooltip" : "2222", "tooltip" : "分组2",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
"tooltip" : "1111", "tooltip" : "分组1",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
}, { }, {
"caption" : "数据导入", "caption" : "分组3",
"itemType" : "ITEMS",
"name" : "items3",
"getPSDEToolbarItems" : [ {
"getCapPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TEXT.*.EXPORT",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EXPORT]",
"refFlag" : true
},
"caption" : "导出",
"groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION",
"name" : "deuiaction2",
"noPrivDisplayMode" : 2,
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "toolbar_deuiaction2"
},
"getPSSysImage" : {
"glyph" : "xf1c3@FontAwesome",
"cssClass" : "fa fa-file-excel-o"
},
"getPSUIAction" : {
"getCapPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TEXT.*.EXPORT",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EXPORT]",
"refFlag" : true
},
"caption" : "导出",
"codeName" : "ExportExcel",
"fullCodeName" : "ExportExcel",
"name" : "表格界面_导出操作(Excel)",
"getPSSysImage" : {
"glyph" : "xf1c3@FontAwesome",
"cssClass" : "fa fa-file-excel-o"
},
"predefinedType" : "GRIDVIEW_EXPORTACTION",
"timeout" : 60000,
"getTooltipPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TOOLTIP.*.EXPORT",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EXPORT]",
"refFlag" : true
},
"uIActionMode" : "SYS",
"uIActionTag" : "ExportExcel",
"uIActionType" : "DEUIACTION"
},
"tooltip" : "导出",
"getTooltipPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TOOLTIP.*.EXPORT",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EXPORT]",
"refFlag" : true
},
"showCaption" : true,
"showIcon" : true
}, {
"caption" : "数据导入",
"groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION",
"name" : "deuiaction3",
"noPrivDisplayMode" : 2,
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "toolbar_deuiaction3"
},
"getPSSysImage" : {
"glyph" : "xf093@FontAwesome",
"cssClass" : "fa fa-upload"
},
"getPSUIAction" : {
"caption" : "数据导入",
"codeName" : "Import",
"fullCodeName" : "Import",
"name" : "表格界面_数据导入栏",
"getPSSysImage" : {
"glyph" : "xf093@FontAwesome",
"cssClass" : "fa fa-upload"
},
"predefinedType" : "GRIDVIEW_IMPORTBAR",
"timeout" : 60000,
"uIActionMode" : "SYS",
"uIActionTag" : "Import",
"uIActionType" : "DEUIACTION"
},
"tooltip" : "数据导入",
"showCaption" : true,
"showIcon" : true
} ],
"tooltip" : "分组3",
"showCaption" : true,
"showIcon" : true
}, {
"itemType" : "SEPERATOR",
"name" : "seperator1",
"spanMode" : false
}, {
"caption" : "百度",
"groupExtractMode" : "ITEM", "groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION", "itemType" : "DEUIACTION",
"name" : "deuiaction2", "name" : "deuiaction4",
"noPrivDisplayMode" : 2, "noPrivDisplayMode" : 2,
"getPSAppViewUIAction" : { "getPSAppViewUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "toolbar_deuiaction2" "id" : "toolbar_deuiaction4"
},
"getPSSysImage" : {
"glyph" : "xf093@FontAwesome",
"cssClass" : "fa fa-upload"
}, },
"getPSUIAction" : { "getPSUIAction" : {
"caption" : "数据导入", "actionTarget" : "NONE",
"codeName" : "Import", "caption" : "百度",
"fullCodeName" : "Import", "codeName" : "openBaidu",
"name" : "表格界面_数据导入栏", "counterId" : "openBaidu",
"getPSSysImage" : { "frontProcessType" : "OPENHTMLPAGE",
"glyph" : "xf093@FontAwesome", "fullCodeName" : "openBaidu",
"cssClass" : "fa fa-upload" "htmlPageUrl" : "https://www.baidu.com/",
"name" : "百度",
"getPSAppCounter" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCOUNTERS/UIActionCounter.json"
}, },
"predefinedType" : "GRIDVIEW_IMPORTBAR",
"timeout" : 60000, "timeout" : 60000,
"uIActionMode" : "SYS", "uIActionMode" : "FRONT",
"uIActionTag" : "Import", "uIActionTag" : "openBaidu",
"uIActionType" : "DEUIACTION" "uIActionType" : "DEUIACTION"
}, },
"tooltip" : "数据导入", "tooltip" : "百度",
"uIActionTarget" : "NONE",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
......
...@@ -1161,11 +1161,11 @@ ...@@ -1161,11 +1161,11 @@
"id" : "TOOLBAR" "id" : "TOOLBAR"
}, },
"getPSDEToolbarItems" : [ { "getPSDEToolbarItems" : [ {
"caption" : "1111", "caption" : "分组1",
"itemType" : "ITEMS", "itemType" : "ITEMS",
"name" : "items1", "name" : "items1",
"getPSDEToolbarItems" : [ { "getPSDEToolbarItems" : [ {
"caption" : "2222", "caption" : "分组2",
"itemType" : "ITEMS", "itemType" : "ITEMS",
"name" : "items2", "name" : "items2",
"getPSDEToolbarItems" : [ { "getPSDEToolbarItems" : [ {
...@@ -1229,43 +1229,147 @@ ...@@ -1229,43 +1229,147 @@
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
"tooltip" : "2222", "tooltip" : "分组2",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
"tooltip" : "1111", "tooltip" : "分组1",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
}, { }, {
"caption" : "数据导入", "caption" : "分组3",
"itemType" : "ITEMS",
"name" : "items3",
"getPSDEToolbarItems" : [ {
"getCapPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TEXT.*.EXPORT",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EXPORT]",
"refFlag" : true
},
"caption" : "导出",
"groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION",
"name" : "deuiaction2",
"noPrivDisplayMode" : 2,
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "toolbar_deuiaction2"
},
"getPSSysImage" : {
"glyph" : "xf1c3@FontAwesome",
"cssClass" : "fa fa-file-excel-o"
},
"getPSUIAction" : {
"getCapPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TEXT.*.EXPORT",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EXPORT]",
"refFlag" : true
},
"caption" : "导出",
"codeName" : "ExportExcel",
"fullCodeName" : "ExportExcel",
"name" : "表格界面_导出操作(Excel)",
"getPSSysImage" : {
"glyph" : "xf1c3@FontAwesome",
"cssClass" : "fa fa-file-excel-o"
},
"predefinedType" : "GRIDVIEW_EXPORTACTION",
"timeout" : 60000,
"getTooltipPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TOOLTIP.*.EXPORT",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EXPORT]",
"refFlag" : true
},
"uIActionMode" : "SYS",
"uIActionTag" : "ExportExcel",
"uIActionType" : "DEUIACTION"
},
"tooltip" : "导出",
"getTooltipPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TOOLTIP.*.EXPORT",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EXPORT]",
"refFlag" : true
},
"showCaption" : true,
"showIcon" : true
}, {
"caption" : "数据导入",
"groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION",
"name" : "deuiaction3",
"noPrivDisplayMode" : 2,
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "toolbar_deuiaction3"
},
"getPSSysImage" : {
"glyph" : "xf093@FontAwesome",
"cssClass" : "fa fa-upload"
},
"getPSUIAction" : {
"caption" : "数据导入",
"codeName" : "Import",
"fullCodeName" : "Import",
"name" : "表格界面_数据导入栏",
"getPSSysImage" : {
"glyph" : "xf093@FontAwesome",
"cssClass" : "fa fa-upload"
},
"predefinedType" : "GRIDVIEW_IMPORTBAR",
"timeout" : 60000,
"uIActionMode" : "SYS",
"uIActionTag" : "Import",
"uIActionType" : "DEUIACTION"
},
"tooltip" : "数据导入",
"showCaption" : true,
"showIcon" : true
} ],
"tooltip" : "分组3",
"showCaption" : true,
"showIcon" : true
}, {
"itemType" : "SEPERATOR",
"name" : "seperator1",
"spanMode" : false
}, {
"caption" : "百度",
"groupExtractMode" : "ITEM", "groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION", "itemType" : "DEUIACTION",
"name" : "deuiaction2", "name" : "deuiaction4",
"noPrivDisplayMode" : 2, "noPrivDisplayMode" : 2,
"getPSAppViewUIAction" : { "getPSAppViewUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "toolbar_deuiaction2" "id" : "toolbar_deuiaction4"
},
"getPSSysImage" : {
"glyph" : "xf093@FontAwesome",
"cssClass" : "fa fa-upload"
}, },
"getPSUIAction" : { "getPSUIAction" : {
"caption" : "数据导入", "actionTarget" : "NONE",
"codeName" : "Import", "caption" : "百度",
"fullCodeName" : "Import", "codeName" : "openBaidu",
"name" : "表格界面_数据导入栏", "counterId" : "openBaidu",
"getPSSysImage" : { "frontProcessType" : "OPENHTMLPAGE",
"glyph" : "xf093@FontAwesome", "fullCodeName" : "openBaidu",
"cssClass" : "fa fa-upload" "htmlPageUrl" : "https://www.baidu.com/",
"name" : "百度",
"getPSAppCounter" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCOUNTERS/UIActionCounter.json"
}, },
"predefinedType" : "GRIDVIEW_IMPORTBAR",
"timeout" : 60000, "timeout" : 60000,
"uIActionMode" : "SYS", "uIActionMode" : "FRONT",
"uIActionTag" : "Import", "uIActionTag" : "openBaidu",
"uIActionType" : "DEUIACTION" "uIActionType" : "DEUIACTION"
}, },
"tooltip" : "数据导入", "tooltip" : "百度",
"uIActionTarget" : "NONE",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
......
...@@ -1159,11 +1159,11 @@ ...@@ -1159,11 +1159,11 @@
"id" : "TOOLBAR" "id" : "TOOLBAR"
}, },
"getPSDEToolbarItems" : [ { "getPSDEToolbarItems" : [ {
"caption" : "1111", "caption" : "分组1",
"itemType" : "ITEMS", "itemType" : "ITEMS",
"name" : "items1", "name" : "items1",
"getPSDEToolbarItems" : [ { "getPSDEToolbarItems" : [ {
"caption" : "2222", "caption" : "分组2",
"itemType" : "ITEMS", "itemType" : "ITEMS",
"name" : "items2", "name" : "items2",
"getPSDEToolbarItems" : [ { "getPSDEToolbarItems" : [ {
...@@ -1227,43 +1227,147 @@ ...@@ -1227,43 +1227,147 @@
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
"tooltip" : "2222", "tooltip" : "分组2",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
"tooltip" : "1111", "tooltip" : "分组1",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
}, { }, {
"caption" : "数据导入", "caption" : "分组3",
"itemType" : "ITEMS",
"name" : "items3",
"getPSDEToolbarItems" : [ {
"getCapPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TEXT.*.EXPORT",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EXPORT]",
"refFlag" : true
},
"caption" : "导出",
"groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION",
"name" : "deuiaction2",
"noPrivDisplayMode" : 2,
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "toolbar_deuiaction2"
},
"getPSSysImage" : {
"glyph" : "xf1c3@FontAwesome",
"cssClass" : "fa fa-file-excel-o"
},
"getPSUIAction" : {
"getCapPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TEXT.*.EXPORT",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EXPORT]",
"refFlag" : true
},
"caption" : "导出",
"codeName" : "ExportExcel",
"fullCodeName" : "ExportExcel",
"name" : "表格界面_导出操作(Excel)",
"getPSSysImage" : {
"glyph" : "xf1c3@FontAwesome",
"cssClass" : "fa fa-file-excel-o"
},
"predefinedType" : "GRIDVIEW_EXPORTACTION",
"timeout" : 60000,
"getTooltipPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TOOLTIP.*.EXPORT",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EXPORT]",
"refFlag" : true
},
"uIActionMode" : "SYS",
"uIActionTag" : "ExportExcel",
"uIActionType" : "DEUIACTION"
},
"tooltip" : "导出",
"getTooltipPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TOOLTIP.*.EXPORT",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EXPORT]",
"refFlag" : true
},
"showCaption" : true,
"showIcon" : true
}, {
"caption" : "数据导入",
"groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION",
"name" : "deuiaction3",
"noPrivDisplayMode" : 2,
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "toolbar_deuiaction3"
},
"getPSSysImage" : {
"glyph" : "xf093@FontAwesome",
"cssClass" : "fa fa-upload"
},
"getPSUIAction" : {
"caption" : "数据导入",
"codeName" : "Import",
"fullCodeName" : "Import",
"name" : "表格界面_数据导入栏",
"getPSSysImage" : {
"glyph" : "xf093@FontAwesome",
"cssClass" : "fa fa-upload"
},
"predefinedType" : "GRIDVIEW_IMPORTBAR",
"timeout" : 60000,
"uIActionMode" : "SYS",
"uIActionTag" : "Import",
"uIActionType" : "DEUIACTION"
},
"tooltip" : "数据导入",
"showCaption" : true,
"showIcon" : true
} ],
"tooltip" : "分组3",
"showCaption" : true,
"showIcon" : true
}, {
"itemType" : "SEPERATOR",
"name" : "seperator1",
"spanMode" : false
}, {
"caption" : "百度",
"groupExtractMode" : "ITEM", "groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION", "itemType" : "DEUIACTION",
"name" : "deuiaction2", "name" : "deuiaction4",
"noPrivDisplayMode" : 2, "noPrivDisplayMode" : 2,
"getPSAppViewUIAction" : { "getPSAppViewUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "toolbar_deuiaction2" "id" : "toolbar_deuiaction4"
},
"getPSSysImage" : {
"glyph" : "xf093@FontAwesome",
"cssClass" : "fa fa-upload"
}, },
"getPSUIAction" : { "getPSUIAction" : {
"caption" : "数据导入", "actionTarget" : "NONE",
"codeName" : "Import", "caption" : "百度",
"fullCodeName" : "Import", "codeName" : "openBaidu",
"name" : "表格界面_数据导入栏", "counterId" : "openBaidu",
"getPSSysImage" : { "frontProcessType" : "OPENHTMLPAGE",
"glyph" : "xf093@FontAwesome", "fullCodeName" : "openBaidu",
"cssClass" : "fa fa-upload" "htmlPageUrl" : "https://www.baidu.com/",
"name" : "百度",
"getPSAppCounter" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCOUNTERS/UIActionCounter.json"
}, },
"predefinedType" : "GRIDVIEW_IMPORTBAR",
"timeout" : 60000, "timeout" : 60000,
"uIActionMode" : "SYS", "uIActionMode" : "FRONT",
"uIActionTag" : "Import", "uIActionTag" : "openBaidu",
"uIActionType" : "DEUIACTION" "uIActionType" : "DEUIACTION"
}, },
"tooltip" : "数据导入", "tooltip" : "百度",
"uIActionTarget" : "NONE",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
......
...@@ -1219,11 +1219,11 @@ ...@@ -1219,11 +1219,11 @@
"id" : "TOOLBAR" "id" : "TOOLBAR"
}, },
"getPSDEToolbarItems" : [ { "getPSDEToolbarItems" : [ {
"caption" : "1111", "caption" : "分组1",
"itemType" : "ITEMS", "itemType" : "ITEMS",
"name" : "items1", "name" : "items1",
"getPSDEToolbarItems" : [ { "getPSDEToolbarItems" : [ {
"caption" : "2222", "caption" : "分组2",
"itemType" : "ITEMS", "itemType" : "ITEMS",
"name" : "items2", "name" : "items2",
"getPSDEToolbarItems" : [ { "getPSDEToolbarItems" : [ {
...@@ -1287,43 +1287,147 @@ ...@@ -1287,43 +1287,147 @@
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
"tooltip" : "2222", "tooltip" : "分组2",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
"tooltip" : "1111", "tooltip" : "分组1",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
}, { }, {
"caption" : "数据导入", "caption" : "分组3",
"itemType" : "ITEMS",
"name" : "items3",
"getPSDEToolbarItems" : [ {
"getCapPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TEXT.*.EXPORT",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EXPORT]",
"refFlag" : true
},
"caption" : "导出",
"groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION",
"name" : "deuiaction2",
"noPrivDisplayMode" : 2,
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "toolbar_deuiaction2"
},
"getPSSysImage" : {
"glyph" : "xf1c3@FontAwesome",
"cssClass" : "fa fa-file-excel-o"
},
"getPSUIAction" : {
"getCapPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TEXT.*.EXPORT",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EXPORT]",
"refFlag" : true
},
"caption" : "导出",
"codeName" : "ExportExcel",
"fullCodeName" : "ExportExcel",
"name" : "表格界面_导出操作(Excel)",
"getPSSysImage" : {
"glyph" : "xf1c3@FontAwesome",
"cssClass" : "fa fa-file-excel-o"
},
"predefinedType" : "GRIDVIEW_EXPORTACTION",
"timeout" : 60000,
"getTooltipPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TOOLTIP.*.EXPORT",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EXPORT]",
"refFlag" : true
},
"uIActionMode" : "SYS",
"uIActionTag" : "ExportExcel",
"uIActionType" : "DEUIACTION"
},
"tooltip" : "导出",
"getTooltipPSLanguageRes" : {
"defaultContent" : "导出",
"lanResTag" : "TBB.TOOLTIP.*.EXPORT",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EXPORT]",
"refFlag" : true
},
"showCaption" : true,
"showIcon" : true
}, {
"caption" : "数据导入",
"groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION",
"name" : "deuiaction3",
"noPrivDisplayMode" : 2,
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "toolbar_deuiaction3"
},
"getPSSysImage" : {
"glyph" : "xf093@FontAwesome",
"cssClass" : "fa fa-upload"
},
"getPSUIAction" : {
"caption" : "数据导入",
"codeName" : "Import",
"fullCodeName" : "Import",
"name" : "表格界面_数据导入栏",
"getPSSysImage" : {
"glyph" : "xf093@FontAwesome",
"cssClass" : "fa fa-upload"
},
"predefinedType" : "GRIDVIEW_IMPORTBAR",
"timeout" : 60000,
"uIActionMode" : "SYS",
"uIActionTag" : "Import",
"uIActionType" : "DEUIACTION"
},
"tooltip" : "数据导入",
"showCaption" : true,
"showIcon" : true
} ],
"tooltip" : "分组3",
"showCaption" : true,
"showIcon" : true
}, {
"itemType" : "SEPERATOR",
"name" : "seperator1",
"spanMode" : false
}, {
"caption" : "百度",
"groupExtractMode" : "ITEM", "groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION", "itemType" : "DEUIACTION",
"name" : "deuiaction2", "name" : "deuiaction4",
"noPrivDisplayMode" : 2, "noPrivDisplayMode" : 2,
"getPSAppViewUIAction" : { "getPSAppViewUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "toolbar_deuiaction2" "id" : "toolbar_deuiaction4"
},
"getPSSysImage" : {
"glyph" : "xf093@FontAwesome",
"cssClass" : "fa fa-upload"
}, },
"getPSUIAction" : { "getPSUIAction" : {
"caption" : "数据导入", "actionTarget" : "NONE",
"codeName" : "Import", "caption" : "百度",
"fullCodeName" : "Import", "codeName" : "openBaidu",
"name" : "表格界面_数据导入栏", "counterId" : "openBaidu",
"getPSSysImage" : { "frontProcessType" : "OPENHTMLPAGE",
"glyph" : "xf093@FontAwesome", "fullCodeName" : "openBaidu",
"cssClass" : "fa fa-upload" "htmlPageUrl" : "https://www.baidu.com/",
"name" : "百度",
"getPSAppCounter" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCOUNTERS/UIActionCounter.json"
}, },
"predefinedType" : "GRIDVIEW_IMPORTBAR",
"timeout" : 60000, "timeout" : 60000,
"uIActionMode" : "SYS", "uIActionMode" : "FRONT",
"uIActionTag" : "Import", "uIActionTag" : "openBaidu",
"uIActionType" : "DEUIACTION" "uIActionType" : "DEUIACTION"
}, },
"tooltip" : "数据导入", "tooltip" : "百度",
"uIActionTarget" : "NONE",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
......
...@@ -13590,16 +13590,16 @@ ...@@ -13590,16 +13590,16 @@
"id" : "ViewMsg4" "id" : "ViewMsg4"
} }
}, { }, {
"name" : "消息类型-错误信息", "name" : "消息类型-警告信息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg6" "id" : "ViewMsg5"
} }
}, { }, {
"name" : "消息类型-警告信息", "name" : "消息类型-错误信息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg5" "id" : "ViewMsg6"
} }
} ] } ]
}, { }, {
...@@ -13644,6 +13644,24 @@ ...@@ -13644,6 +13644,24 @@
"codeName" : "VMGroup8", "codeName" : "VMGroup8",
"name" : "【静态测试】", "name" : "【静态测试】",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "关闭模式-默认删除-上方-错误",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
}
}, {
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
}
}, {
"name" : "关闭模式-本次删除-上方-警告",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg13"
}
}, {
"name" : "消息位置-视图下方", "name" : "消息位置-视图下方",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
...@@ -13663,13 +13681,6 @@ ...@@ -13663,13 +13681,6 @@
"id" : "ViewMsg5" "id" : "ViewMsg5"
}, },
"position" : "POPUP" "position" : "POPUP"
}, {
"name" : "消息类型-常规信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg4"
},
"position" : "POPUP"
}, { }, {
"name" : "关闭模式-无删除-上方-常规", "name" : "关闭模式-无删除-上方-常规",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
...@@ -13677,34 +13688,17 @@ ...@@ -13677,34 +13688,17 @@
"id" : "ViewMsg11" "id" : "ViewMsg11"
} }
}, { }, {
"name" : "消息位置-视图内容区", "name" : "消息类型-常规信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
}
}, {
"name" : "关闭模式-默认删除-上方-错误",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
}
}, {
"name" : "关闭模式-本次删除-上方-警告",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg13" "id" : "ViewMsg4"
} },
"position" : "POPUP"
} ] } ]
}, { }, {
"codeName" : "VMGroup5", "codeName" : "VMGroup5",
"name" : "视图消息关闭模式", "name" : "视图消息关闭模式",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "关闭模式-默认删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
}
}, {
"name" : "关闭模式-本次删除", "name" : "关闭模式-本次删除",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
...@@ -13716,6 +13710,12 @@ ...@@ -13716,6 +13710,12 @@
"modelref" : true, "modelref" : true,
"id" : "ViewMsg11" "id" : "ViewMsg11"
} }
}, {
"name" : "关闭模式-默认删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
}
} ] } ]
}, { }, {
"codeName" : "VMGroup6", "codeName" : "VMGroup6",
...@@ -15125,6 +15125,12 @@ ...@@ -15125,6 +15125,12 @@
"viewType" : "DEEDITVIEW", "viewType" : "DEEDITVIEW",
"resource" : "TEST", "resource" : "TEST",
"view" : "Usr19EditView_8467" "view" : "Usr19EditView_8467"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr02058437MPickupView.json",
"viewType" : "DEMPICKUPVIEW",
"resource" : "TEST",
"view" : "Usr02058437MPickupView"
}, { }, {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2GridView_Test.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2GridView_Test.json",
...@@ -16388,6 +16394,12 @@ ...@@ -16388,6 +16394,12 @@
"viewType" : "DEEDITVIEW2", "viewType" : "DEEDITVIEW2",
"resource" : "Song", "resource" : "Song",
"view" : "EditView2" "view" : "EditView2"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr02058437MPickupView_PickupGridView.json",
"viewType" : "DEPICKUPGRIDVIEW",
"resource" : "TEST",
"view" : "Usr02058437MPickupView_PickupGridView"
}, { }, {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentRedirectView.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentRedirectView.json",
...@@ -62501,6 +62513,10 @@ ...@@ -62501,6 +62513,10 @@
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr19EditView_8467.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr19EditView_8467.json",
"viewType" : "DEEDITVIEW" "viewType" : "DEEDITVIEW"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr02058437MPickupView.json",
"viewType" : "DEMPICKUPVIEW"
}, { }, {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTRowEditGridView.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTRowEditGridView.json",
...@@ -62717,6 +62733,10 @@ ...@@ -62717,6 +62733,10 @@
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTwfTestEditView.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTwfTestEditView.json",
"viewType" : "DEEDITVIEW" "viewType" : "DEEDITVIEW"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr02058437MPickupView_PickupGridView.json",
"viewType" : "DEPICKUPGRIDVIEW"
}, { }, {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView9.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView9.json",
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<profiles> <profiles>
<profile> <profile>
<id>trainsys</id> <id>runtime</id>
<build> <build>
<resources> <resources>
<resource> <resource>
......
...@@ -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
...@@ -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
......
...@@ -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 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册