ibiz4j 部署微服务接口 [TrainSys，默认服务接口]

config.xml

@@ -55,36 +55,12 @@
 	  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
+      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>
     </hudson.tasks.Shell>
   </builders>

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

@@ -19,12 +19,14 @@
     "caption" : "书实体数据视图测试",
     "counterId" : "num3",
     "detailType" : "DRITEM",
+    "enableMode" : "SCRIPT",
     "name" : "dataview",
     "orderValue" : 110,
     "getPSDEDRItem" : {
       "modelref" : true,
       "path" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDRITEMS/UsrDRItem1211696935.json"
-    }
+    },
+    "testScriptCode" : "false"
   }, {
     "caption" : "测试实体实体编辑视图(简单表单)",
     "counterId" : "num4",

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

@@ -47,6 +47,7 @@
     "caption" : "平铺视图",
     "counterId" : "num3",
     "detailType" : "DRITEM",
+    "enableMode" : "SCRIPT",
     "name" : "dritem3",
     "orderValue" : 120,
     "originCaption" : "平铺视图",
@@ -57,7 +58,8 @@
     "getPSSysImage" : {
       "glyph" : "xf009@FontAwesome",
       "cssClass" : "fa fa-th-large"
-    }
+    },
+    "testScriptCode" : "false"
   }, {
     "caption" : "编辑视图",
     "counterId" : "num4",

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

@@ -2,12 +2,14 @@
   "codeName" : "UsrDRItem1211696935",
   "counterId" : "num3",
   "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDRITEMS/UsrDRItem1211696935.json",
+  "enableMode" : "SCRIPT",
   "itemType" : "CUSTOM",
   "name" : "书实体数据视图测试",
   "parentDataJO" : {
     "srfparentdename" : "TEST",
     "SRFPARENTTYPE" : "CUSTOM"
   },
+  "testScriptCode" : "false",
   "viewCodeName" : "Usr2DataView",
   "getViewPSDataEntity" : {
     "modelref" : true,

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

@@ -123,6 +123,7 @@
     }, {
       "caption" : "平铺视图",
       "counterId" : "num3",
+      "enableMode" : "SCRIPT",
       "name" : "dritem3",
       "getPSAppView" : {
         "modelref" : true,
@@ -136,7 +137,8 @@
       "getPSSysImage" : {
         "glyph" : "xf009@FontAwesome",
         "cssClass" : "fa fa-th-large"
-      }
+      },
+      "testScriptCode" : "false"
     }, {
       "caption" : "编辑视图",
       "counterId" : "num4",

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

@@ -99,6 +99,7 @@
     }, {
       "caption" : "平铺视图",
       "counterId" : "num3",
+      "enableMode" : "SCRIPT",
       "name" : "dritem3",
       "getPSAppView" : {
         "modelref" : true,
@@ -108,7 +109,8 @@
       "getPSSysImage" : {
         "glyph" : "xf009@FontAwesome",
         "cssClass" : "fa fa-th-large"
-      }
+      },
+      "testScriptCode" : "false"
     }, {
       "caption" : "编辑视图",
       "counterId" : "num4",

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

@@ -492,6 +492,7 @@
     }, {
       "caption" : "平铺视图",
       "counterId" : "num3",
+      "enableMode" : "SCRIPT",
       "name" : "dritem3",
       "getPSAppView" : {
         "modelref" : true,
@@ -501,7 +502,8 @@
       "getPSSysImage" : {
         "glyph" : "xf009@FontAwesome",
         "cssClass" : "fa fa-th-large"
-      }
+      },
+      "testScriptCode" : "false"
     }, {
       "caption" : "编辑视图",
       "counterId" : "num4",

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

@@ -492,6 +492,7 @@
     }, {
       "caption" : "平铺视图",
       "counterId" : "num3",
+      "enableMode" : "SCRIPT",
       "name" : "dritem3",
       "getPSAppView" : {
         "modelref" : true,
@@ -501,7 +502,8 @@
       "getPSSysImage" : {
         "glyph" : "xf009@FontAwesome",
         "cssClass" : "fa fa-th-large"
-      }
+      },
+      "testScriptCode" : "false"
     }, {
       "caption" : "编辑视图",
       "counterId" : "num4",

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

@@ -99,6 +99,7 @@
     }, {
       "caption" : "平铺视图",
       "counterId" : "num3",
+      "enableMode" : "SCRIPT",
       "name" : "dritem3",
       "getPSAppView" : {
         "modelref" : true,
@@ -108,7 +109,8 @@
       "getPSSysImage" : {
         "glyph" : "xf009@FontAwesome",
         "cssClass" : "fa fa-th-large"
-      }
+      },
+      "testScriptCode" : "false"
     }, {
       "caption" : "编辑视图",
       "counterId" : "num4",

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

@@ -433,6 +433,7 @@
     }, {
       "caption" : "书实体数据视图测试",
       "counterId" : "num3",
+      "enableMode" : "SCRIPT",
       "name" : "dataview",
       "getPSAppView" : {
         "modelref" : true,
@@ -442,7 +443,8 @@
       "getPSDEDRBarGroup" : {
         "modelref" : true,
         "id" : "UsrDRGroup1211996428"
-      }
+      },
+      "testScriptCode" : "false"
     }, {
       "caption" : "测试实体实体编辑视图(简单表单)",
       "counterId" : "num4",

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

@@ -99,6 +99,7 @@
     }, {
       "caption" : "平铺视图",
       "counterId" : "num3",
+      "enableMode" : "SCRIPT",
       "name" : "dritem3",
       "getPSAppView" : {
         "modelref" : true,
@@ -108,7 +109,8 @@
       "getPSSysImage" : {
         "glyph" : "xf009@FontAwesome",
         "cssClass" : "fa fa-th-large"
-      }
+      },
+      "testScriptCode" : "false"
     }, {
       "caption" : "编辑视图",
       "counterId" : "num4",

trainsys-provider/pom.xml

@@ -33,7 +33,7 @@
 
     <profiles>
         <profile>
-            <id>runtime</id>
+            <id>trainsys</id>
             <build>
                 <resources>
                     <resource>

trainsys-provider/src/main/docker/Dockerfile

@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /trainsys-provider.jar
 
-EXPOSE 8081
+EXPOSE 50000
 
 ADD trainsys-provider.jar /trainsys-provider.jar

trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml

@@ -22,7 +22,32 @@ spec:
         image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
         imagePullPolicy: Always
         ports:
-        - containerPort: 8081
+        - containerPort: 50000
+        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
@@ -35,9 +60,9 @@ spec:
   type: NodePort
   ports:
   - name: http
-    port: 8081
-    targetPort: 8081
-    nodePort: 8081
+    port: 50000
+    targetPort: 50000
+    nodePort: 50000
     protocol: TCP
   selector:
     app: trainsys-provider

trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml

@@ -3,9 +3,23 @@ services:
   trainsys-provider:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
     ports:
-      - "8081:8081"
+      - "50000:50000"
     networks:
       - 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:
       resources:
            limits: