tony001 部署微服务接口 [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/TemplatePublish/PSAPPDATAENTITIES/Phone/PSWIZARDPANELS/X2.json

@@ -18,6 +18,7 @@
     }
   },
   "logicName" : "X2",
+  "memo" : "1",
   "getPSAppDataEntity" : {
     "modelref" : true,
     "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Phone.json"
@@ -1541,6 +1542,7 @@
   "getPSDEWizard" : {
     "codeName" : "X2",
     "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEWIZARDS/X2.json",
+    "memo" : "1",
     "name" : "X2",
     "getPSDEWizardForms" : [ {
       "formTag" : "form_x1",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/phoneUsr2WizardView.json

@@ -40,6 +40,7 @@
       }
     },
     "logicName" : "X2",
+    "memo" : "1",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Phone.json"
@@ -1585,6 +1586,7 @@
     "getPSDEWizard" : {
       "codeName" : "X2",
       "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEWIZARDS/X2.json",
+      "memo" : "1",
       "name" : "X2",
       "getPSDEWizardForms" : [ {
         "formTag" : "form_x1",

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

@@ -7,6 +7,7 @@
   "hookEventNames" : [ "SELECTIONCHANGE", "LOAD" ],
   "legendPos" : "NONE",
   "logicName" : "视图消息日历导航视图_日历部件",
+  "memo" : "1",
   "getPSAppDataEntity" : {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"

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

@@ -17,6 +17,7 @@
     }
   },
   "logicName" : "Chart4",
+  "memo" : "1",
   "getPSAppDataEntity" : {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"

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

@@ -3,6 +3,7 @@
   "controlType" : "DASHBOARD",
   "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSDASHBOARDS/Dashboard.json",
   "logicName" : "数据看板测试",
+  "memo" : "1",
   "getPSAppDataEntity" : {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"

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

@@ -56,6 +56,7 @@
     "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSPANELS/Usr0410019162.json",
     "layoutMode" : "TABLE_24COL",
     "logicName" : "视图消息卡片导航视图_卡片视图_卡片面板",
+    "memo" : "1",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"

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

@@ -21,6 +21,7 @@
   },
   "groupMode" : "NONE",
   "logicName" : "视图消息数据选择视图_选择数据视图_表格",
+  "memo" : "1",
   "getPSAppDataEntity" : {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"

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

@@ -4,6 +4,7 @@
   "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSPANELS/Usr0410019162.json",
   "layoutMode" : "TABLE_24COL",
   "logicName" : "视图消息卡片导航视图_卡片视图_卡片面板",
+  "memo" : "1",
   "getPSAppDataEntity" : {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"

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

@@ -4,6 +4,7 @@
   "defaultLabelWidth" : 130,
   "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSSEARCHFORMS/Usr04107641_SearchForm.json",
   "logicName" : "视图消息数据选择视图_选择数据视图_搜索表单",
+  "memo" : "1",
   "getPSAppDataEntity" : {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"

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

@@ -45,6 +45,7 @@
     }
   },
   "logicName" : "视图消息树视图_树视图",
+  "memo" : "1",
   "getPSAppDataEntity" : {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"

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

@@ -25,6 +25,7 @@
     "controlType" : "DASHBOARD",
     "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSDASHBOARDS/Dashboard.json",
     "logicName" : "数据看板测试",
+    "memo" : "1",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"

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

@@ -25,6 +25,7 @@
     "controlType" : "DASHBOARD",
     "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSDASHBOARDS/Dashboard.json",
     "logicName" : "数据看板测试",
+    "memo" : "1",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"

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

@@ -129,6 +129,7 @@
       }
     },
     "logicName" : "Chart4",
+    "memo" : "1",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"

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

@@ -104,6 +104,7 @@
     "codeName" : "Usr04100355KanbanViewtoolbar",
     "controlType" : "TOOLBAR",
     "logicName" : "视图消息看板视图_工具栏",
+    "memo" : "1",
     "name" : "toolbar",
     "getPSAppDataEntity" : {
       "modelref" : true,

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

@@ -70,6 +70,7 @@
       "hookEventNames" : [ "SELECTIONCHANGE", "LOAD" ],
       "legendPos" : "NONE",
       "logicName" : "视图消息日历导航视图_日历部件",
+      "memo" : "1",
       "getPSAppDataEntity" : {
         "modelref" : true,
         "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"

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

@@ -146,6 +146,7 @@
         "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSPANELS/Usr0410019162.json",
         "layoutMode" : "TABLE_24COL",
         "logicName" : "视图消息卡片导航视图_卡片视图_卡片面板",
+        "memo" : "1",
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"

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

@@ -72,6 +72,7 @@
       }
     },
     "logicName" : "视图消息树视图_树视图",
+    "memo" : "1",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"

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

@@ -74,6 +74,7 @@
         },
         "groupMode" : "NONE",
         "logicName" : "视图消息数据选择视图_选择数据视图_表格",
+        "memo" : "1",
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
@@ -361,6 +362,7 @@
         "defaultLabelWidth" : 130,
         "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSSEARCHFORMS/Usr04107641_SearchForm.json",
         "logicName" : "视图消息数据选择视图_选择数据视图_搜索表单",
+        "memo" : "1",
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"

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

@@ -45,6 +45,7 @@
     },
     "groupMode" : "NONE",
     "logicName" : "视图消息数据选择视图_选择数据视图_表格",
+    "memo" : "1",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
@@ -332,6 +333,7 @@
     "defaultLabelWidth" : 130,
     "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSSEARCHFORMS/Usr04107641_SearchForm.json",
     "logicName" : "视图消息数据选择视图_选择数据视图_搜索表单",
+    "memo" : "1",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"

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: