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

514a80d4 · ibizdev · 080492ef · 514a80d4 · 514a80d4 · 514a80d4
--- a/config.xml
+++ b/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>

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr03276928EditView2.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr03276928EditView2.json
@@ -123,7 +123,8 @@
              },
              "getPSSysPFPlugin" : {
                "pluginType" : "EDITOR_CUSTOMSTYLE",
-                "pluginCode" : "CRM_CALL_BACK"
+                "pluginCode" : "CRM_CALL_BACK",
+                "runtimeObject" : true
              },
              "getPSUIAction" : {
                "getCapPSLanguageRes" : {
@@ -169,7 +170,8 @@
                "name" : "field_text_dynamic",
                "getPSSysPFPlugin" : {
                  "pluginType" : "EDITOR_CUSTOMSTYLE",
-                  "pluginCode" : "CRM_IMAGE_UPLOAD"
+                  "pluginCode" : "CRM_IMAGE_UPLOAD",
+                  "runtimeObject" : true
                },
                "predefinedType" : "FIELD_TEXT_DYNAMIC"
              },

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
@@ -2645,7 +2645,8 @@
    "name" : "CRM图片上传",
    "getPSSysPFPlugin" : {
      "pluginType" : "EDITOR_CUSTOMSTYLE",
-      "pluginCode" : "CRM_IMAGE_UPLOAD"
+      "pluginCode" : "CRM_IMAGE_UPLOAD",
+      "runtimeObject" : true
    },
    "pluginCode" : "CRM_IMAGE_UPLOAD",
    "styleCode" : "CRM_IMAGE_UPLOAD"
@@ -5591,22 +5592,30 @@
    "name" : "CRM图片上传",
    "getPSSysPFPlugin" : {
      "pluginType" : "EDITOR_CUSTOMSTYLE",
-      "pluginCode" : "CRM_IMAGE_UPLOAD"
+      "pluginCode" : "CRM_IMAGE_UPLOAD",
+      "runtimeObject" : true
    },
    "pluginCode" : "CRM_IMAGE_UPLOAD",
    "pluginType" : "EDITOR_CUSTOMSTYLE",
-    "refMode" : "EDITORSTYPE"
+    "rTObjectName" : "CrmImageUpload",
+    "rTObjectRepo" : "@ibiz-template-crm/anchor-point-nav@0.0.2-alpha.1",
+    "refMode" : "EDITORSTYPE",
+    "runtimeObject" : true
  }, {
    "name" : "CRM返回",
    "getPSSysPFPlugin" : {
      "pluginType" : "EDITOR_CUSTOMSTYLE",
-      "pluginCode" : "CRM_CALL_BACK"
+      "pluginCode" : "CRM_CALL_BACK",
+      "runtimeObject" : true
    },
    "pluginCode" : "CRM_CALL_BACK",
    "pluginType" : "EDITOR_CUSTOMSTYLE",
+    "rTObjectName" : "IBizButtonBack",
+    "rTObjectRepo" : "@ibiz-template-crm/anchor-point-nav@0.0.2-alpha.1",
    "refMode" : "CONTROLITEM",
    "refTag" : "VIEWLAYOUTPANEL",
-    "refTag2" : "BUTTON"
+    "refTag2" : "BUTTON",
+    "runtimeObject" : true
  }, {
    "name" : "LuckySheet编辑",
    "getPSSysPFPlugin" : {
@@ -5664,7 +5673,7 @@
    "pluginCode" : "DRBAR_ANCHOR_STYLE",
    "pluginType" : "CUSTOM",
    "rTObjectName" : "IBizDRBarExControl",
-    "rTObjectRepo" : "@ibiz-template-crm/anchor-point-nav@0.0.1",
+    "rTObjectRepo" : "@ibiz-template-crm/anchor-point-nav@0.0.2-alpha.1",
    "refMode" : "CONTROL",
    "refTag" : "DRBAR",
    "runtimeObject" : true
@@ -5718,7 +5727,7 @@
    "pluginCode" : "ANCHOR_STYLE",
    "pluginType" : "EDITFORM_RENDER",
    "rTObjectName" : "IBizFromAnchorPointControl",
-    "rTObjectRepo" : "@ibiz-template-crm/anchor-point-nav@0.0.1",
+    "rTObjectRepo" : "@ibiz-template-crm/anchor-point-nav@0.0.2-alpha.1",
    "refMode" : "CONTROL",
    "refTag" : "FORM",
    "runtimeObject" : true
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.simple.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.simple.json
@@ -20,22 +20,30 @@
    "name" : "CRM图片上传",
    "getPSSysPFPlugin" : {
      "pluginType" : "EDITOR_CUSTOMSTYLE",
-      "pluginCode" : "CRM_IMAGE_UPLOAD"
+      "pluginCode" : "CRM_IMAGE_UPLOAD",
+      "runtimeObject" : true
    },
    "pluginCode" : "CRM_IMAGE_UPLOAD",
    "pluginType" : "EDITOR_CUSTOMSTYLE",
-    "refMode" : "EDITORSTYPE"
+    "rTObjectName" : "CrmImageUpload",
+    "rTObjectRepo" : "@ibiz-template-crm/anchor-point-nav@0.0.2-alpha.1",
+    "refMode" : "EDITORSTYPE",
+    "runtimeObject" : true
  }, {
    "name" : "CRM返回",
    "getPSSysPFPlugin" : {
      "pluginType" : "EDITOR_CUSTOMSTYLE",
-      "pluginCode" : "CRM_CALL_BACK"
+      "pluginCode" : "CRM_CALL_BACK",
+      "runtimeObject" : true
    },
    "pluginCode" : "CRM_CALL_BACK",
    "pluginType" : "EDITOR_CUSTOMSTYLE",
+    "rTObjectName" : "IBizButtonBack",
+    "rTObjectRepo" : "@ibiz-template-crm/anchor-point-nav@0.0.2-alpha.1",
    "refMode" : "CONTROLITEM",
    "refTag" : "VIEWLAYOUTPANEL",
-    "refTag2" : "BUTTON"
+    "refTag2" : "BUTTON",
+    "runtimeObject" : true
  }, {
    "name" : "LuckySheet编辑",
    "getPSSysPFPlugin" : {
@@ -93,7 +101,7 @@
    "pluginCode" : "DRBAR_ANCHOR_STYLE",
    "pluginType" : "CUSTOM",
    "rTObjectName" : "IBizDRBarExControl",
-    "rTObjectRepo" : "@ibiz-template-crm/anchor-point-nav@0.0.1",
+    "rTObjectRepo" : "@ibiz-template-crm/anchor-point-nav@0.0.2-alpha.1",
    "refMode" : "CONTROL",
    "refTag" : "DRBAR",
    "runtimeObject" : true
@@ -147,7 +155,7 @@
    "pluginCode" : "ANCHOR_STYLE",
    "pluginType" : "EDITFORM_RENDER",
    "rTObjectName" : "IBizFromAnchorPointControl",
-    "rTObjectRepo" : "@ibiz-template-crm/anchor-point-nav@0.0.1",
+    "rTObjectRepo" : "@ibiz-template-crm/anchor-point-nav@0.0.2-alpha.1",
    "refMode" : "CONTROL",
    "refTag" : "FORM",
    "runtimeObject" : true

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
@@ -1064,7 +1064,8 @@
    "name" : "CRM图片上传",
    "getPSSysPFPlugin" : {
      "pluginType" : "EDITOR_CUSTOMSTYLE",
-      "pluginCode" : "CRM_IMAGE_UPLOAD"
+      "pluginCode" : "CRM_IMAGE_UPLOAD",
+      "runtimeObject" : true
    },
    "styleCode" : "CRM_IMAGE_UPLOAD",
    "replaceDefault" : false
@@ -1141,7 +1142,8 @@
    "name" : "crm返回",
    "getPSSysPFPlugin" : {
      "pluginType" : "EDITOR_CUSTOMSTYLE",
-      "pluginCode" : "CRM_CALL_BACK"
+      "pluginCode" : "CRM_CALL_BACK",
+      "runtimeObject" : true
    },
    "styleCode" : "CRM_CALL_BACK",
    "replaceDefault" : false

--- a/trainsys-provider/pom.xml
+++ b/trainsys-provider/pom.xml
@@ -33,7 +33,7 @@

    <profiles>
        <profile>
-            <id>trainsys</id>
+            <id>runtime</id>
            <build>
                <resources>
                    <resource>

--- a/trainsys-provider/src/main/docker/Dockerfile
+++ b/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
--- a/trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
+++ b/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

--- a/trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
+++ b/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: