chitanda 部署微服务应用 [TrainSys，网页端]

README.md

@@ -3,6 +3,10 @@
 ## 背景
 
 ## 系统模块
+* [公共模块](module/common4.md)
+* [公共模块](module/common2.md)
+* [公共模块](module/common5.md)
+* [公共模块](module/common3.md)
 * [公共模块](module/common.md)
 
 

config.xml

@@ -55,12 +55,15 @@
 	  git clone -b master $para2 trainsys/
       export NODE_OPTIONS=--max-old-space-size=4096
       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      
+      mkdir -p /var/lib/jenkins/appcache/A3064A91-F42D-4D7F-BC1C-4173A4F5772C
+      if [ -e app_Web/.dynamic ]
+      then
+          cd app_Web
+      else
+          cd app_Web/app
+      fi
+      sed -i "s#dstimage#registry.cn-shanghai.aliyuncs.com/ibizsys/ibizcloud-standardsys-app-webapp:2022.07.28.004#g" swarm.yaml
+      docker -H $para1 stack deploy --compose-file=swarm.yaml ebsx --with-registry-auth    
       </command>
     </hudson.tasks.Shell>
   </builders>

pom.xml

@@ -29,31 +29,31 @@
         <dependency>
             <groupId>net.ibizsys.plugin</groupId>
             <artifactId>ibiz-plugin-cloud</artifactId>
-            <version>8.1.0.159</version>
+            <version>8.1.0.172</version>
         </dependency>
 
         <dependency>
             <groupId>net.ibizsys.plugin</groupId>
             <artifactId>ibiz-plugin-redis</artifactId>
-            <version>8.1.0.159</version>
+            <version>8.1.0.172</version>
         </dependency>
 
         <dependency>
             <groupId>net.ibizsys.plugin</groupId>
             <artifactId>ibiz-plugin-mybatisplus-spring-boot-starter</artifactId>
-            <version>8.1.0.159</version>
+            <version>8.1.0.172</version>
         </dependency>
 
          <dependency>
             <groupId>net.ibizsys.plugin</groupId>
             <artifactId>ibiz-plugin-zookeeper</artifactId>
-            <version>8.1.0.159</version>
+            <version>8.1.0.172</version>
         </dependency>
 
         <dependency>
             <groupId>net.ibizsys.plugin</groupId>
             <artifactId>ibiz-plugin-poi</artifactId>
-            <version>8.1.0.159</version>
+            <version>8.1.0.172</version>
         </dependency>
 
     </dependencies>

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

+{
+  "codeName" : "common2",
+  "dynaModelFilePath" : "PSMODULES/common2.json",
+  "name" : "公共模块"
+}
\ No newline at end of file

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

+{
+  "codeName" : "common3",
+  "dynaModelFilePath" : "PSMODULES/common3.json",
+  "name" : "公共模块"
+}
\ No newline at end of file

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

+{
+  "codeName" : "common4",
+  "dynaModelFilePath" : "PSMODULES/common4.json",
+  "name" : "公共模块"
+}
\ No newline at end of file

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

+{
+  "codeName" : "common5",
+  "dynaModelFilePath" : "PSMODULES/common5.json",
+  "name" : "公共模块"
+}
\ No newline at end of file

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

@@ -708,7 +708,7 @@
   },
   "dynaModelFilePath" : "PSSYSAPPS/Web/PSSYSAPP.json",
   "name" : "网页端",
-  "pFStyle" : "r7_dynamic_gateway",
+  "pFStyle" : "VUE_R7_EMPTY",
   "pFType" : "VUE_R7",
   "pKGCodeName" : "Web",
   "serviceCodeName" : "Web",

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

@@ -547,6 +547,22 @@
     "path" : "PSSYSVALUERULES/ValueRule12.json"
   } ],
   "getAllPSSystemModules" : [ {
+    "codeName" : "common4",
+    "dynaModelFilePath" : "PSMODULES/common4.json",
+    "name" : "公共模块"
+  }, {
+    "codeName" : "common2",
+    "dynaModelFilePath" : "PSMODULES/common2.json",
+    "name" : "公共模块"
+  }, {
+    "codeName" : "common5",
+    "dynaModelFilePath" : "PSMODULES/common5.json",
+    "name" : "公共模块"
+  }, {
+    "codeName" : "common3",
+    "dynaModelFilePath" : "PSMODULES/common3.json",
+    "name" : "公共模块"
+  }, {
     "getAllPSDataEntities" : [ {
       "modelref" : true,
       "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
@@ -571,11 +587,14 @@
     "contentType" : "CODE",
     "defaultFlag" : true,
     "dynaModelFilePath" : "PSSYSSFPUBS/TrainSys.json",
+    "modelFolder" : "trainsys-core/src/main/resources/model/cn/ibizlab/trainsys",
     "name" : "TrainSys",
     "pKGCodeName" : "cn.ibizlab.trainsys",
     "versionString" : "1.0.0.0",
     "codeMode" : true,
-    "mainPSSysSFPub" : true
+    "enableModelRT" : true,
+    "mainPSSysSFPub" : true,
+    "pubModel" : true
   },
   "deploySysId" : "TrainSys",
   "deploySysTag" : "336d44c339448f6095f53a1fe78eb8d5",

trainsys-provider/pom.xml

@@ -34,7 +34,7 @@
 
     <profiles>
         <profile>
-            <id>trainsys</id>
+            <id>runtime</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 50000
+EXPOSE 8081
 
 ADD trainsys-provider.jar /trainsys-provider.jar

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

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

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

@@ -3,24 +3,9 @@ services:
   trainsys-provider:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
     ports:
-      - "50000:50000"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.140
-      - IBIZ_SERVICEHUB_ID=TrainSys
-      - 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: