tony001 部署微服务应用 [TrainSys，Mob]

config.xml

@@ -55,6 +55,36 @@
 	  git clone -b master $para2 trainsys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd trainsys/
+      mkdir -p /var/lib/jenkins/appcache/64777BB9-78E2-44DD-AEF6-FF87AC45C1D5
+      if [ -e app_Mob/.dynamic ]
+      then
+          cd app_Mob
+      else
+          cd app_Mob/app
+      fi
+      sed -i "s#dstimage#$para5#g" swarm.yaml      
+      if [[ $para3 = all ]];then
+          mv Dockerfile-ALL Dockerfile      
+          set +e
+          sed -i "s#/api#/sztrainsys__mob#g" src/environments/environment.ts  
+          sed -i "s#outputDir#//outputDir#g" vue.config.js 
+          set -e
+          yarn
+          ln -s /var/lib/jenkins/appcache/64777BB9-78E2-44DD-AEF6-FF87AC45C1D5 node_modules/.cache
+          yarn build
+      else
+          if [ -e .dynamic ]
+          then
+              mv  ../trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob model
+          else
+              mv  ../../trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob model
+          fi
+          sed -i "s#srcimagename#$para4#g" Dockerfile-MODEL
+          mv Dockerfile-MODEL Dockerfile
+      fi          
+      docker build -t $para5 .
+      docker push $para5
+      docker -H $para1 stack deploy --compose-file=swarm.yaml ebsx --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSSYSSEARCHSCHEMES/test.json

+{
+  "codeName" : "test",
+  "defaultDocReplicas" : 1,
+  "defaultDocShards" : 5,
+  "dynaModelFilePath" : "PSMODULES/Test/PSSYSSEARCHSCHEMES/test.json",
+  "name" : "test",
+  "getPSSystemModule" : {
+    "modelref" : true,
+    "path" : "PSMODULES/Test.json"
+  },
+  "searchEngineType" : "ELASTICSEARCH"
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone.json

@@ -3259,6 +3259,12 @@
     "name" : "手机实体编辑视图(2)",
     "realModelSubType" : "DEEDITVIEW",
     "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "Usr10306924DashboardView",
+    "logicName" : "数据看板视图",
+    "name" : "数据看板视图",
+    "realModelSubType" : "DEPORTALVIEW",
+    "realModelType" : "PSDEVIEWBASE"
   }, {
     "codeName" : "OptionView",
     "logicName" : "手机实体选项操作视图",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json

@@ -2618,6 +2618,10 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr0505414736PickupTreeView.json",
     "viewType" : "DEPICKUPTREEVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr10306924DashboardView.json",
+    "viewType" : "DEPORTALVIEW"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneGridView.json",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSDASHBOARDS/Usr10306924DashboardView_Dashboard.json

+{
+  "codeName" : "Usr10306924DashboardView_Dashboard",
+  "controlType" : "DASHBOARD",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSDASHBOARDS/Usr10306924DashboardView_Dashboard.json",
+  "logicName" : "数据看板视图_数据看板",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
+  },
+  "getPSLayout" : {
+    "childColLG" : -1,
+    "childColMD" : 24,
+    "childColSM" : -1,
+    "childColXS" : -1,
+    "columnCount" : 24,
+    "layout" : "TABLE_24COL"
+  },
+  "enableCustomized" : false,
+  "modelid" : "80013143-C2C0-42ED-97B7-74F0C403AE41",
+  "modeltype" : "PSSYSDASHBOARD"
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookMapView.json

@@ -83,13 +83,14 @@
     }
   } ],
   "getPSControls" : [ {
-    "codeName" : "Map",
+    "codeName" : "Usr10270446MapView_MapView",
     "controlType" : "MAP",
-    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSMAPS/Map.json",
+    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX/PSMAPS/Usr10270446MapView_MapView.json",
     "legendPos" : "NONE",
+    "logicName" : "test_地图部件",
     "getPSAppDataEntity" : {
       "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
     },
     "getPSControlHandler" : {
       "enableDEFieldPrivilege" : false,
@@ -101,7 +102,7 @@
       "id" : "MAP"
     },
     "name" : "map",
-    "modelid" : "5ef3fa7e256948747aee83a29020c3ce_map",
+    "modelid" : "3444F083-FE79-4D0B-9802-248D90060116",
     "modeltype" : "PSSYSMAPVIEW"
   }, {
     "controlType" : "SEARCHBAR",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr10306924DashboardView.json

+{
+  "accUserMode" : 2,
+  "caption" : "数据看板视图",
+  "codeName" : "phoneUsr10306924DashboardView",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr10306924DashboardView.json",
+  "name" : "phoneUsr10306924DashboardView",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
+  },
+  "getPSAppModule" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPMODULES/Test.json"
+  },
+  "getPSAppViewEngines" : [ {
+    "engineCat" : "VIEW",
+    "engineType" : "PortalView",
+    "name" : "engine"
+  } ],
+  "getPSControls" : [ {
+    "codeName" : "Usr10306924DashboardView_Dashboard",
+    "controlType" : "DASHBOARD",
+    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSDASHBOARDS/Usr10306924DashboardView_Dashboard.json",
+    "logicName" : "数据看板视图_数据看板",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
+    },
+    "getPSControlHandler" : {
+      "enableDEFieldPrivilege" : false,
+      "id" : "dashboard"
+    },
+    "getPSControlParam" : {
+      "autoLoad" : true,
+      "showBusyIndicator" : true,
+      "id" : "DASHBOARD"
+    },
+    "getPSLayout" : {
+      "childColLG" : -1,
+      "childColMD" : 24,
+      "childColSM" : -1,
+      "childColXS" : -1,
+      "columnCount" : 24,
+      "layout" : "TABLE_24COL"
+    },
+    "enableCustomized" : false,
+    "name" : "dashboard",
+    "modelid" : "80013143-C2C0-42ED-97B7-74F0C403AE41",
+    "modeltype" : "PSSYSDASHBOARD"
+  }, {
+    "caption" : "数据看板视图",
+    "codeName" : "Usr10306924DashboardViewcaptionbar",
+    "controlType" : "CAPTIONBAR",
+    "name" : "captionbar",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
+    },
+    "getPSControlParam" : { }
+  } ],
+  "getPSDEViewCodeName" : "Usr10306924DashboardView",
+  "getPSDEViewId" : "1AF47B15-85FA-4BA1-BC32-C7F5F012C034",
+  "getPSViewLayoutPanel" : {
+    "codeName" : "Layoutpanel",
+    "controlStyle" : "APPDEPORTALVIEW",
+    "controlType" : "VIEWLAYOUTPANEL",
+    "name" : "layoutpanel",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
+    },
+    "getPSControlParam" : { },
+    "layoutBodyOnly" : true,
+    "layoutPanel" : true,
+    "useDefaultLayout" : true
+  },
+  "refFlag" : false,
+  "title" : "数据看板视图",
+  "viewStyle" : "DEFAULT",
+  "viewType" : "DEPORTALVIEW",
+  "enableDP" : true,
+  "enableQuickGroup" : false,
+  "enableQuickSearch" : false,
+  "enableSearch" : false,
+  "expandSearchForm" : true,
+  "loadDefault" : true,
+  "showDataInfoBar" : true,
+  "modelid" : "80013143-C2C0-42ED-97B7-74F0C403AE41",
+  "modeltype" : "PSAPPDEVIEW"
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json

@@ -12455,6 +12455,12 @@
     "viewType" : "DEGRIDVIEW",
     "resource" : "Book",
     "view" : "Usr4GridView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr10306924DashboardView.json",
+    "viewType" : "DEPORTALVIEW",
+    "resource" : "Phone",
+    "view" : "Usr10306924DashboardView"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneGridView.json",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json

@@ -904,6 +904,10 @@
     "modelref" : true,
     "path" : "PSSYSSAMPLEVALUES/SampleValue4.json"
   } ],
+  "getAllPSSysSearchSchemes" : [ {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSSYSSEARCHSCHEMES/test.json"
+  } ],
   "getAllPSSysServiceAPIs" : [ {
     "modelref" : true,
     "path" : "PSSYSSERVICEAPIS/TrainSys.json"