Skip to content

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

tony001 发布系统代码 [TrainSys，网页端]

上级 d4537037
隐藏空白字符变更
内嵌 并排
正在显示 包含 648 行增加 和 53 行删除
app_Web/swarm.yaml
浏览文件 @ ae8ba6c2
...@@ -3,7 +3,7 @@ services: ...@@ -3,7 +3,7 @@ services:
trainsys-app-web: trainsys-app-web:
image: dstimage image: dstimage
ports: ports:
- "50100:80" - "80:80"
networks: networks:
- agent_network - agent_network
environment: environment:
......
config.xml
浏览文件 @ ae8ba6c2
...@@ -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
浏览文件 @ ae8ba6c2
...@@ -4227,6 +4227,12 @@ ...@@ -4227,6 +4227,12 @@
"name" : "测试实体实体向导视图(功能确认-向导表单)", "name" : "测试实体实体向导视图(功能确认-向导表单)",
"realModelSubType" : "DEWIZARDVIEW", "realModelSubType" : "DEWIZARDVIEW",
"realModelType" : "PSDEVIEWBASE" "realModelType" : "PSDEVIEWBASE"
}, {
"codeName" : "Usr4TreeExpView",
"logicName" : "测试实体实体树导航视图(布局缓存配置)",
"name" : "测试实体实体树导航视图(布局缓存配置)",
"realModelSubType" : "DETREEEXPVIEW",
"realModelType" : "PSDEVIEWBASE"
}, { }, {
"codeName" : "PanelView", "codeName" : "PanelView",
"logicName" : "测试实体实体面板视图", "logicName" : "测试实体实体面板视图",
...@@ -4438,6 +4444,12 @@ ...@@ -4438,6 +4444,12 @@
"name" : "测试实体实体编辑视图(功能确认-视图消息-动态模式)", "name" : "测试实体实体编辑视图(功能确认-视图消息-动态模式)",
"realModelSubType" : "DEEDITVIEW", "realModelSubType" : "DEEDITVIEW",
"realModelType" : "PSDEVIEWBASE" "realModelType" : "PSDEVIEWBASE"
}, {
"codeName" : "Usr3TreeExpView",
"logicName" : "测试实体实体树导航视图(布局缓存配置)",
"name" : "测试实体实体树导航视图(布局缓存配置)",
"realModelSubType" : "DETREEEXPVIEW",
"realModelType" : "PSDEVIEWBASE"
}, { }, {
"codeName" : "EditView3_modal", "codeName" : "EditView3_modal",
"logicName" : "测试实体实体编辑视图（分页关系）_模态", "logicName" : "测试实体实体编辑视图（分页关系）_模态",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json
浏览文件 @ ae8ba6c2
...@@ -5204,6 +5204,10 @@ ...@@ -5204,6 +5204,10 @@
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr3EditView.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr3EditView.json",
"viewType" : "DEEDITVIEW" "viewType" : "DEEDITVIEW"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr4TreeExpView.json",
"viewType" : "DETREEEXPVIEW"
}, { }, {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr2TreeExpView.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr2TreeExpView.json",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr4TreeExpView.json 0 → 100644
浏览文件 @ ae8ba6c2
{
"accUserMode" : 2,
"caption" : "测试实体实体树导航视图(布局缓存配置)",
"codeName" : "TESTUsr4TreeExpView",
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr4TreeExpView.json",
"name" : "TESTUsr4TreeExpView",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
},
"getPSAppModule" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPMODULES/Test.json"
},
"getPSAppViewEngines" : [ {
"engineCat" : "VIEW",
"engineType" : "TreeExpView",
"name" : "engine"
} ],
"getPSAppViewLogics" : [ {
"logicTrigger" : "CUSTOM",
"logicType" : "APPUILOGIC",
"name" : "newdata",
"getPSAppUILogic" : {
"actionAfterWizard" : "DEFAULT",
"logicType" : "PREDEFINED",
"name" : "新建数据",
"viewLogicType" : "APP_NEWDATA",
"batchAddOnly" : false,
"enableBatchAdd" : false,
"enableWizardAdd" : false
}
}, {
"logicTrigger" : "CUSTOM",
"logicType" : "APPUILOGIC",
"name" : "opendata",
"getPSAppUILogic" : {
"logicType" : "PREDEFINED",
"name" : "打开数据",
"viewLogicType" : "APP_OPENDATA",
"editMode" : true
}
} ],
"getPSControls" : [ {
"codeName" : "Usr4TreeExpViewtreeexpbar",
"controlType" : "TREEEXPBAR",
"name" : "treeexpbar",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
},
"getPSAppViewRefs" : [ {
"name" : "EXPITEM:node",
"realTitle" : "测试实体表格视图",
"getRefPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGridView.json",
"viewType" : "DEGRIDVIEW"
}
}, {
"name" : "EXPITEM:node_1",
"realTitle" : "学生信息表格",
"getRefPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentStudentGridView.json",
"viewType" : "DEGRIDVIEW"
}
}, {
"name" : "EXPITEM:node_2",
"realTitle" : "测试实体编辑视图",
"getRefPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView.json",
"viewType" : "DEEDITVIEW"
}
}, {
"name" : "EXPITEM:node_3",
"realTitle" : "学生信息编辑视图",
"getRefPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr0423209603EditView.json",
"viewType" : "DEEDITVIEW"
}
} ],
"getPSControlHandler" : {
"enableDEFieldPrivilege" : false,
"id" : "treeexpbar"
},
"getPSControlParam" : {
"autoLoad" : true,
"showBusyIndicator" : true,
"id" : "TREEEXPBAR"
},
"getPSControls" : [ {
"codeName" : "TreeExpView_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/TEST.json"
}
},
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSTREEVIEWS/TreeExpView_TreeView.json",
"getFetchPSControlAction" : {
"modelref" : true,
"id" : "fetch",
"actionType" : "DEDATASET",
"name" : "fetch",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/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/Web/PSAPPDATAENTITIES/TEST.json"
}
},
"hookEventNames" : [ "SELECTIONCHANGE", "LOAD" ],
"logicName" : "测试树导航_树视图",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
},
"getPSControlHandler" : {
"getPSHandlerActions" : [ {
"actionName" : "Get",
"actionType" : "DEACTION",
"dataAccessAction" : "READ",
"name" : "load",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Get"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}
}, {
"actionName" : "Create",
"actionType" : "DEACTION",
"dataAccessAction" : "CREATE",
"name" : "create",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Create"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}
}, {
"actionName" : "Update",
"actionType" : "DEACTION",
"dataAccessAction" : "UPDATE",
"name" : "update",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Update"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}
}, {
"actionName" : "Remove",
"actionType" : "DEACTION",
"dataAccessAction" : "DELETE",
"name" : "remove",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Remove"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}
}, {
"actionType" : "DEDATASET",
"name" : "fetch",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}
} ],
"userDRAction" : "READ",
"enableDEFieldPrivilege" : false,
"id" : "树视图处理器"
},
"getPSControlLogics" : [ {
"eventNames" : "SELECTIONCHANGE",
"logicTag" : "treeexpbar_tree",
"logicType" : "CUSTOM",
"name" : "treeexpbar_selectionchange"
}, {
"eventNames" : "LOAD",
"logicTag" : "treeexpbar_tree",
"logicType" : "CUSTOM",
"name" : "treeexpbar_load"
} ],
"getPSControlParam" : {
"autoLoad" : true,
"showBusyIndicator" : true,
"id" : "treeexpbar_tree"
},
"getPSDETreeNodeRSs" : [ {
"getChildPSDETreeNode" : {
"modelref" : true,
"id" : "node"
},
"name" : "默认根节点 - 静态（测试）",
"getParentPSDETreeNode" : {
"modelref" : true,
"id" : "ROOT"
},
"parentValueLevel" : 1,
"searchMode" : 3
}, {
"getChildPSDETreeNode" : {
"modelref" : true,
"id" : "node_2"
},
"name" : "静态（测试） - 测试实体",
"getParentPSDETreeNode" : {
"modelref" : true,
"id" : "node"
},
"parentValueLevel" : 1,
"searchMode" : 3
}, {
"getChildPSDETreeNode" : {
"modelref" : true,
"id" : "node_3"
},
"name" : "静态（学生） - 学生",
"getParentPSDETreeNode" : {
"modelref" : true,
"id" : "node_1"
},
"parentValueLevel" : 1,
"searchMode" : 3
}, {
"getChildPSDETreeNode" : {
"modelref" : true,
"id" : "node_1"
},
"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" : "静态（测试）",
"getNavPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGridView.json",
"viewType" : "DEGRIDVIEW"
},
"nodeType" : "node",
"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" : false,
"selectFirstOnly" : false,
"selected" : false,
"id" : "node"
}, {
"counterMode" : 0,
"name" : "静态（学生）",
"getNavPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentStudentGridView.json",
"viewType" : "DEGRIDVIEW"
},
"nodeType" : "node_1",
"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" : false,
"selectFirstOnly" : false,
"selected" : false,
"id" : "node_1"
}, {
"counterMode" : 0,
"name" : "测试实体",
"getNavPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView.json",
"viewType" : "DEEDITVIEW"
},
"nodeType" : "node_2",
"getPSCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/TestAll.json"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/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" : "node_2"
}, {
"counterMode" : 0,
"getIdPSAppDEField" : {
"name" : "REGINFOID",
"codeName" : "ReginfoId"
},
"maxSize" : -1,
"name" : "学生",
"getNavPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr0423209603EditView.json",
"viewType" : "DEEDITVIEW"
},
"nodeType" : "node_3",
"getPSAppDEDataSet" : {
"modelref" : true,
"id" : "FetchDefault"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
},
"getTextPSAppDEField" : {
"name" : "REGINFONAME",
"codeName" : "ReginfoName"
},
"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" : "node_3"
} ],
"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/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/Web/PSAPPDATAENTITIES/TEST.json"
}
},
"enableRootSelect" : false,
"outputIconDefault" : true,
"rootVisible" : false,
"name" : "treeexpbar_tree",
"modelid" : "2A3E0946-52BB-4175-9082-ABD0002F007A",
"modeltype" : "PSDETREEVIEW"
} ],
"xDataControlName" : "treeexpbar_tree",
"enableCounter" : true,
"enableSearch" : false,
"showTitleBar" : true,
"modelid" : "e133a44b74435f8bc96316b8c9d69d97_treeexpbar",
"modeltype" : "PSEXPBAR"
}, {
"controlType" : "SEARCHBAR",
"name" : "searchbar",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
},
"getPSControlParam" : {
"id" : "searchbar"
},
"quickGroupCount" : -1,
"quickSearchMode" : 1,
"quickSearchWidth" : 0,
"enableFilter" : false,
"enableGroup" : false,
"enableQuickSearch" : true,
"mobileSearchBar" : false
}, {
"caption" : "测试实体实体树导航视图(布局缓存配置)",
"codeName" : "Usr4TreeExpViewcaptionbar",
"controlType" : "CAPTIONBAR",
"name" : "captionbar",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
},
"getPSControlParam" : { }
} ],
"getPSDEViewCodeName" : "Usr4TreeExpView",
"getPSDEViewId" : "52BF2E2E-FB18-41F7-8928-75A2D8E650FA",
"getPSViewLayoutPanel" : {
"codeName" : "TreeExpViewLayout2",
"controlType" : "VIEWLAYOUTPANEL",
"layoutMode" : "FLEX",
"logicName" : "实体树导航视图布局面板(预置模型)",
"memo" : "实体树导航视图",
"name" : "layoutpanel",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
},
"getPSControlParam" : { },
"getPSLayout" : {
"layout" : "FLEX"
},
"getRootPSPanelItems" : [ {
"caption" : "容器",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "view_exp_split",
"getPSLayout" : {
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"grow" : 1,
"layout" : "FLEX"
},
"getPSPanelItems" : [ {
"caption" : "容器",
"contentWidth" : 300.0,
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "view_content_left",
"getPSLayout" : {
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX",
"width" : 300,
"widthMode" : "PX"
},
"getPSPanelItems" : [ {
"caption" : "树导航栏",
"itemStyle" : "DEFAULT",
"itemType" : "CTRLPOS",
"name" : "treeexpbar",
"getPSLayoutPos" : {
"grow" : 1,
"layout" : "FLEX"
},
"showCaption" : true
} ],
"width" : 300.0
}, {
"caption" : "容器",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "view_content_right",
"getPSLayout" : {
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSPanelItems" : [ {
"caption" : "导航区占位",
"itemStyle" : "DEFAULT",
"itemType" : "RAWITEM",
"name" : "nav_pos",
"getPSLayoutPos" : {
"grow" : 1,
"layout" : "FLEX"
},
"getPSRawItem" : {
"name" : "nav_pos",
"getPSRawItemParams" : [ {
"key" : "EXPCACHE",
"name" : "panelitem",
"value" : "CACHE"
} ],
"predefinedType" : "NAV_POS"
},
"showCaption" : true
} ]
} ],
"predefinedType" : "CONTAINER_H_SPLIT"
} ],
"layoutBodyOnly" : false,
"layoutPanel" : true,
"useDefaultLayout" : false,
"modelid" : "b91d4f9986aa8ea04d5aeb6a3f439695",
"modeltype" : "PSSYSVIEWLAYOUTPANEL"
},
"refFlag" : false,
"title" : "测试实体实体树导航视图(布局缓存配置)",
"viewStyle" : "DEFAULT",
"viewType" : "DETREEEXPVIEW",
"enableDP" : true,
"enableFilter" : true,
"enableQuickSearch" : true,
"enableSearch" : true,
"showDataInfoBar" : true,
"modelid" : "e133a44b74435f8bc96316b8c9d69d97",
"modeltype" : "PSAPPDEVIEW"
}
\ No newline at end of file
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ ae8ba6c2
...@@ -11660,6 +11660,12 @@ ...@@ -11660,6 +11660,12 @@
"viewType" : "DEEDITVIEW4", "viewType" : "DEEDITVIEW4",
"resource" : "Student", "resource" : "Student",
"view" : "EditView4" "view" : "EditView4"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr4TreeExpView.json",
"viewType" : "DETREEEXPVIEW",
"resource" : "TEST",
"view" : "Usr4TreeExpView"
}, { }, {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookPickupTreeView.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookPickupTreeView.json",
...@@ -48604,6 +48610,10 @@ ...@@ -48604,6 +48610,10 @@
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr3EditView.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr3EditView.json",
"viewType" : "DEEDITVIEW" "viewType" : "DEEDITVIEW"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr4TreeExpView.json",
"viewType" : "DETREEEXPVIEW"
}, { }, {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr2TreeExpView.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr2TreeExpView.json",
trainsys-provider/pom.xml
浏览文件 @ ae8ba6c2
...@@ -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
浏览文件 @ ae8ba6c2
...@@ -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
浏览文件 @ ae8ba6c2
...@@ -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
浏览文件 @ ae8ba6c2
...@@ -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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或