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

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/PSSYSAPPS/Web/PSAPPDATAENTITIES/City/PSFORMS/PeopleSelexcEditView_Form.json

@@ -222,6 +222,11 @@
           "editorStyle" : "EMPMULTIPLE",
           "editorType" : "PICKER",
           "name" : "formitem1",
+          "getPSSysPFPlugin" : {
+            "pluginType" : "EDITOR_CUSTOMSTYLE",
+            "pluginCode" : "PERSONSELECT",
+            "runtimeObject" : true
+          },
           "enableAC" : true,
           "enablePickupView" : true,
           "forceSelection" : true,
@@ -360,6 +365,11 @@
           "editorStyle" : "ALLDEPTPERSONMULTIPLE",
           "editorType" : "PICKER",
           "name" : "formitem6",
+          "getPSSysPFPlugin" : {
+            "pluginType" : "EDITOR_CUSTOMSTYLE",
+            "pluginCode" : "PERSONSELECT",
+            "runtimeObject" : true
+          },
           "enableAC" : true,
           "enablePickupView" : true,
           "forceSelection" : true,
@@ -395,6 +405,11 @@
           "editorStyle" : "DEPTPERSONMULTIPLE",
           "editorType" : "PICKER",
           "name" : "formitem7",
+          "getPSSysPFPlugin" : {
+            "pluginType" : "EDITOR_CUSTOMSTYLE",
+            "pluginCode" : "PERSONSELECT",
+            "runtimeObject" : true
+          },
           "enableAC" : true,
           "enablePickupView" : true,
           "forceSelection" : true,
@@ -470,6 +485,11 @@
           "editorStyle" : "DEPTPERSONSELEC",
           "editorType" : "PICKER",
           "name" : "formitem5",
+          "getPSSysPFPlugin" : {
+            "pluginType" : "EDITOR_CUSTOMSTYLE",
+            "pluginCode" : "PERSONSELECT",
+            "runtimeObject" : true
+          },
           "enableAC" : true,
           "enablePickupView" : true,
           "forceSelection" : true,

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

@@ -1169,6 +1169,11 @@
             "getPSEditorItems" : [ {
               "name" : "formitem5"
             } ],
+            "getPSSysPFPlugin" : {
+              "pluginType" : "EDITOR_CUSTOMSTYLE",
+              "pluginCode" : "PERSONSELECT",
+              "runtimeObject" : true
+            },
             "valueItemName" : "formitem5",
             "enableAC" : true,
             "enablePickupView" : true,
@@ -1352,6 +1357,11 @@
             "getPSEditorItems" : [ {
               "name" : "formitem10"
             } ],
+            "getPSSysPFPlugin" : {
+              "pluginType" : "EDITOR_CUSTOMSTYLE",
+              "pluginCode" : "PERSONSELECT",
+              "runtimeObject" : true
+            },
             "valueItemName" : "formitem10",
             "enableAC" : true,
             "enablePickupView" : true,
@@ -1425,6 +1435,11 @@
             "getPSEditorItems" : [ {
               "name" : "formitem11"
             } ],
+            "getPSSysPFPlugin" : {
+              "pluginType" : "EDITOR_CUSTOMSTYLE",
+              "pluginCode" : "PERSONSELECT",
+              "runtimeObject" : true
+            },
             "valueItemName" : "formitem11",
             "enableAC" : true,
             "enablePickupView" : true,
@@ -1498,6 +1513,11 @@
             "getPSEditorItems" : [ {
               "name" : "formitem8"
             } ],
+            "getPSSysPFPlugin" : {
+              "pluginType" : "EDITOR_CUSTOMSTYLE",
+              "pluginCode" : "PERSONSELECT",
+              "runtimeObject" : true
+            },
             "valueItemName" : "formitem8",
             "enableAC" : true,
             "enablePickupView" : true,

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

@@ -1864,6 +1864,11 @@
               "getPSEditorItems" : [ {
                 "name" : "formitem5"
               } ],
+              "getPSSysPFPlugin" : {
+                "pluginType" : "EDITOR_CUSTOMSTYLE",
+                "pluginCode" : "PERSONSELECT",
+                "runtimeObject" : true
+              },
               "valueItemName" : "formitem5",
               "enableAC" : true,
               "enablePickupView" : true,
@@ -2047,6 +2052,11 @@
               "getPSEditorItems" : [ {
                 "name" : "formitem10"
               } ],
+              "getPSSysPFPlugin" : {
+                "pluginType" : "EDITOR_CUSTOMSTYLE",
+                "pluginCode" : "PERSONSELECT",
+                "runtimeObject" : true
+              },
               "valueItemName" : "formitem10",
               "enableAC" : true,
               "enablePickupView" : true,
@@ -2120,6 +2130,11 @@
               "getPSEditorItems" : [ {
                 "name" : "formitem11"
               } ],
+              "getPSSysPFPlugin" : {
+                "pluginType" : "EDITOR_CUSTOMSTYLE",
+                "pluginCode" : "PERSONSELECT",
+                "runtimeObject" : true
+              },
               "valueItemName" : "formitem11",
               "enableAC" : true,
               "enablePickupView" : true,
@@ -2193,6 +2208,11 @@
               "getPSEditorItems" : [ {
                 "name" : "formitem8"
               } ],
+              "getPSSysPFPlugin" : {
+                "pluginType" : "EDITOR_CUSTOMSTYLE",
+                "pluginCode" : "PERSONSELECT",
+                "runtimeObject" : true
+              },
               "valueItemName" : "formitem8",
               "enableAC" : true,
               "enablePickupView" : true,

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

@@ -347,6 +347,11 @@
             "editorStyle" : "EMPMULTIPLE",
             "editorType" : "PICKER",
             "name" : "formitem1",
+            "getPSSysPFPlugin" : {
+              "pluginType" : "EDITOR_CUSTOMSTYLE",
+              "pluginCode" : "PERSONSELECT",
+              "runtimeObject" : true
+            },
             "enableAC" : true,
             "enablePickupView" : true,
             "forceSelection" : true,
@@ -485,6 +490,11 @@
             "editorStyle" : "ALLDEPTPERSONMULTIPLE",
             "editorType" : "PICKER",
             "name" : "formitem6",
+            "getPSSysPFPlugin" : {
+              "pluginType" : "EDITOR_CUSTOMSTYLE",
+              "pluginCode" : "PERSONSELECT",
+              "runtimeObject" : true
+            },
             "enableAC" : true,
             "enablePickupView" : true,
             "forceSelection" : true,
@@ -520,6 +530,11 @@
             "editorStyle" : "DEPTPERSONMULTIPLE",
             "editorType" : "PICKER",
             "name" : "formitem7",
+            "getPSSysPFPlugin" : {
+              "pluginType" : "EDITOR_CUSTOMSTYLE",
+              "pluginCode" : "PERSONSELECT",
+              "runtimeObject" : true
+            },
             "enableAC" : true,
             "enablePickupView" : true,
             "forceSelection" : true,
@@ -595,6 +610,11 @@
             "editorStyle" : "DEPTPERSONSELEC",
             "editorType" : "PICKER",
             "name" : "formitem5",
+            "getPSSysPFPlugin" : {
+              "pluginType" : "EDITOR_CUSTOMSTYLE",
+              "pluginCode" : "PERSONSELECT",
+              "runtimeObject" : true
+            },
             "enableAC" : true,
             "enablePickupView" : true,
             "forceSelection" : true,

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

@@ -2228,6 +2228,12 @@
     "containerType" : "FORMITEM",
     "editorType" : "PICKER",
     "name" : "【多选】所有部门内人员选择",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "EDITOR_CUSTOMSTYLE",
+      "pluginCode" : "PERSONSELECT",
+      "runtimeObject" : true
+    },
+    "pluginCode" : "PERSONSELECT",
     "styleCode" : "ALLDEPTPERSONMULTIPLE"
   }, {
     "codeName" : "ALLDEPTPERSONSELECT",
@@ -2318,18 +2324,36 @@
     "containerType" : "FORMITEM",
     "editorType" : "PICKER",
     "name" : "【多选】指定部门内人员选择",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "EDITOR_CUSTOMSTYLE",
+      "pluginCode" : "PERSONSELECT",
+      "runtimeObject" : true
+    },
+    "pluginCode" : "PERSONSELECT",
     "styleCode" : "DEPTPERSONMULTIPLE"
   }, {
     "codeName" : "DEPTPERSONSELEC",
     "containerType" : "FORMITEM",
     "editorType" : "PICKER",
     "name" : "【单选】指定部门内人员选择",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "EDITOR_CUSTOMSTYLE",
+      "pluginCode" : "PERSONSELECT",
+      "runtimeObject" : true
+    },
+    "pluginCode" : "PERSONSELECT",
     "styleCode" : "DEPTPERSONSELEC"
   }, {
     "codeName" : "EMPMULTIPLE",
     "containerType" : "FORMITEM",
     "editorType" : "PICKER",
     "name" : "【多选】指定单位内人员选择",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "EDITOR_CUSTOMSTYLE",
+      "pluginCode" : "PERSONSELECT",
+      "runtimeObject" : true
+    },
+    "pluginCode" : "PERSONSELECT",
     "styleCode" : "EMPMULTIPLE"
   }, {
     "codeName" : "EMPSELECT",
@@ -44424,6 +44448,11 @@
                 "editorStyle" : "EMPMULTIPLE",
                 "editorType" : "PICKER",
                 "name" : "formitem1",
+                "getPSSysPFPlugin" : {
+                  "pluginType" : "EDITOR_CUSTOMSTYLE",
+                  "pluginCode" : "PERSONSELECT",
+                  "runtimeObject" : true
+                },
                 "enableAC" : true,
                 "enablePickupView" : true,
                 "forceSelection" : true,
@@ -44562,6 +44591,11 @@
                 "editorStyle" : "ALLDEPTPERSONMULTIPLE",
                 "editorType" : "PICKER",
                 "name" : "formitem6",
+                "getPSSysPFPlugin" : {
+                  "pluginType" : "EDITOR_CUSTOMSTYLE",
+                  "pluginCode" : "PERSONSELECT",
+                  "runtimeObject" : true
+                },
                 "enableAC" : true,
                 "enablePickupView" : true,
                 "forceSelection" : true,
@@ -44597,6 +44631,11 @@
                 "editorStyle" : "DEPTPERSONMULTIPLE",
                 "editorType" : "PICKER",
                 "name" : "formitem7",
+                "getPSSysPFPlugin" : {
+                  "pluginType" : "EDITOR_CUSTOMSTYLE",
+                  "pluginCode" : "PERSONSELECT",
+                  "runtimeObject" : true
+                },
                 "enableAC" : true,
                 "enablePickupView" : true,
                 "forceSelection" : true,
@@ -44672,6 +44711,11 @@
                 "editorStyle" : "DEPTPERSONSELEC",
                 "editorType" : "PICKER",
                 "name" : "formitem5",
+                "getPSSysPFPlugin" : {
+                  "pluginType" : "EDITOR_CUSTOMSTYLE",
+                  "pluginCode" : "PERSONSELECT",
+                  "runtimeObject" : true
+                },
                 "enableAC" : true,
                 "enablePickupView" : true,
                 "forceSelection" : true,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json

@@ -821,6 +821,11 @@
     "editorType" : "PICKER",
     "editorWidth" : -1.0,
     "name" : "【多选】指定部门内人员选择",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "EDITOR_CUSTOMSTYLE",
+      "pluginCode" : "PERSONSELECT",
+      "runtimeObject" : true
+    },
     "styleCode" : "DEPTPERSONMULTIPLE",
     "replaceDefault" : false
   }, {
@@ -899,6 +904,11 @@
     "editorType" : "PICKER",
     "editorWidth" : -1.0,
     "name" : "【单选】指定部门内人员选择",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "EDITOR_CUSTOMSTYLE",
+      "pluginCode" : "PERSONSELECT",
+      "runtimeObject" : true
+    },
     "styleCode" : "DEPTPERSONSELEC",
     "replaceDefault" : false
   }, {
@@ -909,6 +919,11 @@
     "editorWidth" : -1.0,
     "memo" : "左边没有单位树，人员按照filter设置的单位id对应的表单项筛选，filter不设置默认按照当前登录人所属单位srforgid\nurl=/SYS_organizations/${selected-orgid}/SYS_employees/picker",
     "name" : "【多选】指定单位内人员选择",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "EDITOR_CUSTOMSTYLE",
+      "pluginCode" : "PERSONSELECT",
+      "runtimeObject" : true
+    },
     "styleCode" : "EMPMULTIPLE",
     "replaceDefault" : false
   }, {
@@ -1034,6 +1049,11 @@
     "editorType" : "PICKER",
     "editorWidth" : -1.0,
     "name" : "【多选】所有部门内人员选择",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "EDITOR_CUSTOMSTYLE",
+      "pluginCode" : "PERSONSELECT",
+      "runtimeObject" : true
+    },
     "styleCode" : "ALLDEPTPERSONMULTIPLE",
     "replaceDefault" : false
   }, {

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: