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/TEST/PSSEARCHBARS/filterSearchBar.json

@@ -231,119 +231,85 @@
     "showCaption" : false
   } ],
   "getPSSearchBarGroups" : [ {
-    "caption" : "SIC代码",
-    "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"0\"}]}]}}",
-    "itemType" : "GROUP",
-    "name" : "group1",
-    "width" : 0.0,
-    "addSeparator" : false
-  }, {
-    "caption" : "传真",
-    "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"1\"}]}]}}",
-    "itemType" : "GROUP",
-    "name" : "group2",
-    "width" : 0.0,
-    "addSeparator" : false
-  }, {
-    "caption" : "修改时间",
-    "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"2\"}]}]}}",
-    "itemType" : "GROUP",
-    "name" : "group3",
-    "width" : 0.0,
-    "addSeparator" : false
-  }, {
-    "caption" : "修改者",
-    "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"3\"}]}]}}",
-    "itemType" : "GROUP",
-    "name" : "group4",
-    "width" : 0.0,
-    "addSeparator" : false
-  }, {
-    "caption" : "公司所有权",
-    "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"4\"}]}]}}",
-    "itemType" : "GROUP",
-    "name" : "group5",
-    "width" : 0.0,
-    "addSeparator" : false
-  }, {
-    "caption" : "创建时间",
-    "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"5\"}]}]}}",
-    "itemType" : "GROUP",
-    "name" : "group6",
-    "width" : 0.0,
-    "addSeparator" : false
-  }, {
-    "caption" : "创建者",
-    "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"6\"}]}]}}",
+    "caption" : "上周新建",
+    "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
     "itemType" : "GROUP",
-    "name" : "group7",
+    "name" : "public1",
+    "userTag" : "PUBLIC",
     "width" : 0.0,
     "addSeparator" : false
   }, {
-    "caption" : "发货地址-国家/地区",
-    "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"7\"}]}]}}",
+    "caption" : "我的客户",
+    "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
     "itemType" : "GROUP",
-    "name" : "group8",
+    "name" : "public2",
+    "userTag" : "PUBLIC",
     "width" : 0.0,
-    "addSeparator" : false
+    "addSeparator" : false,
+    "defaultGroup" : true
   }, {
-    "caption" : "发货地址-城市",
-    "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"8\"}]}]}}",
+    "caption" : "所有客户",
+    "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
     "itemType" : "GROUP",
-    "name" : "group9",
+    "name" : "public3",
+    "userTag" : "PUBLIC",
     "width" : 0.0,
     "addSeparator" : false
   }, {
-    "caption" : "发货地址-省/市",
-    "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"9\"}]}]}}",
+    "caption" : "本周新建",
     "itemType" : "GROUP",
-    "name" : "group10",
+    "name" : "public4",
+    "userTag" : "PUBLIC",
     "width" : 0.0,
     "addSeparator" : false
   }, {
-    "caption" : "发货地址-街道",
-    "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"10\"}]}]}}",
+    "caption" : "金额",
     "itemType" : "GROUP",
-    "name" : "group11",
+    "name" : "group1",
+    "getPSAppDEField" : {
+      "name" : "AMOUNT",
+      "codeName" : "Amount"
+    },
     "width" : 0.0,
     "addSeparator" : false
   }, {
-    "caption" : "发货地址-邮编",
-    "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"11\"}]}]}}",
+    "caption" : "更新时间",
     "itemType" : "GROUP",
-    "name" : "group12",
+    "name" : "group2",
+    "getPSAppDEField" : {
+      "name" : "UPDATEDATE",
+      "codeName" : "UpdateDate"
+    },
     "width" : 0.0,
     "addSeparator" : false
   }, {
-    "caption" : "上周新建",
-    "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
+    "caption" : "数值",
     "itemType" : "GROUP",
-    "name" : "public1",
-    "userTag" : "PUBLIC",
+    "name" : "group3",
+    "getPSAppDEField" : {
+      "name" : "NUMBER2",
+      "codeName" : "Number2"
+    },
     "width" : 0.0,
     "addSeparator" : false
   }, {
-    "caption" : "我的客户",
-    "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
-    "itemType" : "GROUP",
-    "name" : "public2",
-    "userTag" : "PUBLIC",
-    "width" : 0.0,
-    "addSeparator" : false,
-    "defaultGroup" : true
-  }, {
-    "caption" : "所有客户",
-    "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
+    "caption" : "日期",
     "itemType" : "GROUP",
-    "name" : "public3",
-    "userTag" : "PUBLIC",
+    "name" : "group4",
+    "getPSAppDEField" : {
+      "name" : "DATE",
+      "codeName" : "Date"
+    },
     "width" : 0.0,
     "addSeparator" : false
   }, {
-    "caption" : "本周新建",
+    "caption" : "浮点",
     "itemType" : "GROUP",
-    "name" : "public4",
-    "userTag" : "PUBLIC",
+    "name" : "group5",
+    "getPSAppDEField" : {
+      "name" : "FLOAT",
+      "codeName" : "Float"
+    },
     "width" : 0.0,
     "addSeparator" : false
   } ],

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

@@ -524,119 +524,85 @@
         "showCaption" : false
       } ],
       "getPSSearchBarGroups" : [ {
-        "caption" : "SIC代码",
-        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"0\"}]}]}}",
-        "itemType" : "GROUP",
-        "name" : "group1",
-        "width" : 0.0,
-        "addSeparator" : false
-      }, {
-        "caption" : "传真",
-        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"1\"}]}]}}",
-        "itemType" : "GROUP",
-        "name" : "group2",
-        "width" : 0.0,
-        "addSeparator" : false
-      }, {
-        "caption" : "修改时间",
-        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"2\"}]}]}}",
-        "itemType" : "GROUP",
-        "name" : "group3",
-        "width" : 0.0,
-        "addSeparator" : false
-      }, {
-        "caption" : "修改者",
-        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"3\"}]}]}}",
-        "itemType" : "GROUP",
-        "name" : "group4",
-        "width" : 0.0,
-        "addSeparator" : false
-      }, {
-        "caption" : "公司所有权",
-        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"4\"}]}]}}",
-        "itemType" : "GROUP",
-        "name" : "group5",
-        "width" : 0.0,
-        "addSeparator" : false
-      }, {
-        "caption" : "创建时间",
-        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"5\"}]}]}}",
-        "itemType" : "GROUP",
-        "name" : "group6",
-        "width" : 0.0,
-        "addSeparator" : false
-      }, {
-        "caption" : "创建者",
-        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"6\"}]}]}}",
+        "caption" : "上周新建",
+        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
         "itemType" : "GROUP",
-        "name" : "group7",
+        "name" : "public1",
+        "userTag" : "PUBLIC",
         "width" : 0.0,
         "addSeparator" : false
       }, {
-        "caption" : "发货地址-国家/地区",
-        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"7\"}]}]}}",
+        "caption" : "我的客户",
+        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
         "itemType" : "GROUP",
-        "name" : "group8",
+        "name" : "public2",
+        "userTag" : "PUBLIC",
         "width" : 0.0,
-        "addSeparator" : false
+        "addSeparator" : false,
+        "defaultGroup" : true
       }, {
-        "caption" : "发货地址-城市",
-        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"8\"}]}]}}",
+        "caption" : "所有客户",
+        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
         "itemType" : "GROUP",
-        "name" : "group9",
+        "name" : "public3",
+        "userTag" : "PUBLIC",
         "width" : 0.0,
         "addSeparator" : false
       }, {
-        "caption" : "发货地址-省/市",
-        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"9\"}]}]}}",
+        "caption" : "本周新建",
         "itemType" : "GROUP",
-        "name" : "group10",
+        "name" : "public4",
+        "userTag" : "PUBLIC",
         "width" : 0.0,
         "addSeparator" : false
       }, {
-        "caption" : "发货地址-街道",
-        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"10\"}]}]}}",
+        "caption" : "金额",
         "itemType" : "GROUP",
-        "name" : "group11",
+        "name" : "group1",
+        "getPSAppDEField" : {
+          "name" : "AMOUNT",
+          "codeName" : "Amount"
+        },
         "width" : 0.0,
         "addSeparator" : false
       }, {
-        "caption" : "发货地址-邮编",
-        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"11\"}]}]}}",
+        "caption" : "更新时间",
         "itemType" : "GROUP",
-        "name" : "group12",
+        "name" : "group2",
+        "getPSAppDEField" : {
+          "name" : "UPDATEDATE",
+          "codeName" : "UpdateDate"
+        },
         "width" : 0.0,
         "addSeparator" : false
       }, {
-        "caption" : "上周新建",
-        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
+        "caption" : "数值",
         "itemType" : "GROUP",
-        "name" : "public1",
-        "userTag" : "PUBLIC",
+        "name" : "group3",
+        "getPSAppDEField" : {
+          "name" : "NUMBER2",
+          "codeName" : "Number2"
+        },
         "width" : 0.0,
         "addSeparator" : false
       }, {
-        "caption" : "我的客户",
-        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
-        "itemType" : "GROUP",
-        "name" : "public2",
-        "userTag" : "PUBLIC",
-        "width" : 0.0,
-        "addSeparator" : false,
-        "defaultGroup" : true
-      }, {
-        "caption" : "所有客户",
-        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
+        "caption" : "日期",
         "itemType" : "GROUP",
-        "name" : "public3",
-        "userTag" : "PUBLIC",
+        "name" : "group4",
+        "getPSAppDEField" : {
+          "name" : "DATE",
+          "codeName" : "Date"
+        },
         "width" : 0.0,
         "addSeparator" : false
       }, {
-        "caption" : "本周新建",
+        "caption" : "浮点",
         "itemType" : "GROUP",
-        "name" : "public4",
-        "userTag" : "PUBLIC",
+        "name" : "group5",
+        "getPSAppDEField" : {
+          "name" : "FLOAT",
+          "codeName" : "Float"
+        },
         "width" : 0.0,
         "addSeparator" : false
       } ],

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

@@ -53098,119 +53098,85 @@
             "showCaption" : false
           } ],
           "getPSSearchBarGroups" : [ {
-            "caption" : "SIC代码",
-            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"0\"}]}]}}",
-            "itemType" : "GROUP",
-            "name" : "group1",
-            "width" : 0.0,
-            "addSeparator" : false
-          }, {
-            "caption" : "传真",
-            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"1\"}]}]}}",
-            "itemType" : "GROUP",
-            "name" : "group2",
-            "width" : 0.0,
-            "addSeparator" : false
-          }, {
-            "caption" : "修改时间",
-            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"2\"}]}]}}",
-            "itemType" : "GROUP",
-            "name" : "group3",
-            "width" : 0.0,
-            "addSeparator" : false
-          }, {
-            "caption" : "修改者",
-            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"3\"}]}]}}",
-            "itemType" : "GROUP",
-            "name" : "group4",
-            "width" : 0.0,
-            "addSeparator" : false
-          }, {
-            "caption" : "公司所有权",
-            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"4\"}]}]}}",
-            "itemType" : "GROUP",
-            "name" : "group5",
-            "width" : 0.0,
-            "addSeparator" : false
-          }, {
-            "caption" : "创建时间",
-            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"5\"}]}]}}",
-            "itemType" : "GROUP",
-            "name" : "group6",
-            "width" : 0.0,
-            "addSeparator" : false
-          }, {
-            "caption" : "创建者",
-            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"6\"}]}]}}",
+            "caption" : "上周新建",
+            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
             "itemType" : "GROUP",
-            "name" : "group7",
+            "name" : "public1",
+            "userTag" : "PUBLIC",
             "width" : 0.0,
             "addSeparator" : false
           }, {
-            "caption" : "发货地址-国家/地区",
-            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"7\"}]}]}}",
+            "caption" : "我的客户",
+            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
             "itemType" : "GROUP",
-            "name" : "group8",
+            "name" : "public2",
+            "userTag" : "PUBLIC",
             "width" : 0.0,
-            "addSeparator" : false
+            "addSeparator" : false,
+            "defaultGroup" : true
           }, {
-            "caption" : "发货地址-城市",
-            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"8\"}]}]}}",
+            "caption" : "所有客户",
+            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
             "itemType" : "GROUP",
-            "name" : "group9",
+            "name" : "public3",
+            "userTag" : "PUBLIC",
             "width" : 0.0,
             "addSeparator" : false
           }, {
-            "caption" : "发货地址-省/市",
-            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"9\"}]}]}}",
+            "caption" : "本周新建",
             "itemType" : "GROUP",
-            "name" : "group10",
+            "name" : "public4",
+            "userTag" : "PUBLIC",
             "width" : 0.0,
             "addSeparator" : false
           }, {
-            "caption" : "发货地址-街道",
-            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"10\"}]}]}}",
+            "caption" : "金额",
             "itemType" : "GROUP",
-            "name" : "group11",
+            "name" : "group1",
+            "getPSAppDEField" : {
+              "name" : "AMOUNT",
+              "codeName" : "Amount"
+            },
             "width" : 0.0,
             "addSeparator" : false
           }, {
-            "caption" : "发货地址-邮编",
-            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"amount\",\"condop\":\"EQ\",\"value\":\"11\"}]}]}}",
+            "caption" : "更新时间",
             "itemType" : "GROUP",
-            "name" : "group12",
+            "name" : "group2",
+            "getPSAppDEField" : {
+              "name" : "UPDATEDATE",
+              "codeName" : "UpdateDate"
+            },
             "width" : 0.0,
             "addSeparator" : false
           }, {
-            "caption" : "上周新建",
-            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
+            "caption" : "数值",
             "itemType" : "GROUP",
-            "name" : "public1",
-            "userTag" : "PUBLIC",
+            "name" : "group3",
+            "getPSAppDEField" : {
+              "name" : "NUMBER2",
+              "codeName" : "Number2"
+            },
             "width" : 0.0,
             "addSeparator" : false
           }, {
-            "caption" : "我的客户",
-            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
-            "itemType" : "GROUP",
-            "name" : "public2",
-            "userTag" : "PUBLIC",
-            "width" : 0.0,
-            "addSeparator" : false,
-            "defaultGroup" : true
-          }, {
-            "caption" : "所有客户",
-            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
+            "caption" : "日期",
             "itemType" : "GROUP",
-            "name" : "public3",
-            "userTag" : "PUBLIC",
+            "name" : "group4",
+            "getPSAppDEField" : {
+              "name" : "DATE",
+              "codeName" : "Date"
+            },
             "width" : 0.0,
             "addSeparator" : false
           }, {
-            "caption" : "本周新建",
+            "caption" : "浮点",
             "itemType" : "GROUP",
-            "name" : "public4",
-            "userTag" : "PUBLIC",
+            "name" : "group5",
+            "getPSAppDEField" : {
+              "name" : "FLOAT",
+              "codeName" : "Float"
+            },
             "width" : 0.0,
             "addSeparator" : 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: