lengyuace 发布系统代码 [TrainSys，网页端]

app_Web/swarm.yaml

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

config.xml

@@ -55,12 +55,6 @@
 	  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/PSMODULES/Test/PSDATAENTITIES/Realtor.json

@@ -1010,13 +1010,6 @@
     "logicName" : "更新",
     "name" : "UPDATE"
   } ],
-  "getAllPSDEPrints" : [ {
-    "codeName" : "Print",
-    "name" : "PRINT",
-    "reportFile" : "#",
-    "reportType" : "POI_TL",
-    "id" : "PSMODULES/Test/PSDATAENTITIES/Realtor/PSDEPRINTS/Print.json"
-  } ],
   "getAllPSModelDatas" : [ {
     "codeName" : "RedirectView",
     "logicName" : "房产中介实体数据重定向视图",

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

@@ -1024,12 +1024,6 @@
     "requestPath" : "/select",
     "builtinMethod" : false
   } ],
-  "getAllPSAppDEPrints" : [ {
-    "codeName" : "Print",
-    "name" : "PRINT",
-    "reportFile" : "#",
-    "reportType" : "POI_TL"
-  } ],
   "getAllPSAppViews" : [ {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/RealtorMPickupView.json",

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

@@ -299,52 +299,6 @@
       "uIActionTarget" : "SINGLEKEY",
       "showCaption" : true,
       "showIcon" : true
-    }, {
-      "getCapPSLanguageRes" : {
-        "lanResTag" : "TBB.TEXT.*.PRINT"
-      },
-      "caption" : "打印",
-      "groupExtractMode" : "ITEM",
-      "itemType" : "DEUIACTION",
-      "name" : "tbitem15",
-      "noPrivDisplayMode" : 2,
-      "getPSAppViewUIAction" : {
-        "modelref" : true,
-        "id" : "toolbar_tbitem15"
-      },
-      "getPSSysImage" : {
-        "glyph" : "xf02f@FontAwesome",
-        "cssClass" : "fa fa-print"
-      },
-      "getPSUIAction" : {
-        "actionTarget" : "SINGLEKEY",
-        "getCapPSLanguageRes" : {
-          "lanResTag" : "TBB.TEXT.*.PRINT"
-        },
-        "caption" : "打印",
-        "codeName" : "Print",
-        "fullCodeName" : "Print",
-        "name" : "编辑界面_打印操作",
-        "getPSSysImage" : {
-          "glyph" : "xf02f@FontAwesome",
-          "cssClass" : "fa fa-print"
-        },
-        "predefinedType" : "EDITVIEW_PRINTACTION",
-        "timeout" : 60000,
-        "getTooltipPSLanguageRes" : {
-          "lanResTag" : "TBB.TOOLTIP.*.PRINT"
-        },
-        "uIActionMode" : "SYS",
-        "uIActionTag" : "Print",
-        "uIActionType" : "DEUIACTION"
-      },
-      "tooltip" : "打印",
-      "getTooltipPSLanguageRes" : {
-        "lanResTag" : "TBB.TOOLTIP.*.PRINT"
-      },
-      "uIActionTarget" : "SINGLEKEY",
-      "showCaption" : true,
-      "showIcon" : true
     }, {
       "itemType" : "SEPERATOR",
       "name" : "tbitem16"

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

@@ -298,52 +298,6 @@
       "uIActionTarget" : "SINGLEKEY",
       "showCaption" : true,
       "showIcon" : true
-    }, {
-      "getCapPSLanguageRes" : {
-        "lanResTag" : "TBB.TEXT.*.PRINT"
-      },
-      "caption" : "打印",
-      "groupExtractMode" : "ITEM",
-      "itemType" : "DEUIACTION",
-      "name" : "tbitem15",
-      "noPrivDisplayMode" : 2,
-      "getPSAppViewUIAction" : {
-        "modelref" : true,
-        "id" : "toolbar_tbitem15"
-      },
-      "getPSSysImage" : {
-        "glyph" : "xf02f@FontAwesome",
-        "cssClass" : "fa fa-print"
-      },
-      "getPSUIAction" : {
-        "actionTarget" : "SINGLEKEY",
-        "getCapPSLanguageRes" : {
-          "lanResTag" : "TBB.TEXT.*.PRINT"
-        },
-        "caption" : "打印",
-        "codeName" : "Print",
-        "fullCodeName" : "Print",
-        "name" : "编辑界面_打印操作",
-        "getPSSysImage" : {
-          "glyph" : "xf02f@FontAwesome",
-          "cssClass" : "fa fa-print"
-        },
-        "predefinedType" : "EDITVIEW_PRINTACTION",
-        "timeout" : 60000,
-        "getTooltipPSLanguageRes" : {
-          "lanResTag" : "TBB.TOOLTIP.*.PRINT"
-        },
-        "uIActionMode" : "SYS",
-        "uIActionTag" : "Print",
-        "uIActionType" : "DEUIACTION"
-      },
-      "tooltip" : "打印",
-      "getTooltipPSLanguageRes" : {
-        "lanResTag" : "TBB.TOOLTIP.*.PRINT"
-      },
-      "uIActionTarget" : "SINGLEKEY",
-      "showCaption" : true,
-      "showIcon" : true
     }, {
       "itemType" : "SEPERATOR",
       "name" : "tbitem16"

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

@@ -706,55 +706,6 @@
     }, {
       "itemType" : "SEPERATOR",
       "name" : "tbitem10"
-    }, {
-      "getCapPSLanguageRes" : {
-        "lanResTag" : "TBB.TEXT.*.PRINT"
-      },
-      "caption" : "打印",
-      "groupExtractMode" : "ITEM",
-      "itemType" : "DEUIACTION",
-      "name" : "tbitem11",
-      "noPrivDisplayMode" : 2,
-      "getPSAppViewUIAction" : {
-        "modelref" : true,
-        "id" : "toolbar_tbitem11"
-      },
-      "getPSSysImage" : {
-        "glyph" : "xf02f@FontAwesome",
-        "cssClass" : "fa fa-print"
-      },
-      "getPSUIAction" : {
-        "actionTarget" : "MULTIKEY",
-        "getCapPSLanguageRes" : {
-          "lanResTag" : "TBB.TEXT.*.PRINT"
-        },
-        "caption" : "打印",
-        "codeName" : "Print",
-        "fullCodeName" : "Print",
-        "name" : "表格界面_打印操作",
-        "getPSSysImage" : {
-          "glyph" : "xf02f@FontAwesome",
-          "cssClass" : "fa fa-print"
-        },
-        "predefinedType" : "GRIDVIEW_PRINTACTION",
-        "timeout" : 60000,
-        "getTooltipPSLanguageRes" : {
-          "lanResTag" : "TBB.TOOLTIP.*.PRINT"
-        },
-        "uIActionMode" : "SYS",
-        "uIActionTag" : "Print",
-        "uIActionType" : "DEUIACTION"
-      },
-      "tooltip" : "打印",
-      "getTooltipPSLanguageRes" : {
-        "lanResTag" : "TBB.TOOLTIP.*.PRINT"
-      },
-      "uIActionTarget" : "MULTIKEY",
-      "showCaption" : true,
-      "showIcon" : true
-    }, {
-      "itemType" : "SEPERATOR",
-      "name" : "tbitem12"
     }, {
       "caption" : "其它",
       "itemType" : "ITEMS",

trainsys-provider/pom.xml

@@ -33,7 +33,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,23 +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
-      - 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: