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

fdc8ba12 · ibizdev · 39eda56d · fdc8ba12 · fdc8ba12 · fdc8ba12
--- 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/PSCODELISTS/WFInfomMsgType.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSCODELISTS/WFInfomMsgType.json
+{
+  "codeListTag" : "WFInfomMsgType",
+  "codeListType" : "STATIC",
+  "codeName" : "WFInfomMsgType",
+  "dynaInstMode" : 0,
+  "dynaModelFilePath" : "PSCODELISTS/WFInfomMsgType.json",
+  "name" : "通知消息类型",
+  "orMode" : "NUM",
+  "getPSCodeItems" : [ {
+    "codeName" : "INTERNAL",
+    "text" : "系统消息",
+    "value" : "1"
+  }, {
+    "codeName" : "EMAIL",
+    "text" : "电子邮件",
+    "value" : "2"
+  }, {
+    "codeName" : "SMS",
+    "text" : "手机短信",
+    "value" : "4"
+  }, {
+    "codeName" : "WT",
+    "text" : "微信",
+    "value" : "32"
+  }, {
+    "codeName" : "DT",
+    "text" : "钉钉",
+    "value" : "64"
+  }, {
+    "codeName" : "ENTWT",
+    "text" : "企业微信",
+    "value" : "128"
+  } ],
+  "refFlag" : true,
+  "systemTag" : "TrainSys",
+  "textSeparator" : "、",
+  "codeItemValueNumber" : true,
+  "enableCache" : true,
+  "subSysAsCloud" : false,
+  "subSysCodeList" : false,
+  "userScope" : false
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPCODELISTS/WFInfomMsgType.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPCODELISTS/WFInfomMsgType.json
+{
+  "codeListTag" : "WFInfomMsgType",
+  "codeListType" : "STATIC",
+  "codeName" : "WFInfomMsgType",
+  "dynaInstMode" : 0,
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/WFInfomMsgType.json",
+  "name" : "通知消息类型",
+  "orMode" : "NUM",
+  "getPSCodeItems" : [ {
+    "codeName" : "INTERNAL",
+    "text" : "系统消息",
+    "value" : "1"
+  }, {
+    "codeName" : "EMAIL",
+    "text" : "电子邮件",
+    "value" : "2"
+  }, {
+    "codeName" : "SMS",
+    "text" : "手机短信",
+    "value" : "4"
+  }, {
+    "codeName" : "WT",
+    "text" : "微信",
+    "value" : "32"
+  }, {
+    "codeName" : "DT",
+    "text" : "钉钉",
+    "value" : "64"
+  }, {
+    "codeName" : "ENTWT",
+    "text" : "企业微信",
+    "value" : "128"
+  } ],
+  "textSeparator" : "、",
+  "codeItemValueNumber" : true,
+  "enableCache" : true
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/Dsjbjcs.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/Dsjbjcs.json
@@ -199,21 +199,19 @@
          "codeName" : "Field17"
        },
        "getPSEditor" : {
-          "editorParams" : {
+          "editorType" : "CHECKBOXLIST",
-            "PICKUPVIEW" : "TRUE"
-          },
-          "editorType" : "ADDRESSPICKUP",
          "name" : "formitem",
-          "enableAC" : false,
+          "getPSAppCodeList" : {
-          "enablePickupView" : true,
+            "modelref" : true,
-          "forceSelection" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/WFInfomMsgType.json"
-          "showTrigger" : true
+          }
        },
        "getPSLayoutPos" : {
          "colMD" : 24,
          "layout" : "TABLE_24COL"
        },
        "allowEmpty" : true,
+        "needCodeListConfig" : true,
        "showCaption" : true
      }, {
        "caption" : "属性17",
@@ -232,22 +230,19 @@
          "codeName" : "Field17"
        },
        "getPSEditor" : {
-          "editorParams" : {
+          "editorType" : "CHECKBOXLIST",
-            "PICKUPVIEW" : "TRUE"
-          },
-          "editorType" : "ADDRESSPICKUP_AC",
-          "handlerType" : "AC",
          "name" : "formitem1",
-          "enableAC" : false,
+          "getPSAppCodeList" : {
-          "enablePickupView" : true,
+            "modelref" : true,
-          "forceSelection" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/WFInfomMsgType.json"
-          "showTrigger" : true
+          }
        },
        "getPSLayoutPos" : {
          "colMD" : 24,
          "layout" : "TABLE_24COL"
        },
        "allowEmpty" : true,
+        "needCodeListConfig" : true,
        "showCaption" : true
      } ],
      "getPSLayout" : {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr4EditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr4EditView.json
@@ -868,21 +868,19 @@
            "codeName" : "Field17"
          },
          "getPSEditor" : {
-            "editorParams" : {
+            "editorType" : "CHECKBOXLIST",
-              "PICKUPVIEW" : "TRUE"
-            },
-            "editorType" : "ADDRESSPICKUP",
            "name" : "formitem",
-            "enableAC" : false,
+            "getPSAppCodeList" : {
-            "enablePickupView" : true,
+              "modelref" : true,
-            "forceSelection" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/WFInfomMsgType.json"
-            "showTrigger" : true
+            }
          },
          "getPSLayoutPos" : {
            "colMD" : 24,
            "layout" : "TABLE_24COL"
          },
          "allowEmpty" : true,
+          "needCodeListConfig" : true,
          "showCaption" : true
        }, {
          "caption" : "属性17",
@@ -901,22 +899,19 @@
            "codeName" : "Field17"
          },
          "getPSEditor" : {
-            "editorParams" : {
+            "editorType" : "CHECKBOXLIST",
-              "PICKUPVIEW" : "TRUE"
-            },
-            "editorType" : "ADDRESSPICKUP_AC",
-            "handlerType" : "AC",
            "name" : "formitem1",
-            "enableAC" : false,
+            "getPSAppCodeList" : {
-            "enablePickupView" : true,
+              "modelref" : true,
-            "forceSelection" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/WFInfomMsgType.json"
-            "showTrigger" : true
+            }
          },
          "getPSLayoutPos" : {
            "colMD" : 24,
            "layout" : "TABLE_24COL"
          },
          "allowEmpty" : true,
+          "needCodeListConfig" : true,
          "showCaption" : true
        } ],
        "getPSLayout" : {

--- 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
@@ -878,6 +878,42 @@
      "value" : "RouterUrl"
    } ],
    "enableCache" : true
+  }, {
+    "codeListTag" : "WFInfomMsgType",
+    "codeListType" : "STATIC",
+    "codeName" : "WFInfomMsgType",
+    "dynaInstMode" : 0,
+    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/WFInfomMsgType.json",
+    "name" : "通知消息类型",
+    "orMode" : "NUM",
+    "getPSCodeItems" : [ {
+      "codeName" : "INTERNAL",
+      "text" : "系统消息",
+      "value" : "1"
+    }, {
+      "codeName" : "EMAIL",
+      "text" : "电子邮件",
+      "value" : "2"
+    }, {
+      "codeName" : "SMS",
+      "text" : "手机短信",
+      "value" : "4"
+    }, {
+      "codeName" : "WT",
+      "text" : "微信",
+      "value" : "32"
+    }, {
+      "codeName" : "DT",
+      "text" : "钉钉",
+      "value" : "64"
+    }, {
+      "codeName" : "ENTWT",
+      "text" : "企业微信",
+      "value" : "128"
+    } ],
+    "textSeparator" : "、",
+    "codeItemValueNumber" : true,
+    "enableCache" : true
  }, {
    "codeListTag" : "YesNo",
    "codeListType" : "STATIC",
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
@@ -57,6 +57,9 @@
  }, {
    "modelref" : true,
    "path" : "PSCODELISTS/CodeList79.json"
+  }, {
+    "modelref" : true,
+    "path" : "PSCODELISTS/WFInfomMsgType.json"
  }, {
    "modelref" : true,
    "path" : "PSCODELISTS/CodeList30.json"

--- 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
+        - containerPort: 8081
-        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
@@ -60,9 +35,9 @@ spec:
  type: NodePort
  ports:
  - name: http
-    port: 50000
+    port: 8081
-    targetPort: 50000
+    targetPort: 8081
-    nodePort: 50000
+    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: