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/Book.json

@@ -5250,6 +5250,7 @@
   "getAllPSAppPortletCats" : [ {
     "codeName" : "Ungroup",
     "name" : "（未分类）",
+    "uniqueTag" : "Ungroup",
     "ungroup" : true
   } ],
   "getAllPSAppViews" : [ {

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

@@ -3352,11 +3352,11 @@
   "getAllPSAppPortletCats" : [ {
     "codeName" : "list",
     "name" : "列表",
-    "ungroup" : false
+    "uniqueTag" : "list"
   }, {
     "codeName" : "view",
     "name" : "视图",
-    "ungroup" : false
+    "uniqueTag" : "view"
   } ],
   "getAllPSAppViews" : [ {
     "modelref" : true,

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

@@ -2284,6 +2284,7 @@
   "getAllPSAppPortletCats" : [ {
     "codeName" : "Ungroup",
     "name" : "（未分类）",
+    "uniqueTag" : "Ungroup",
     "ungroup" : true
   } ],
   "getAllPSAppViews" : [ {

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

@@ -9911,6 +9911,7 @@
   "getAllPSAppPortletCats" : [ {
     "codeName" : "Ungroup",
     "name" : "（未分类）",
+    "uniqueTag" : "Ungroup",
     "ungroup" : true
   } ],
   "getAllPSAppViews" : [ {

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

@@ -15,9 +15,6 @@
       "name" : "TESTNAME",
       "codeName" : "TESTName"
     }
-  }, {
-    "id" : "formitem",
-    "dataType" : 25
   }, {
     "id" : "n_type_eq",
     "dataType" : 25,
@@ -60,30 +57,6 @@
       },
       "allowEmpty" : true,
       "showCaption" : true
-    }, {
-      "caption" : "表单项",
-      "codeName" : "formitem",
-      "dataType" : 25,
-      "detailStyle" : "DEFAULT",
-      "detailType" : "FORMITEM",
-      "enableCond" : 3,
-      "ignoreInput" : 0,
-      "labelPos" : "LEFT",
-      "labelWidth" : 130,
-      "name" : "formitem",
-      "noPrivDisplayMode" : 1,
-      "getPSEditor" : {
-        "editorType" : "DROPDOWNLIST",
-        "name" : "formitem",
-        "singleSelect" : true
-      },
-      "getPSLayoutPos" : {
-        "colMD" : 24,
-        "layout" : "TABLE_24COL"
-      },
-      "allowEmpty" : true,
-      "needCodeListConfig" : true,
-      "showCaption" : true
     }, {
       "getCapPSLanguageRes" : {
         "lanResTag" : "CONTROL.DEFSFITEM.TEST.N_TYPE_EQ"

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

@@ -132,6 +132,13 @@
       "name" : "CREATEDATE",
       "codeName" : "CreateDate"
     }
+  }, {
+    "id" : "test3",
+    "dataType" : 6,
+    "getPSAppDEField" : {
+      "name" : "TEST3",
+      "codeName" : "Test3"
+    }
   }, {
     "id" : "formitem",
     "dataType" : 25
@@ -241,6 +248,35 @@
         "valueFormat" : "YYYY-MM-DD HH:mm:ss",
         "allowEmpty" : true,
         "showCaption" : true
+      }, {
+        "caption" : "属性3",
+        "codeName" : "test3",
+        "dataType" : 6,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "test3",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "TEST3",
+          "codeName" : "Test3"
+        },
+        "getPSEditor" : {
+          "editorStyle" : "EMOJI_SELECT",
+          "editorType" : "DROPDOWNLIST",
+          "name" : "test3",
+          "singleSelect" : true
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "needCodeListConfig" : true,
+        "showCaption" : true
       }, {
         "caption" : "代码编辑框",
         "codeName" : "formitem",

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

@@ -146,6 +146,24 @@
     "width" : 150,
     "widthUnit" : "PX",
     "enableSort" : true
+  }, {
+    "align" : "LEFT",
+    "cLConvertMode" : "NONE",
+    "caption" : "属性",
+    "codeName" : "test1",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "test1",
+    "excelCaption" : "属性",
+    "name" : "test1",
+    "noPrivDisplayMode" : 1,
+    "getPSAppDEField" : {
+      "name" : "TEST1",
+      "codeName" : "Test1"
+    },
+    "width" : 100,
+    "widthUnit" : "PX",
+    "enableRowEdit" : true,
+    "enableSort" : true
   } ],
   "getPSDEGridDataItems" : [ {
     "dataType" : 25,
@@ -169,6 +187,13 @@
       "name" : "UPDATEDATE",
       "codeName" : "UpdateDate"
     }
+  }, {
+    "dataType" : 25,
+    "name" : "test1",
+    "getPSAppDEField" : {
+      "name" : "TEST1",
+      "codeName" : "Test1"
+    }
   }, {
     "dataType" : 25,
     "name" : "srfkey",
@@ -247,6 +272,24 @@
       "singleSelect" : true
     },
     "allowEmpty" : true
+  }, {
+    "caption" : "属性",
+    "codeName" : "test1",
+    "enableCond" : 3,
+    "ignoreInput" : 0,
+    "name" : "test1",
+    "getPSAppDEField" : {
+      "name" : "TEST1",
+      "codeName" : "Test1"
+    },
+    "getPSEditor" : {
+      "editorStyle" : "EMOJI_SELECT",
+      "editorType" : "DROPDOWNLIST",
+      "name" : "test1",
+      "singleSelect" : true
+    },
+    "allowEmpty" : true,
+    "needCodeListConfig" : true
   }, {
     "caption" : "测试表格标识",
     "codeName" : "srfkey",

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

@@ -712,6 +712,24 @@
       "width" : 150,
       "widthUnit" : "PX",
       "enableSort" : true
+    }, {
+      "align" : "LEFT",
+      "cLConvertMode" : "NONE",
+      "caption" : "属性",
+      "codeName" : "test1",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "test1",
+      "excelCaption" : "属性",
+      "name" : "test1",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "TEST1",
+        "codeName" : "Test1"
+      },
+      "width" : 100,
+      "widthUnit" : "PX",
+      "enableRowEdit" : true,
+      "enableSort" : true
     } ],
     "getPSDEGridDataItems" : [ {
       "dataType" : 25,
@@ -735,6 +753,13 @@
         "name" : "UPDATEDATE",
         "codeName" : "UpdateDate"
       }
+    }, {
+      "dataType" : 25,
+      "name" : "test1",
+      "getPSAppDEField" : {
+        "name" : "TEST1",
+        "codeName" : "Test1"
+      }
     }, {
       "dataType" : 25,
       "name" : "srfkey",
@@ -813,6 +838,24 @@
         "singleSelect" : true
       },
       "allowEmpty" : true
+    }, {
+      "caption" : "属性",
+      "codeName" : "test1",
+      "enableCond" : 3,
+      "ignoreInput" : 0,
+      "name" : "test1",
+      "getPSAppDEField" : {
+        "name" : "TEST1",
+        "codeName" : "Test1"
+      },
+      "getPSEditor" : {
+        "editorStyle" : "EMOJI_SELECT",
+        "editorType" : "DROPDOWNLIST",
+        "name" : "test1",
+        "singleSelect" : true
+      },
+      "allowEmpty" : true,
+      "needCodeListConfig" : true
     }, {
       "caption" : "测试表格标识",
       "codeName" : "srfkey",

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

@@ -503,6 +503,13 @@
           "name" : "CREATEDATE",
           "codeName" : "CreateDate"
         }
+      }, {
+        "id" : "test3",
+        "dataType" : 6,
+        "getPSAppDEField" : {
+          "name" : "TEST3",
+          "codeName" : "Test3"
+        }
       }, {
         "id" : "formitem",
         "dataType" : 25
@@ -612,6 +619,35 @@
             "valueFormat" : "YYYY-MM-DD HH:mm:ss",
             "allowEmpty" : true,
             "showCaption" : true
+          }, {
+            "caption" : "属性3",
+            "codeName" : "test3",
+            "dataType" : 6,
+            "detailStyle" : "DEFAULT",
+            "detailType" : "FORMITEM",
+            "enableCond" : 3,
+            "ignoreInput" : 0,
+            "labelPos" : "LEFT",
+            "labelWidth" : 130,
+            "name" : "test3",
+            "noPrivDisplayMode" : 1,
+            "getPSAppDEField" : {
+              "name" : "TEST3",
+              "codeName" : "Test3"
+            },
+            "getPSEditor" : {
+              "editorStyle" : "EMOJI_SELECT",
+              "editorType" : "DROPDOWNLIST",
+              "name" : "test3",
+              "singleSelect" : true
+            },
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "allowEmpty" : true,
+            "needCodeListConfig" : true,
+            "showCaption" : true
           }, {
             "caption" : "代码编辑框",
             "codeName" : "formitem",

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

@@ -27,6 +27,9 @@
     }, {
       "id" : "field_picker",
       "viewFieldName" : "UPDATEMAN"
+    }, {
+      "id" : "field_text_dynamic1",
+      "viewFieldName" : "UPDATEMAN"
     }, {
       "id" : "field_picker1"
     }, {
@@ -243,6 +246,23 @@
         },
         "viewFieldName" : "UPDATEMAN",
         "width" : 50.0
+      }, {
+        "caption" : "文本(动态)",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "FIELD",
+        "name" : "field_text_dynamic1",
+        "getPSEditor" : {
+          "editorStyle" : "EMOJI_SELECT",
+          "editorType" : "DROPDOWNLIST",
+          "name" : "field_text_dynamic1",
+          "predefinedType" : "FIELD_TEXT_DYNAMIC",
+          "singleSelect" : true
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "viewFieldName" : "UPDATEMAN"
       } ],
       "predefinedType" : "CONTAINER_MULTIDATA"
     }, {

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

@@ -961,9 +961,6 @@
         "name" : "TESTNAME",
         "codeName" : "TESTName"
       }
-    }, {
-      "id" : "formitem",
-      "dataType" : 25
     }, {
       "id" : "n_type_eq",
       "dataType" : 25,
@@ -1006,30 +1003,6 @@
         },
         "allowEmpty" : true,
         "showCaption" : true
-      }, {
-        "caption" : "表单项",
-        "codeName" : "formitem",
-        "dataType" : 25,
-        "detailStyle" : "DEFAULT",
-        "detailType" : "FORMITEM",
-        "enableCond" : 3,
-        "ignoreInput" : 0,
-        "labelPos" : "LEFT",
-        "labelWidth" : 130,
-        "name" : "formitem",
-        "noPrivDisplayMode" : 1,
-        "getPSEditor" : {
-          "editorType" : "DROPDOWNLIST",
-          "name" : "formitem",
-          "singleSelect" : true
-        },
-        "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
-        },
-        "allowEmpty" : true,
-        "needCodeListConfig" : true,
-        "showCaption" : true
       }, {
         "getCapPSLanguageRes" : {
           "lanResTag" : "CONTROL.DEFSFITEM.TEST.N_TYPE_EQ"

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

@@ -1214,6 +1214,15 @@
     },
     "styleCode" : "EMPMULTIPLE",
     "replaceDefault" : false
+  }, {
+    "codeName" : "EMOJI_SELECT",
+    "dynaModelFilePath" : "PSSYSEDITORSTYLES/EMOJI_SELECT.json",
+    "editorHeight" : -1.0,
+    "editorType" : "DROPDOWNLIST",
+    "editorWidth" : -1.0,
+    "name" : "表情下拉选择",
+    "styleCode" : "EMOJI_SELECT",
+    "replaceDefault" : false
   }, {
     "codeName" : "R9EditorPluginId",
     "dynaModelFilePath" : "PSSYSEDITORSTYLES/R9EditorPluginId.json",

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: