Skip to content

T
TrainSys
提交 e382826f 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

tony001 发布系统代码 [TrainSys，Mob]

上级 ff73cf9c
隐藏空白字符变更
内嵌 并排
正在显示 包含 1204 行增加 和 61 行删除
app_Mob/src/store/modules/view-action/state.ts
浏览文件 @ e382826f
...@@ -76,6 +76,25 @@ export const viewstate: any = { ...@@ -76,6 +76,25 @@ export const viewstate: any = {
refviews: [ refviews: [
], ],
}, },
{
viewtag: '5bb966a86798a0aeb3fbde3b42d0c1d3',
viewmodule: 'Test',
viewname: 'TESTMobPickupTreeView',
viewaction: '',
viewdatachange: false,
refviews: [
],
},
{
viewtag: '6e16bc0d8de66d6238b48f624caa7911',
viewmodule: 'Test',
viewname: 'TESTUsr2MobMPickupView',
viewaction: '',
viewdatachange: false,
refviews: [
'5bb966a86798a0aeb3fbde3b42d0c1d3',
],
},
{ {
viewtag: '753676DB-2531-4A22-AA4E-FB9EA9BF8B3F', viewtag: '753676DB-2531-4A22-AA4E-FB9EA9BF8B3F',
viewmodule: 'Test', viewmodule: 'Test',
...@@ -112,6 +131,7 @@ export const viewstate: any = { ...@@ -112,6 +131,7 @@ export const viewstate: any = {
'cf108dcc6825ab45f18c8c242be1d923', 'cf108dcc6825ab45f18c8c242be1d923',
'BFE57DB2-95D0-4432-8851-BCDAD09ECD59', 'BFE57DB2-95D0-4432-8851-BCDAD09ECD59',
'5b0adc6008e49c23a960417dc8b3d9f3', '5b0adc6008e49c23a960417dc8b3d9f3',
'6e16bc0d8de66d6238b48f624caa7911',
], ],
}, },
{ {
......
config.xml
浏览文件 @ e382826f
...@@ -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/PSMODULES/Test/PSDATAENTITIES/TEST.json
浏览文件 @ e382826f
...@@ -3079,6 +3079,12 @@ ...@@ -3079,6 +3079,12 @@
"name" : " 实体移动端编辑视图（分页关系）", "name" : " 实体移动端编辑视图（分页关系）",
"realModelSubType" : "DEMOBEDITVIEW3", "realModelSubType" : "DEMOBEDITVIEW3",
"realModelType" : "PSDEVIEWBASE" "realModelType" : "PSDEVIEWBASE"
}, {
"codeName" : "Usr2MobMPickupView",
"logicName" : "测试实体实体移动端多数据选择视图(树)",
"name" : "测试实体实体移动端多数据选择视图(树)",
"realModelSubType" : "DEMOBMPICKUPVIEW",
"realModelType" : "PSDEVIEWBASE"
}, { }, {
"codeName" : "MobPickupView", "codeName" : "MobPickupView",
"logicName" : "测试实体实体移动端数据选择视图", "logicName" : "测试实体实体移动端数据选择视图",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json
浏览文件 @ e382826f
...@@ -2912,6 +2912,10 @@ ...@@ -2912,6 +2912,10 @@
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTMobPickupTreeView.json", "path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTMobPickupTreeView.json",
"viewType" : "DEMOBPICKUPTREEVIEW" "viewType" : "DEMOBPICKUPTREEVIEW"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTUsr2MobMPickupView.json",
"viewType" : "DEMOBMPICKUPVIEW"
}, { }, {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTDEMobWFDynaEditView3.json", "path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTDEMobWFDynaEditView3.json",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTMobPickupTreeView.json
浏览文件 @ e382826f
...@@ -447,7 +447,6 @@ ...@@ -447,7 +447,6 @@
"layoutPanel" : true, "layoutPanel" : true,
"useDefaultLayout" : true "useDefaultLayout" : true
}, },
"refFlag" : false,
"title" : "测试实体移动端选择树视图", "title" : "测试实体移动端选择树视图",
"viewStyle" : "DEFAULT", "viewStyle" : "DEFAULT",
"viewType" : "DEMOBPICKUPTREEVIEW", "viewType" : "DEMOBPICKUPTREEVIEW",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTUsr2MobMPickupView.json 0 → 100644
浏览文件 @ e382826f
{
"accUserMode" : 2,
"caption" : "测试实体",
"codeName" : "TESTUsr2MobMPickupView",
"dynaModelFilePath" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTUsr2MobMPickupView.json",
"name" : "TESTUsr2MobMPickupView",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
},
"getPSAppModule" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPMODULES/Test.json"
},
"getPSAppViewEngines" : [ {
"engineCat" : "VIEW",
"engineType" : "MobMPickupView",
"name" : "engine",
"getPSUIEngineParams" : [ {
"ctrlName" : "pickupviewpanel",
"name" : "PICKUPVIEWPANEL",
"paramType" : "CTRL"
} ]
} ],
"getPSControls" : [ {
"codeName" : "Usr2MobMPickupViewpickupviewpanel",
"controlType" : "PICKUPVIEWPANEL",
"getEmbeddedPSAppDEView" : {
"accUserMode" : 2,
"caption" : "测试实体",
"codeName" : "TESTMobPickupTreeView",
"dynaModelFilePath" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTMobPickupTreeView.json",
"mDCtrlActiveMode" : 2,
"name" : "TESTMobPickupTreeView",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
},
"getPSAppModule" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPMODULES/Test.json"
},
"getPSAppViewEngines" : [ {
"engineCat" : "VIEW",
"engineType" : "MobPickupTreeView",
"name" : "engine",
"getPSUIEngineParams" : [ {
"ctrlName" : "tree",
"name" : "TREE",
"paramType" : "CTRL"
} ]
} ],
"getPSControls" : [ {
"codeName" : "TestTreeView_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/Mob/PSAPPDATAENTITIES/TEST.json"
}
},
"dynaModelFilePath" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST/PSTREEVIEWS/TestTreeView_TreeView.json",
"getFetchPSControlAction" : {
"modelref" : true,
"id" : "fetch",
"actionType" : "DEDATASET",
"name" : "fetch",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
}
},
"getGetPSControlAction" : {
"modelref" : true,
"id" : "load",
"actionName" : "Get",
"actionType" : "DEACTION",
"dataAccessAction" : "READ",
"name" : "load",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Get"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
}
},
"hookEventNames" : [ "LOAD", "CLICK", "SELECTCHANGE" ],
"logicName" : "测试树视图_树视图",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
},
"getPSControlHandler" : {
"getPSHandlerActions" : [ {
"actionName" : "Get",
"actionType" : "DEACTION",
"dataAccessAction" : "READ",
"name" : "load",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Get"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
}
}, {
"actionName" : "Create",
"actionType" : "DEACTION",
"dataAccessAction" : "CREATE",
"name" : "create",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Create"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
}
}, {
"actionName" : "Update",
"actionType" : "DEACTION",
"dataAccessAction" : "UPDATE",
"name" : "update",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Update"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
}
}, {
"actionName" : "Remove",
"actionType" : "DEACTION",
"dataAccessAction" : "DELETE",
"name" : "remove",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Remove"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
}
}, {
"actionType" : "DEDATASET",
"name" : "fetch",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
}
} ],
"userDRAction" : "READ",
"enableDEFieldPrivilege" : false,
"id" : "树视图处理器"
},
"getPSControlLogics" : [ {
"eventNames" : "LOAD;CLICK;SELECTCHANGE",
"logicTag" : "tree",
"logicType" : "APPVIEWENGINE",
"name" : "engine_tree",
"getPSAppViewEngine" : {
"modelref" : true,
"id" : "engine"
}
} ],
"getPSControlParam" : {
"autoLoad" : true,
"showBusyIndicator" : true,
"id" : "TREE"
},
"getPSDETreeNodeRSs" : [ {
"getChildPSDETreeNode" : {
"modelref" : true,
"id" : "node3"
},
"name" : "静态1 - 动态集合",
"getPSNavigateParams" : [ {
"key" : "n_type_eq",
"name" : "n_type_eq",
"value" : "A",
"rawValue" : true
} ],
"getParentPSDETreeNode" : {
"modelref" : true,
"id" : "node1"
},
"parentValueLevel" : 1,
"searchMode" : 3
}, {
"getChildPSDETreeNode" : {
"modelref" : true,
"id" : "node1"
},
"name" : "默认根节点 - 静态1",
"getParentPSDETreeNode" : {
"modelref" : true,
"id" : "ROOT"
},
"parentValueLevel" : 1,
"searchMode" : 2
}, {
"getChildPSDETreeNode" : {
"modelref" : true,
"id" : "node3"
},
"name" : "静态2 - 动态集合",
"getPSNavigateParams" : [ {
"key" : "n_type_eq",
"name" : "n_type_eq",
"value" : "B",
"rawValue" : true
} ],
"getParentPSDETreeNode" : {
"modelref" : true,
"id" : "noDe2"
},
"parentValueLevel" : 1,
"searchMode" : 3
}, {
"getChildPSDETreeNode" : {
"modelref" : true,
"id" : "noDe2"
},
"name" : "默认根节点 - 静态2",
"getParentPSDETreeNode" : {
"modelref" : true,
"id" : "ROOT"
},
"parentValueLevel" : 1,
"searchMode" : 2
}, {
"getChildPSDETreeNode" : {
"modelref" : true,
"id" : "codeList"
},
"name" : "默认根节点 - 动态代码表",
"getParentPSDETreeNode" : {
"modelref" : true,
"id" : "ROOT"
},
"parentValueLevel" : 1,
"searchMode" : 3
} ],
"getPSDETreeNodes" : [ {
"counterMode" : 0,
"name" : "默认根节点",
"nodeType" : "ROOT",
"nodeValue" : "root",
"text" : "默认根节点",
"treeNodeType" : "STATIC",
"hasPSDETreeNodeRSs" : true,
"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"
}, {
"counterMode" : 0,
"name" : "动态代码表",
"nodeType" : "codeList",
"getPSCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPCODELISTS/TestAll.json"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
},
"treeNodeType" : "CODELIST",
"hasPSDETreeNodeRSs" : false,
"appendCaption" : false,
"appendPNodeId" : false,
"disableSelect" : false,
"enableCheck" : false,
"enableEditData" : false,
"enableNewData" : false,
"enableQuickCreate" : false,
"enableQuickSearch" : false,
"enableRemoveData" : false,
"enableViewData" : false,
"expandFirstOnly" : false,
"expanded" : false,
"rootNode" : false,
"selectFirstOnly" : false,
"selected" : false,
"id" : "codeList"
}, {
"counterMode" : 0,
"name" : "静态2",
"nodeType" : "noDe2",
"text" : "静态2",
"treeNodeType" : "STATIC",
"hasPSDETreeNodeRSs" : true,
"appendPNodeId" : false,
"disableSelect" : false,
"enableCheck" : false,
"enableEditData" : false,
"enableNewData" : false,
"enableQuickCreate" : false,
"enableQuickSearch" : false,
"enableRemoveData" : false,
"enableViewData" : false,
"expandFirstOnly" : false,
"expanded" : false,
"rootNode" : false,
"selectFirstOnly" : false,
"selected" : false,
"id" : "noDe2"
}, {
"counterMode" : 0,
"name" : "静态1",
"nodeType" : "node1",
"text" : "静态1",
"treeNodeType" : "STATIC",
"hasPSDETreeNodeRSs" : true,
"appendPNodeId" : false,
"disableSelect" : false,
"enableCheck" : false,
"enableEditData" : false,
"enableNewData" : false,
"enableQuickCreate" : false,
"enableQuickSearch" : false,
"enableRemoveData" : false,
"enableViewData" : false,
"expandFirstOnly" : false,
"expanded" : false,
"rootNode" : false,
"selectFirstOnly" : false,
"selected" : false,
"id" : "node1"
}, {
"counterMode" : 0,
"getIdPSAppDEField" : {
"name" : "TESTID",
"codeName" : "TESTId"
},
"maxSize" : -1,
"name" : "动态集合",
"nodeType" : "node3",
"getPSAppDEDataSet" : {
"modelref" : true,
"id" : "FetchDefault"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
},
"getTextPSAppDEField" : {
"name" : "TESTNAME",
"codeName" : "TESTName"
},
"treeNodeType" : "DE",
"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" : false,
"selectFirstOnly" : false,
"selected" : false,
"id" : "node3"
} ],
"getRemovePSControlAction" : {
"modelref" : true,
"id" : "remove",
"actionName" : "Remove",
"actionType" : "DEACTION",
"dataAccessAction" : "DELETE",
"name" : "remove",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Remove"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.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/Mob/PSAPPDATAENTITIES/TEST.json"
}
},
"enableRootSelect" : false,
"outputIconDefault" : true,
"rootVisible" : false,
"name" : "tree",
"modelid" : "CC94B4C9-81F3-4BA8-BCD7-B0A2AE2ABD31",
"modeltype" : "PSDETREEVIEW"
}, {
"controlType" : "SEARCHBAR",
"name" : "searchbar",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
},
"getPSControlParam" : {
"id" : "searchbar"
},
"quickGroupCount" : -1,
"quickSearchMode" : 0,
"quickSearchWidth" : 0,
"enableFilter" : false,
"enableGroup" : false,
"enableQuickSearch" : false,
"mobileSearchBar" : true
}, {
"caption" : "测试实体",
"codeName" : "MobPickupTreeViewcaptionbar",
"controlType" : "CAPTIONBAR",
"name" : "captionbar",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
},
"getPSControlParam" : { }
} ],
"getPSDEViewCodeName" : "MobPickupTreeView",
"getPSDEViewId" : "A8C323E1-801C-4222-A2CE-18EECD5AE98D",
"getPSViewLayoutPanel" : {
"codeName" : "Layoutpanel",
"controlStyle" : "APPDEMOBPICKUPTREEVIEW",
"controlType" : "VIEWLAYOUTPANEL",
"name" : "layoutpanel",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
},
"getPSControlParam" : { },
"layoutBodyOnly" : true,
"layoutPanel" : true,
"useDefaultLayout" : true
},
"title" : "测试实体移动端选择树视图",
"viewStyle" : "DEFAULT",
"viewType" : "DEMOBPICKUPTREEVIEW",
"xDataControlName" : "tree",
"enableDP" : true,
"enableFilter" : true,
"enablePullDownRefresh" : false,
"enableSearch" : true,
"expandSearchForm" : true,
"modelid" : "5bb966a86798a0aeb3fbde3b42d0c1d3",
"modeltype" : "PSAPPDEVIEW"
},
"hookEventNames" : [ "SELECTIONCHANGE", "LOAD" ],
"name" : "pickupviewpanel",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
},
"getPSControlLogics" : [ {
"eventNames" : "SELECTIONCHANGE;LOAD",
"logicTag" : "pickupviewpanel",
"logicType" : "APPVIEWENGINE",
"name" : "engine_pickupviewpanel",
"getPSAppViewEngine" : {
"modelref" : true,
"id" : "engine"
}
} ],
"getPSControlParam" : {
"id" : "PICKUPVIEWPANEL"
}
}, {
"caption" : "测试实体",
"codeName" : "Usr2MobMPickupViewcaptionbar",
"controlType" : "CAPTIONBAR",
"name" : "captionbar",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
},
"getPSControlParam" : { }
} ],
"getPSDEViewCodeName" : "Usr2MobMPickupView",
"getPSDEViewId" : "25521237-FBAE-4802-9056-955FAB02CD92",
"getPSViewLayoutPanel" : {
"codeName" : "Layoutpanel",
"controlStyle" : "APPDEMOBMPICKUPVIEW",
"controlType" : "VIEWLAYOUTPANEL",
"name" : "layoutpanel",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
},
"getPSControlParam" : { },
"layoutBodyOnly" : true,
"layoutPanel" : true,
"useDefaultLayout" : true
},
"title" : "测试实体移动端多数据选择视图",
"viewStyle" : "DEFAULT",
"viewType" : "DEMOBMPICKUPVIEW",
"enableDP" : true,
"enablePullDownRefresh" : false,
"showCaptionBar" : false,
"modelid" : "6e16bc0d8de66d6238b48f624caa7911",
"modeltype" : "PSAPPDEVIEW"
}
\ No newline at end of file
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPINDEXVIEWS/AppIndexView.json
浏览文件 @ e382826f
...@@ -213,6 +213,28 @@ ...@@ -213,6 +213,28 @@
"layout" : "TABLE_24COL" "layout" : "TABLE_24COL"
}, },
"tooltip" : "树" "tooltip" : "树"
}, {
"accUserMode" : 2,
"caption" : "选择树",
"itemType" : "MENUITEM",
"name" : "menuitem10",
"getPSAppFunc" : {
"modelref" : true,
"id" : "AppFunc5"
},
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"tooltip" : "选择树"
} ], } ],
"getPSControlHandler" : { "getPSControlHandler" : {
"enableDEFieldPrivilege" : false, "enableDEFieldPrivilege" : false,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPMENUS/Usr0504510619Menu.json
浏览文件 @ e382826f
...@@ -93,6 +93,16 @@ ...@@ -93,6 +93,16 @@
"id" : "AppFunc4" "id" : "AppFunc4"
}, },
"tooltip" : "树" "tooltip" : "树"
}, {
"accUserMode" : 2,
"caption" : "选择树",
"itemType" : "MENUITEM",
"name" : "menuitem10",
"getPSAppFunc" : {
"modelref" : true,
"id" : "AppFunc5"
},
"tooltip" : "选择树"
} ], } ],
"enableCustomize" : false, "enableCustomize" : false,
"name" : "appindexview", "name" : "appindexview",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSSYSAPP.json
浏览文件 @ e382826f
...@@ -918,6 +918,16 @@ ...@@ -918,6 +918,16 @@
"path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/phoneUsr0504984692MobMDView.json", "path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/phoneUsr0504984692MobMDView.json",
"viewType" : "DEMOBMDVIEW" "viewType" : "DEMOBMDVIEW"
} }
}, {
"appFuncType" : "APPVIEW",
"codeName" : "AppFunc5",
"name" : "选择树",
"openMode" : "INDEXVIEWTAB",
"getPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTUsr2MobMPickupView.json",
"viewType" : "DEMOBMPICKUPVIEW"
}
}, { }, {
"appFuncType" : "APPVIEW", "appFuncType" : "APPVIEW",
"codeName" : "AppFunc4", "codeName" : "AppFunc4",
...@@ -1025,6 +1035,12 @@ ...@@ -1025,6 +1035,12 @@
"viewType" : "DEMOBPICKUPTREEVIEW", "viewType" : "DEMOBPICKUPTREEVIEW",
"resource" : "TEST", "resource" : "TEST",
"view" : "MobPickupTreeView" "view" : "MobPickupTreeView"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTUsr2MobMPickupView.json",
"viewType" : "DEMOBMPICKUPVIEW",
"resource" : "TEST",
"view" : "Usr2MobMPickupView"
}, { }, {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/phoneUsr0504984692MobMDView.json", "path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/phoneUsr0504984692MobMDView.json",
...@@ -1380,6 +1396,28 @@ ...@@ -1380,6 +1396,28 @@
"layout" : "TABLE_24COL" "layout" : "TABLE_24COL"
}, },
"tooltip" : "树" "tooltip" : "树"
}, {
"accUserMode" : 2,
"caption" : "选择树",
"itemType" : "MENUITEM",
"name" : "menuitem10",
"getPSAppFunc" : {
"modelref" : true,
"id" : "AppFunc5"
},
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"tooltip" : "选择树"
} ], } ],
"getPSControlHandler" : { "getPSControlHandler" : {
"enableDEFieldPrivilege" : false, "enableDEFieldPrivilege" : false,
...@@ -6825,6 +6863,548 @@ ...@@ -6825,6 +6863,548 @@
"enableSearch" : true, "enableSearch" : true,
"modelid" : "5b0adc6008e49c23a960417dc8b3d9f3", "modelid" : "5b0adc6008e49c23a960417dc8b3d9f3",
"modeltype" : "PSAPPDEVIEW" "modeltype" : "PSAPPDEVIEW"
}, {
"accUserMode" : 2,
"caption" : "测试实体",
"codeName" : "TESTUsr2MobMPickupView",
"dynaModelFilePath" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTUsr2MobMPickupView.json",
"name" : "TESTUsr2MobMPickupView",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
},
"getPSAppModule" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPMODULES/Test.json"
},
"getPSAppViewEngines" : [ {
"engineCat" : "VIEW",
"engineType" : "MobMPickupView",
"name" : "engine",
"getPSUIEngineParams" : [ {
"ctrlName" : "pickupviewpanel",
"name" : "PICKUPVIEWPANEL",
"paramType" : "CTRL"
} ]
} ],
"getPSControls" : [ {
"codeName" : "Usr2MobMPickupViewpickupviewpanel",
"controlType" : "PICKUPVIEWPANEL",
"getEmbeddedPSAppDEView" : {
"accUserMode" : 2,
"caption" : "测试实体",
"codeName" : "TESTMobPickupTreeView",
"dynaModelFilePath" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTMobPickupTreeView.json",
"mDCtrlActiveMode" : 2,
"name" : "TESTMobPickupTreeView",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
},
"getPSAppModule" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPMODULES/Test.json"
},
"getPSAppViewEngines" : [ {
"engineCat" : "VIEW",
"engineType" : "MobPickupTreeView",
"name" : "engine",
"getPSUIEngineParams" : [ {
"ctrlName" : "tree",
"name" : "TREE",
"paramType" : "CTRL"
} ]
} ],
"getPSControls" : [ {
"codeName" : "TestTreeView_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/Mob/PSAPPDATAENTITIES/TEST.json"
}
},
"dynaModelFilePath" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST/PSTREEVIEWS/TestTreeView_TreeView.json",
"getFetchPSControlAction" : {
"modelref" : true,
"id" : "fetch",
"actionType" : "DEDATASET",
"name" : "fetch",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
}
},
"getGetPSControlAction" : {
"modelref" : true,
"id" : "load",
"actionName" : "Get",
"actionType" : "DEACTION",
"dataAccessAction" : "READ",
"name" : "load",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Get"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
}
},
"hookEventNames" : [ "LOAD", "CLICK", "SELECTCHANGE" ],
"logicName" : "测试树视图_树视图",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
},
"getPSControlHandler" : {
"getPSHandlerActions" : [ {
"actionName" : "Get",
"actionType" : "DEACTION",
"dataAccessAction" : "READ",
"name" : "load",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Get"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
}
}, {
"actionName" : "Create",
"actionType" : "DEACTION",
"dataAccessAction" : "CREATE",
"name" : "create",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Create"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
}
}, {
"actionName" : "Update",
"actionType" : "DEACTION",
"dataAccessAction" : "UPDATE",
"name" : "update",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Update"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
}
}, {
"actionName" : "Remove",
"actionType" : "DEACTION",
"dataAccessAction" : "DELETE",
"name" : "remove",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Remove"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
}
}, {
"actionType" : "DEDATASET",
"name" : "fetch",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
}
} ],
"userDRAction" : "READ",
"enableDEFieldPrivilege" : false,
"id" : "树视图处理器"
},
"getPSControlLogics" : [ {
"eventNames" : "LOAD;CLICK;SELECTCHANGE",
"logicTag" : "tree",
"logicType" : "APPVIEWENGINE",
"name" : "engine_tree",
"getPSAppViewEngine" : {
"modelref" : true,
"id" : "engine"
}
} ],
"getPSControlParam" : {
"autoLoad" : true,
"showBusyIndicator" : true,
"id" : "TREE"
},
"getPSDETreeNodeRSs" : [ {
"getChildPSDETreeNode" : {
"modelref" : true,
"id" : "node3"
},
"name" : "静态1 - 动态集合",
"getPSNavigateParams" : [ {
"key" : "n_type_eq",
"name" : "n_type_eq",
"value" : "A",
"rawValue" : true
} ],
"getParentPSDETreeNode" : {
"modelref" : true,
"id" : "node1"
},
"parentValueLevel" : 1,
"searchMode" : 3
}, {
"getChildPSDETreeNode" : {
"modelref" : true,
"id" : "node1"
},
"name" : "默认根节点 - 静态1",
"getParentPSDETreeNode" : {
"modelref" : true,
"id" : "ROOT"
},
"parentValueLevel" : 1,
"searchMode" : 2
}, {
"getChildPSDETreeNode" : {
"modelref" : true,
"id" : "node3"
},
"name" : "静态2 - 动态集合",
"getPSNavigateParams" : [ {
"key" : "n_type_eq",
"name" : "n_type_eq",
"value" : "B",
"rawValue" : true
} ],
"getParentPSDETreeNode" : {
"modelref" : true,
"id" : "noDe2"
},
"parentValueLevel" : 1,
"searchMode" : 3
}, {
"getChildPSDETreeNode" : {
"modelref" : true,
"id" : "noDe2"
},
"name" : "默认根节点 - 静态2",
"getParentPSDETreeNode" : {
"modelref" : true,
"id" : "ROOT"
},
"parentValueLevel" : 1,
"searchMode" : 2
}, {
"getChildPSDETreeNode" : {
"modelref" : true,
"id" : "codeList"
},
"name" : "默认根节点 - 动态代码表",
"getParentPSDETreeNode" : {
"modelref" : true,
"id" : "ROOT"
},
"parentValueLevel" : 1,
"searchMode" : 3
} ],
"getPSDETreeNodes" : [ {
"counterMode" : 0,
"name" : "默认根节点",
"nodeType" : "ROOT",
"nodeValue" : "root",
"text" : "默认根节点",
"treeNodeType" : "STATIC",
"hasPSDETreeNodeRSs" : true,
"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"
}, {
"counterMode" : 0,
"name" : "动态代码表",
"nodeType" : "codeList",
"getPSCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPCODELISTS/TestAll.json"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
},
"treeNodeType" : "CODELIST",
"hasPSDETreeNodeRSs" : false,
"appendCaption" : false,
"appendPNodeId" : false,
"disableSelect" : false,
"enableCheck" : false,
"enableEditData" : false,
"enableNewData" : false,
"enableQuickCreate" : false,
"enableQuickSearch" : false,
"enableRemoveData" : false,
"enableViewData" : false,
"expandFirstOnly" : false,
"expanded" : false,
"rootNode" : false,
"selectFirstOnly" : false,
"selected" : false,
"id" : "codeList"
}, {
"counterMode" : 0,
"name" : "静态2",
"nodeType" : "noDe2",
"text" : "静态2",
"treeNodeType" : "STATIC",
"hasPSDETreeNodeRSs" : true,
"appendPNodeId" : false,
"disableSelect" : false,
"enableCheck" : false,
"enableEditData" : false,
"enableNewData" : false,
"enableQuickCreate" : false,
"enableQuickSearch" : false,
"enableRemoveData" : false,
"enableViewData" : false,
"expandFirstOnly" : false,
"expanded" : false,
"rootNode" : false,
"selectFirstOnly" : false,
"selected" : false,
"id" : "noDe2"
}, {
"counterMode" : 0,
"name" : "静态1",
"nodeType" : "node1",
"text" : "静态1",
"treeNodeType" : "STATIC",
"hasPSDETreeNodeRSs" : true,
"appendPNodeId" : false,
"disableSelect" : false,
"enableCheck" : false,
"enableEditData" : false,
"enableNewData" : false,
"enableQuickCreate" : false,
"enableQuickSearch" : false,
"enableRemoveData" : false,
"enableViewData" : false,
"expandFirstOnly" : false,
"expanded" : false,
"rootNode" : false,
"selectFirstOnly" : false,
"selected" : false,
"id" : "node1"
}, {
"counterMode" : 0,
"getIdPSAppDEField" : {
"name" : "TESTID",
"codeName" : "TESTId"
},
"maxSize" : -1,
"name" : "动态集合",
"nodeType" : "node3",
"getPSAppDEDataSet" : {
"modelref" : true,
"id" : "FetchDefault"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
},
"getTextPSAppDEField" : {
"name" : "TESTNAME",
"codeName" : "TESTName"
},
"treeNodeType" : "DE",
"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" : false,
"selectFirstOnly" : false,
"selected" : false,
"id" : "node3"
} ],
"getRemovePSControlAction" : {
"modelref" : true,
"id" : "remove",
"actionName" : "Remove",
"actionType" : "DEACTION",
"dataAccessAction" : "DELETE",
"name" : "remove",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Remove"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.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/Mob/PSAPPDATAENTITIES/TEST.json"
}
},
"enableRootSelect" : false,
"outputIconDefault" : true,
"rootVisible" : false,
"name" : "tree",
"modelid" : "CC94B4C9-81F3-4BA8-BCD7-B0A2AE2ABD31",
"modeltype" : "PSDETREEVIEW"
}, {
"controlType" : "SEARCHBAR",
"name" : "searchbar",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
},
"getPSControlParam" : {
"id" : "searchbar"
},
"quickGroupCount" : -1,
"quickSearchMode" : 0,
"quickSearchWidth" : 0,
"enableFilter" : false,
"enableGroup" : false,
"enableQuickSearch" : false,
"mobileSearchBar" : true
}, {
"caption" : "测试实体",
"codeName" : "MobPickupTreeViewcaptionbar",
"controlType" : "CAPTIONBAR",
"name" : "captionbar",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
},
"getPSControlParam" : { }
} ],
"getPSDEViewCodeName" : "MobPickupTreeView",
"getPSDEViewId" : "A8C323E1-801C-4222-A2CE-18EECD5AE98D",
"getPSViewLayoutPanel" : {
"codeName" : "Layoutpanel",
"controlStyle" : "APPDEMOBPICKUPTREEVIEW",
"controlType" : "VIEWLAYOUTPANEL",
"name" : "layoutpanel",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
},
"getPSControlParam" : { },
"layoutBodyOnly" : true,
"layoutPanel" : true,
"useDefaultLayout" : true
},
"title" : "测试实体移动端选择树视图",
"viewStyle" : "DEFAULT",
"viewType" : "DEMOBPICKUPTREEVIEW",
"xDataControlName" : "tree",
"enableDP" : true,
"enableFilter" : true,
"enablePullDownRefresh" : false,
"enableSearch" : true,
"expandSearchForm" : true,
"modelid" : "5bb966a86798a0aeb3fbde3b42d0c1d3",
"modeltype" : "PSAPPDEVIEW"
},
"hookEventNames" : [ "SELECTIONCHANGE", "LOAD" ],
"name" : "pickupviewpanel",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
},
"getPSControlLogics" : [ {
"eventNames" : "SELECTIONCHANGE;LOAD",
"logicTag" : "pickupviewpanel",
"logicType" : "APPVIEWENGINE",
"name" : "engine_pickupviewpanel",
"getPSAppViewEngine" : {
"modelref" : true,
"id" : "engine"
}
} ],
"getPSControlParam" : {
"id" : "PICKUPVIEWPANEL"
}
}, {
"caption" : "测试实体",
"codeName" : "Usr2MobMPickupViewcaptionbar",
"controlType" : "CAPTIONBAR",
"name" : "captionbar",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
},
"getPSControlParam" : { }
} ],
"getPSDEViewCodeName" : "Usr2MobMPickupView",
"getPSDEViewId" : "25521237-FBAE-4802-9056-955FAB02CD92",
"getPSViewLayoutPanel" : {
"codeName" : "Layoutpanel",
"controlStyle" : "APPDEMOBMPICKUPVIEW",
"controlType" : "VIEWLAYOUTPANEL",
"name" : "layoutpanel",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
},
"getPSControlParam" : { },
"layoutBodyOnly" : true,
"layoutPanel" : true,
"useDefaultLayout" : true
},
"title" : "测试实体移动端多数据选择视图",
"viewStyle" : "DEFAULT",
"viewType" : "DEMOBMPICKUPVIEW",
"enableDP" : true,
"enablePullDownRefresh" : false,
"showCaptionBar" : false,
"modelid" : "6e16bc0d8de66d6238b48f624caa7911",
"modeltype" : "PSAPPDEVIEW"
} ], } ],
"getPSAppDataEntities" : [ { "getPSAppDataEntities" : [ {
"getAllPSAppDEACModes" : [ { "getAllPSAppDEACModes" : [ {
...@@ -9740,6 +10320,10 @@ ...@@ -9740,6 +10320,10 @@
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTMobPickupTreeView.json", "path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTMobPickupTreeView.json",
"viewType" : "DEMOBPICKUPTREEVIEW" "viewType" : "DEMOBPICKUPTREEVIEW"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTUsr2MobMPickupView.json",
"viewType" : "DEMOBMPICKUPVIEW"
}, { }, {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTDEMobWFDynaEditView3.json", "path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTDEMobWFDynaEditView3.json",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
浏览文件 @ e382826f
...@@ -1240,16 +1240,16 @@ ...@@ -1240,16 +1240,16 @@
"codeName" : "VMGroup2", "codeName" : "VMGroup2",
"name" : "视图消息组2", "name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息", "name" : "视图消息2",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg2" "id" : "ViewMsg3"
} }
}, { }, {
"name" : "视图消息2", "name" : "视图消息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg3" "id" : "ViewMsg2"
} }
} ] } ]
}, { }, {
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ e382826f
...@@ -2552,16 +2552,16 @@ ...@@ -2552,16 +2552,16 @@
"codeName" : "VMGroup2", "codeName" : "VMGroup2",
"name" : "视图消息组2", "name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息", "name" : "视图消息2",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg2" "id" : "ViewMsg3"
} }
}, { }, {
"name" : "视图消息2", "name" : "视图消息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg3" "id" : "ViewMsg2"
} }
} ] } ]
} ], } ],
......
trainsys-provider/pom.xml
浏览文件 @ e382826f
...@@ -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
浏览文件 @ e382826f
...@@ -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
浏览文件 @ e382826f
...@@ -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
浏览文件 @ e382826f
...@@ -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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或