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

config.xml

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

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSFORMS/Gnqrbdys.json

@@ -347,6 +347,9 @@
   }, {
     "id" : "formitem50",
     "dataType" : 25
+  }, {
+    "id" : "formitem51",
+    "dataType" : 25
   }, {
     "id" : "testid",
     "hidden" : true,
@@ -2671,6 +2674,36 @@
         },
         "allowEmpty" : true,
         "showCaption" : true
+      }, {
+        "caption" : "宽300高100",
+        "codeName" : "formitem51",
+        "contentHeight" : 100.0,
+        "contentWidth" : 300.0,
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "height" : 100.0,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "formitem51",
+        "noPrivDisplayMode" : 1,
+        "getPSEditor" : {
+          "editorType" : "TEXTBOX",
+          "name" : "formitem51"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "height" : 100,
+          "heightMode" : "PX",
+          "layout" : "TABLE_24COL",
+          "width" : 300,
+          "widthMode" : "PX"
+        },
+        "width" : 300.0,
+        "allowEmpty" : true,
+        "showCaption" : true
       } ],
       "getPSLayout" : {
         "childColLG" : -1,

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

@@ -984,11 +984,11 @@
       "addSeparator" : false
     } ],
     "quickGroupCount" : 4,
-    "quickSearchMode" : 0,
+    "quickSearchMode" : 1,
     "quickSearchWidth" : 0,
     "enableFilter" : false,
     "enableGroup" : true,
-    "enableQuickSearch" : false,
+    "enableQuickSearch" : true,
     "mobileSearchBar" : false
   }, {
     "caption" : "视图标题：数据表格95",
@@ -1039,6 +1039,7 @@
   "enableFilter" : false,
   "enableImport" : false,
   "enableQuickGroup" : true,
+  "enableQuickSearch" : true,
   "enableRowEdit" : false,
   "enableSearch" : true,
   "readOnly" : true,

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

@@ -470,6 +470,9 @@
     }, {
       "id" : "formitem50",
       "dataType" : 25
+    }, {
+      "id" : "formitem51",
+      "dataType" : 25
     }, {
       "id" : "testid",
       "hidden" : true,
@@ -2794,6 +2797,36 @@
           },
           "allowEmpty" : true,
           "showCaption" : true
+        }, {
+          "caption" : "宽300高100",
+          "codeName" : "formitem51",
+          "contentHeight" : 100.0,
+          "contentWidth" : 300.0,
+          "dataType" : 25,
+          "detailStyle" : "DEFAULT",
+          "detailType" : "FORMITEM",
+          "enableCond" : 3,
+          "height" : 100.0,
+          "ignoreInput" : 0,
+          "labelPos" : "LEFT",
+          "labelWidth" : 130,
+          "name" : "formitem51",
+          "noPrivDisplayMode" : 1,
+          "getPSEditor" : {
+            "editorType" : "TEXTBOX",
+            "name" : "formitem51"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "height" : 100,
+            "heightMode" : "PX",
+            "layout" : "TABLE_24COL",
+            "width" : 300,
+            "widthMode" : "PX"
+          },
+          "width" : 300.0,
+          "allowEmpty" : true,
+          "showCaption" : true
         } ],
         "getPSLayout" : {
           "childColLG" : -1,

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: