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

app_Mob/package.json

 {
   "name": "@ibiz-template/next-mob",
   "private": true,
-  "version": "0.0.14",
+  "version": "0.0.16",
   "description": "An Ionic project",
   "scripts": {
     "dev": "vite",
@@ -11,14 +11,14 @@
   },
   "dependencies": {
     "@ibiz-template-package/vs-tree-ex": "^0.1.2",
-    "@ibiz-template/mob-theme": "^0.2.12",
-    "@ibiz-template/mob-vue3-components": "^0.0.16-dev.0",
-    "@ibiz-template/core": "^0.6.3",
-    "@ibiz-template/model-helper": "^0.6.3",
-    "@ibiz-template/runtime": "^0.6.3",
-    "@ibiz-template/theme": "^0.6.0",
-    "@ibiz-template/vue3-util": "^0.6.3",
-    "@ibiz/model-core": "^0.1.14",
+    "@ibiz-template/mob-theme": "^0.2.13",
+    "@ibiz-template/mob-vue3-components": "^0.0.18",
+    "@ibiz-template/core": "0.7.3",
+    "@ibiz-template/model-helper": "0.7.5",
+    "@ibiz-template/runtime": "0.7.5",
+    "@ibiz-template/theme": "^0.7.0",
+    "@ibiz-template/vue3-util": "0.7.5",
+    "@ibiz/model-core": "^0.1.21",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.10",
     "echarts": "^5.4.3",

app_Mob/public/environments/environment.js

@@ -13,16 +13,18 @@ window.Environment = {
   // mockDcSystemId: '941127f9d839f87308f1c4db3b0a2de4',
   // appId: 'trainsys__mob',
   // mockDcSystemId: '84847aa970ba3db7bbe00754aed3888d',
-  appId: 'sztrainsys__mob',
-  mockDcSystemId: 'ac2720c74d5456b40e24aeaf6ffffbd2',
+  // appId: 'sztrainsys__mob',
+  // mockDcSystemId: 'ac2720c74d5456b40e24aeaf6ffffbd2',
   // appId: 'ibizdemoold__sample',
   // mockDcSystemId: 'ibizdemoold',
   // appId: 'ls__lsmob',
   // mockDcSystemId: 'LS',
   // appId: 'pms__sclpmsmob',
   // mockDcSystemId: 'pms',
-  appId: 'demosys__mobvue3',
-  mockDcSystemId: 'demosys',
+  // appId: 'demosys__mobvue3',
+  // mockDcSystemId: 'demosys',
+  appId: 'darm__mob',
+  mockDcSystemId: 'darm',
   // 创新孵化
   // appId: 'cxfhmgmt__cxfhappmob',
   // mockDcSystemId: 'cxfhmgmt',

app_Mob/swarm.yaml

@@ -3,7 +3,7 @@ services:
   trainsys-app-mob:
     image: dstimage
     ports:
-      - "80:80"
+      - "50200:80"
     networks:
       - agent_network
     environment:

app_Mob/vite.config.ts

@@ -84,6 +84,10 @@ export default defineConfig({
   },
   server: {
     proxy: {
+      '/api/darm__mob': {
+        target: 'http://172.16.103.146:30103',
+        changeOrigin: true,
+      },
       '/api/sztrainsys__mob': {
         rewrite(path) {
           return path.replace('/api', '');
@@ -106,9 +110,6 @@ export default defineConfig({
         changeOrigin: true,
       },
       '/api/pms__sclpmsmob': {
-        // rewrite(path) {
-        //   return path.replace('/api/pms__sclpmsmob', '/api');
-        // },
         target: 'http://172.16.103.158:30164/',
         changeOrigin: true,
       },

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/PSDATAENTITIES/TEST/PSDEDATARELATIONS/DEIndexViewRelation.json

@@ -7,17 +7,14 @@
     "caption" : "测试实体实体表格视图",
     "counterId" : "num1",
     "detailType" : "DRITEM",
-    "enableMode" : "DELOGIC",
+    "enableMode" : "SCRIPT",
     "name" : "grid",
     "orderValue" : 100,
     "getPSDEDRItem" : {
       "modelref" : true,
       "path" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDRITEMS/DRItem.json"
     },
-    "getTestPSDELogic" : {
-      "modelref" : true,
-      "path" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDELOGICS/ViewMessageLogic.json"
-    }
+    "testScriptCode" : "false"
   }, {
     "caption" : "书实体数据视图测试",
     "counterId" : "num3",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDATARELATIONS/Usr05103999TabExpView_DR.json

@@ -22,7 +22,7 @@
     "caption" : "应用",
     "counterId" : "num1",
     "detailType" : "DRITEM",
-    "enableMode" : "DELOGIC",
+    "enableMode" : "SCRIPT",
     "name" : "app",
     "orderValue" : 110,
     "originCaption" : "应用",
@@ -30,9 +30,6 @@
       "modelref" : true,
       "path" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDRITEMS/DRItem.json"
     },
-    "getTestPSDELogic" : {
-      "modelref" : true,
-      "path" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDELOGICS/ViewMessageLogic.json"
-    }
+    "testScriptCode" : "false"
   } ]
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDRITEMS/DRItem.json

@@ -2,17 +2,14 @@
   "codeName" : "DRItem",
   "counterId" : "num1",
   "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDRITEMS/DRItem.json",
-  "enableMode" : "DELOGIC",
+  "enableMode" : "SCRIPT",
   "itemType" : "CUSTOM",
   "name" : "测试实体实体表格视图",
   "parentDataJO" : {
     "srfparentdename" : "TEST",
     "SRFPARENTTYPE" : "CUSTOM"
   },
-  "getTestPSDELogic" : {
-    "modelref" : true,
-    "path" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDELOGICS/ViewMessageLogic.json"
-  },
+  "testScriptCode" : "false",
   "viewCodeName" : "GridView",
   "getViewPSDataEntity" : {
     "modelref" : true,

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

@@ -418,7 +418,7 @@
     "getPSDEDRCtrlItems" : [ {
       "caption" : "测试实体实体表格视图",
       "counterId" : "num1",
-      "enableMode" : "DELOGIC",
+      "enableMode" : "SCRIPT",
       "name" : "grid",
       "getPSAppView" : {
         "modelref" : true,
@@ -429,10 +429,7 @@
         "modelref" : true,
         "id" : "UsrDRGroup1211996428"
       },
-      "getTestPSAppDELogic" : {
-        "modelref" : true,
-        "id" : "ViewMessageLogic"
-      }
+      "testScriptCode" : "false"
     }, {
       "caption" : "书实体数据视图测试",
       "counterId" : "num3",

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

@@ -80,17 +80,14 @@
     }, {
       "caption" : "应用",
       "counterId" : "num1",
-      "enableMode" : "DELOGIC",
+      "enableMode" : "SCRIPT",
       "name" : "app",
       "getPSAppView" : {
         "modelref" : true,
         "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGridView.json",
         "viewType" : "DEGRIDVIEW"
       },
-      "getTestPSAppDELogic" : {
-        "modelref" : true,
-        "id" : "ViewMessageLogic"
-      }
+      "testScriptCode" : "false"
     } ],
     "getPSSysPFPlugin" : {
       "pluginType" : "CUSTOM",

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

@@ -84839,17 +84839,14 @@
         }, {
           "caption" : "应用",
           "counterId" : "num1",
-          "enableMode" : "DELOGIC",
+          "enableMode" : "SCRIPT",
           "name" : "app",
           "getPSAppView" : {
             "modelref" : true,
             "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGridView.json",
             "viewType" : "DEGRIDVIEW"
           },
-          "getTestPSAppDELogic" : {
-            "modelref" : true,
-            "id" : "ViewMessageLogic"
-          }
+          "testScriptCode" : "false"
         } ],
         "getPSSysPFPlugin" : {
           "pluginType" : "CUSTOM",