Skip to content

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

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

上级 d3b98d90
展开全部 显示空白字符变更
内嵌 并排
正在显示 包含 2323 行增加 和 80 行删除
config.xml
浏览文件 @ f7035c19
...@@ -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/common/PSDATAENTITIES/Book.json
浏览文件 @ f7035c19
...@@ -6651,6 +6651,12 @@ ...@@ -6651,6 +6651,12 @@
"name" : "书实体工作流动态视图（分页关系）", "name" : "书实体工作流动态视图（分页关系）",
"realModelSubType" : "DEWFDYNAEDITVIEW3", "realModelSubType" : "DEWFDYNAEDITVIEW3",
"realModelType" : "PSDEVIEWBASE" "realModelType" : "PSDEVIEWBASE"
}, {
"codeName" : "Usr5EditView",
"logicName" : "书实体编辑视图(多数据测试_表单)",
"name" : "书实体编辑视图(多数据测试_表单)",
"realModelSubType" : "DEEDITVIEW",
"realModelType" : "PSDEVIEWBASE"
}, { }, {
"codeName" : "Usr2RedirectView", "codeName" : "Usr2RedirectView",
"logicName" : "书实体数据重定向视图(2)", "logicName" : "书实体数据重定向视图(2)",
...@@ -6879,6 +6885,13 @@ ...@@ -6879,6 +6885,13 @@
"name" : "测试编辑器插件表单", "name" : "测试编辑器插件表单",
"realModelSubType" : "EDITFORM", "realModelSubType" : "EDITFORM",
"realModelType" : "PSDEFORM" "realModelType" : "PSDEFORM"
}, {
"codeName" : "Main2",
"logicName" : "多数据（表单）",
"modelTag2" : "0",
"name" : "多数据（表单）",
"realModelSubType" : "EDITFORM",
"realModelType" : "PSDEFORM"
}, { }, {
"codeName" : "Usr07257969EditView_Form", "codeName" : "Usr07257969EditView_Form",
"logicName" : "测试多数据编辑器_表单", "logicName" : "测试多数据编辑器_表单",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSSYSAPP.json
浏览文件 @ f7035c19
...@@ -959,7 +959,7 @@ ...@@ -959,7 +959,7 @@
"uIActionTag" : "Yes", "uIActionTag" : "Yes",
"uIActionType" : "DEUIACTION" "uIActionType" : "DEUIACTION"
}, { }, {
"actionTarget" : "SINGLEDATA", "actionTarget" : "NONE",
"caption" : "百度", "caption" : "百度",
"codeName" : "openBaidu", "codeName" : "openBaidu",
"frontProcessType" : "OPENHTMLPAGE", "frontProcessType" : "OPENHTMLPAGE",
...@@ -9106,7 +9106,7 @@ ...@@ -9106,7 +9106,7 @@
"id" : "node1_cm_deuiaction5" "id" : "node1_cm_deuiaction5"
}, },
"getPSUIAction" : { "getPSUIAction" : {
"actionTarget" : "SINGLEDATA", "actionTarget" : "NONE",
"caption" : "百度", "caption" : "百度",
"codeName" : "openBaidu", "codeName" : "openBaidu",
"frontProcessType" : "OPENHTMLPAGE", "frontProcessType" : "OPENHTMLPAGE",
...@@ -9119,7 +9119,7 @@ ...@@ -9119,7 +9119,7 @@
"uIActionType" : "DEUIACTION" "uIActionType" : "DEUIACTION"
}, },
"tooltip" : "百度", "tooltip" : "百度",
"uIActionTarget" : "SINGLEDATA", "uIActionTarget" : "NONE",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
...@@ -9401,7 +9401,7 @@ ...@@ -9401,7 +9401,7 @@
"id" : "node3_cm_deuiaction5" "id" : "node3_cm_deuiaction5"
}, },
"getPSUIAction" : { "getPSUIAction" : {
"actionTarget" : "SINGLEDATA", "actionTarget" : "NONE",
"caption" : "百度", "caption" : "百度",
"codeName" : "openBaidu", "codeName" : "openBaidu",
"frontProcessType" : "OPENHTMLPAGE", "frontProcessType" : "OPENHTMLPAGE",
...@@ -9414,7 +9414,7 @@ ...@@ -9414,7 +9414,7 @@
"uIActionType" : "DEUIACTION" "uIActionType" : "DEUIACTION"
}, },
"tooltip" : "百度", "tooltip" : "百度",
"uIActionTarget" : "SINGLEDATA", "uIActionTarget" : "NONE",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
...@@ -9849,7 +9849,7 @@ ...@@ -9849,7 +9849,7 @@
"id" : "node1_cm_deuiaction5" "id" : "node1_cm_deuiaction5"
}, },
"getPSUIAction" : { "getPSUIAction" : {
"actionTarget" : "SINGLEDATA", "actionTarget" : "NONE",
"caption" : "百度", "caption" : "百度",
"codeName" : "openBaidu", "codeName" : "openBaidu",
"frontProcessType" : "OPENHTMLPAGE", "frontProcessType" : "OPENHTMLPAGE",
...@@ -9862,7 +9862,7 @@ ...@@ -9862,7 +9862,7 @@
"uIActionType" : "DEUIACTION" "uIActionType" : "DEUIACTION"
}, },
"tooltip" : "百度", "tooltip" : "百度",
"uIActionTarget" : "SINGLEDATA", "uIActionTarget" : "NONE",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
...@@ -10180,7 +10180,7 @@ ...@@ -10180,7 +10180,7 @@
"id" : "node3_cm_deuiaction5" "id" : "node3_cm_deuiaction5"
}, },
"getPSUIAction" : { "getPSUIAction" : {
"actionTarget" : "SINGLEDATA", "actionTarget" : "NONE",
"caption" : "百度", "caption" : "百度",
"codeName" : "openBaidu", "codeName" : "openBaidu",
"frontProcessType" : "OPENHTMLPAGE", "frontProcessType" : "OPENHTMLPAGE",
...@@ -10193,7 +10193,7 @@ ...@@ -10193,7 +10193,7 @@
"uIActionType" : "DEUIACTION" "uIActionType" : "DEUIACTION"
}, },
"tooltip" : "百度", "tooltip" : "百度",
"uIActionTarget" : "SINGLEDATA", "uIActionTarget" : "NONE",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
...@@ -10561,7 +10561,7 @@ ...@@ -10561,7 +10561,7 @@
"id" : "node1_cm_deuiaction5" "id" : "node1_cm_deuiaction5"
}, },
"getPSUIAction" : { "getPSUIAction" : {
"actionTarget" : "SINGLEDATA", "actionTarget" : "NONE",
"caption" : "百度", "caption" : "百度",
"codeName" : "openBaidu", "codeName" : "openBaidu",
"frontProcessType" : "OPENHTMLPAGE", "frontProcessType" : "OPENHTMLPAGE",
...@@ -10574,7 +10574,7 @@ ...@@ -10574,7 +10574,7 @@
"uIActionType" : "DEUIACTION" "uIActionType" : "DEUIACTION"
}, },
"tooltip" : "百度", "tooltip" : "百度",
"uIActionTarget" : "SINGLEDATA", "uIActionTarget" : "NONE",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
...@@ -10662,7 +10662,7 @@ ...@@ -10662,7 +10662,7 @@
"id" : "node3_cm_deuiaction5" "id" : "node3_cm_deuiaction5"
}, },
"getPSUIAction" : { "getPSUIAction" : {
"actionTarget" : "SINGLEDATA", "actionTarget" : "NONE",
"caption" : "百度", "caption" : "百度",
"codeName" : "openBaidu", "codeName" : "openBaidu",
"frontProcessType" : "OPENHTMLPAGE", "frontProcessType" : "OPENHTMLPAGE",
...@@ -10675,7 +10675,7 @@ ...@@ -10675,7 +10675,7 @@
"uIActionType" : "DEUIACTION" "uIActionType" : "DEUIACTION"
}, },
"tooltip" : "百度", "tooltip" : "百度",
"uIActionTarget" : "SINGLEDATA", "uIActionTarget" : "NONE",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
...@@ -10916,7 +10916,7 @@ ...@@ -10916,7 +10916,7 @@
"id" : "node1_cm_deuiaction5" "id" : "node1_cm_deuiaction5"
}, },
"getPSUIAction" : { "getPSUIAction" : {
"actionTarget" : "SINGLEDATA", "actionTarget" : "NONE",
"caption" : "百度", "caption" : "百度",
"codeName" : "openBaidu", "codeName" : "openBaidu",
"frontProcessType" : "OPENHTMLPAGE", "frontProcessType" : "OPENHTMLPAGE",
...@@ -10929,7 +10929,7 @@ ...@@ -10929,7 +10929,7 @@
"uIActionType" : "DEUIACTION" "uIActionType" : "DEUIACTION"
}, },
"tooltip" : "百度", "tooltip" : "百度",
"uIActionTarget" : "SINGLEDATA", "uIActionTarget" : "NONE",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
...@@ -11053,7 +11053,7 @@ ...@@ -11053,7 +11053,7 @@
"id" : "node3_cm_deuiaction5" "id" : "node3_cm_deuiaction5"
}, },
"getPSUIAction" : { "getPSUIAction" : {
"actionTarget" : "SINGLEDATA", "actionTarget" : "NONE",
"caption" : "百度", "caption" : "百度",
"codeName" : "openBaidu", "codeName" : "openBaidu",
"frontProcessType" : "OPENHTMLPAGE", "frontProcessType" : "OPENHTMLPAGE",
...@@ -11066,7 +11066,7 @@ ...@@ -11066,7 +11066,7 @@
"uIActionType" : "DEUIACTION" "uIActionType" : "DEUIACTION"
}, },
"tooltip" : "百度", "tooltip" : "百度",
"uIActionTarget" : "SINGLEDATA", "uIActionTarget" : "NONE",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
...@@ -11478,7 +11478,7 @@ ...@@ -11478,7 +11478,7 @@
"id" : "node1_cm_deuiaction5" "id" : "node1_cm_deuiaction5"
}, },
"getPSUIAction" : { "getPSUIAction" : {
"actionTarget" : "SINGLEDATA", "actionTarget" : "NONE",
"caption" : "百度", "caption" : "百度",
"codeName" : "openBaidu", "codeName" : "openBaidu",
"frontProcessType" : "OPENHTMLPAGE", "frontProcessType" : "OPENHTMLPAGE",
...@@ -11491,7 +11491,7 @@ ...@@ -11491,7 +11491,7 @@
"uIActionType" : "DEUIACTION" "uIActionType" : "DEUIACTION"
}, },
"tooltip" : "百度", "tooltip" : "百度",
"uIActionTarget" : "SINGLEDATA", "uIActionTarget" : "NONE",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
...@@ -11579,7 +11579,7 @@ ...@@ -11579,7 +11579,7 @@
"id" : "node3_cm_deuiaction5" "id" : "node3_cm_deuiaction5"
}, },
"getPSUIAction" : { "getPSUIAction" : {
"actionTarget" : "SINGLEDATA", "actionTarget" : "NONE",
"caption" : "百度", "caption" : "百度",
"codeName" : "openBaidu", "codeName" : "openBaidu",
"frontProcessType" : "OPENHTMLPAGE", "frontProcessType" : "OPENHTMLPAGE",
...@@ -11592,7 +11592,7 @@ ...@@ -11592,7 +11592,7 @@
"uIActionType" : "DEUIACTION" "uIActionType" : "DEUIACTION"
}, },
"tooltip" : "百度", "tooltip" : "百度",
"uIActionTarget" : "SINGLEDATA", "uIActionTarget" : "NONE",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
...@@ -11833,7 +11833,7 @@ ...@@ -11833,7 +11833,7 @@
"id" : "node1_cm_deuiaction5" "id" : "node1_cm_deuiaction5"
}, },
"getPSUIAction" : { "getPSUIAction" : {
"actionTarget" : "SINGLEDATA", "actionTarget" : "NONE",
"caption" : "百度", "caption" : "百度",
"codeName" : "openBaidu", "codeName" : "openBaidu",
"frontProcessType" : "OPENHTMLPAGE", "frontProcessType" : "OPENHTMLPAGE",
...@@ -11846,7 +11846,7 @@ ...@@ -11846,7 +11846,7 @@
"uIActionType" : "DEUIACTION" "uIActionType" : "DEUIACTION"
}, },
"tooltip" : "百度", "tooltip" : "百度",
"uIActionTarget" : "SINGLEDATA", "uIActionTarget" : "NONE",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
...@@ -11970,7 +11970,7 @@ ...@@ -11970,7 +11970,7 @@
"id" : "node3_cm_deuiaction5" "id" : "node3_cm_deuiaction5"
}, },
"getPSUIAction" : { "getPSUIAction" : {
"actionTarget" : "SINGLEDATA", "actionTarget" : "NONE",
"caption" : "百度", "caption" : "百度",
"codeName" : "openBaidu", "codeName" : "openBaidu",
"frontProcessType" : "OPENHTMLPAGE", "frontProcessType" : "OPENHTMLPAGE",
...@@ -11983,7 +11983,7 @@ ...@@ -11983,7 +11983,7 @@
"uIActionType" : "DEUIACTION" "uIActionType" : "DEUIACTION"
}, },
"tooltip" : "百度", "tooltip" : "百度",
"uIActionTarget" : "SINGLEDATA", "uIActionTarget" : "NONE",
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
} ], } ],
...@@ -14795,7 +14795,7 @@ ...@@ -14795,7 +14795,7 @@
"cssClass" : "fa fa-check" "cssClass" : "fa fa-check"
}, },
"getPSUIAction" : { "getPSUIAction" : {
"actionTarget" : "SINGLEDATA", "actionTarget" : "NONE",
"caption" : "百度", "caption" : "百度",
"codeName" : "openBaidu", "codeName" : "openBaidu",
"frontProcessType" : "OPENHTMLPAGE", "frontProcessType" : "OPENHTMLPAGE",
...@@ -31135,7 +31135,7 @@ ...@@ -31135,7 +31135,7 @@
"mobileMode" : true "mobileMode" : true
} ], } ],
"codeName" : "Bookchild1s", "codeName" : "Bookchild1s",
"logicName" : "属性46", "logicName" : "图书子项",
"name" : "BOOKCHILD1S", "name" : "BOOKCHILD1S",
"stdDataType" : 21, "stdDataType" : 21,
"stringLength" : 1048576 "stringLength" : 1048576
...@@ -31191,7 +31191,7 @@ ...@@ -31191,7 +31191,7 @@
"type" : "SIMPLE" "type" : "SIMPLE"
}, { }, {
"codeName" : "Bookchild1s", "codeName" : "Bookchild1s",
"logicName" : "属性46", "logicName" : "图书子项",
"name" : "Bookchild1s", "name" : "Bookchild1s",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "BOOKCHILD1S", "name" : "BOOKCHILD1S",
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json
浏览文件 @ f7035c19
...@@ -3745,6 +3745,27 @@ ...@@ -3745,6 +3745,27 @@
"uIActionTag" : "OpenHtml", "uIActionTag" : "OpenHtml",
"uIActionType" : "DEUIACTION", "uIActionType" : "DEUIACTION",
"id" : "OpenHtml@Book" "id" : "OpenHtml@Book"
}, {
"actionTarget" : "SINGLEKEY",
"caption" : "打开多数据表单",
"codeName" : "opendsjbd",
"getFrontPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr5EditView.json",
"viewType" : "DEEDITVIEW"
},
"frontProcessType" : "TOP",
"fullCodeName" : "Book_opendsjbd",
"name" : "打开多数据表单",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
},
"timeout" : 60000,
"uIActionMode" : "FRONT",
"uIActionTag" : "opendsjbd",
"uIActionType" : "DEUIACTION",
"id" : "opendsjbd@Book"
} ], } ],
"getAllPSAppDEUILogics" : [ { "getAllPSAppDEUILogics" : [ {
"codeName" : "test", "codeName" : "test",
...@@ -3819,6 +3840,10 @@ ...@@ -3819,6 +3840,10 @@
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookMapView.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookMapView.json",
"viewType" : "DEMAPVIEW" "viewType" : "DEMAPVIEW"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr5EditView.json",
"viewType" : "DEEDITVIEW"
}, { }, {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr0815395468DataViewExpView.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr0815395468DataViewExpView.json",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr4GridView.json
浏览文件 @ f7035c19
...@@ -222,6 +222,46 @@ ...@@ -222,6 +222,46 @@
"id" : "TOOLBAR" "id" : "TOOLBAR"
}, },
"getPSDEToolbarItems" : [ { "getPSDEToolbarItems" : [ {
"caption" : "打开多数据表单",
"groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION",
"name" : "tbitem1_opendsjbd",
"noPrivDisplayMode" : 2,
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "toolbar_tbitem1_opendsjbd"
},
"getPSUIAction" : {
"actionTarget" : "SINGLEKEY",
"caption" : "打开多数据表单",
"codeName" : "opendsjbd",
"getFrontPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr5EditView.json",
"viewType" : "DEEDITVIEW"
},
"frontProcessType" : "TOP",
"fullCodeName" : "Book_opendsjbd",
"name" : "打开多数据表单",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
},
"timeout" : 60000,
"uIActionMode" : "FRONT",
"uIActionTag" : "opendsjbd",
"uIActionType" : "DEUIACTION",
"id" : "opendsjbd@Book"
},
"tooltip" : "打开多数据表单",
"uIActionTarget" : "SINGLEKEY",
"showCaption" : true,
"showIcon" : true
}, {
"itemType" : "SEPERATOR",
"name" : "tbitem2",
"spanMode" : false
}, {
"getCapPSLanguageRes" : { "getCapPSLanguageRes" : {
"defaultContent" : "新建", "defaultContent" : "新建",
"lanResTag" : "TBB.TEXT.*.NEW", "lanResTag" : "TBB.TEXT.*.NEW",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ f7035c19
...@@ -3338,6 +3338,12 @@ ...@@ -3338,6 +3338,12 @@
"viewType" : "DELISTVIEW", "viewType" : "DELISTVIEW",
"resource" : "Phone", "resource" : "Phone",
"view" : "ListView" "view" : "ListView"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr5EditView.json",
"viewType" : "DEEDITVIEW",
"resource" : "Book",
"view" : "Usr5EditView"
}, { }, {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr0301632891RedirectView.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr0301632891RedirectView.json",
...@@ -23895,6 +23901,27 @@ ...@@ -23895,6 +23901,27 @@
"uIActionTag" : "OpenHtml", "uIActionTag" : "OpenHtml",
"uIActionType" : "DEUIACTION", "uIActionType" : "DEUIACTION",
"id" : "OpenHtml@Book" "id" : "OpenHtml@Book"
}, {
"actionTarget" : "SINGLEKEY",
"caption" : "打开多数据表单",
"codeName" : "opendsjbd",
"getFrontPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr5EditView.json",
"viewType" : "DEEDITVIEW"
},
"frontProcessType" : "TOP",
"fullCodeName" : "Book_opendsjbd",
"name" : "打开多数据表单",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
},
"timeout" : 60000,
"uIActionMode" : "FRONT",
"uIActionTag" : "opendsjbd",
"uIActionType" : "DEUIACTION",
"id" : "opendsjbd@Book"
} ], } ],
"getAllPSAppDEUILogics" : [ { "getAllPSAppDEUILogics" : [ {
"codeName" : "test", "codeName" : "test",
...@@ -23969,6 +23996,10 @@ ...@@ -23969,6 +23996,10 @@
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookMapView.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookMapView.json",
"viewType" : "DEMAPVIEW" "viewType" : "DEMAPVIEW"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr5EditView.json",
"viewType" : "DEEDITVIEW"
}, { }, {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr0815395468DataViewExpView.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr0815395468DataViewExpView.json",
......
trainsys-provider/pom.xml
浏览文件 @ f7035c19
...@@ -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
浏览文件 @ f7035c19
...@@ -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
浏览文件 @ f7035c19
...@@ -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
浏览文件 @ f7035c19
...@@ -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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或