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/PSMODULES/common/PSDATAENTITIES/BXD.json

@@ -505,17 +505,6 @@
       "queryCodeExp" : "t1.`SN`",
       "standardColumnName" : "`SN`"
     } ],
-    "getAllPSDEFSearches" : [ {
-      "name" : "SN",
-      "getPSDESearch" : {
-        "modelref" : true,
-        "path" : "PSMODULES/common/PSDATAENTITIES/BXD/PSDESEARCHES/test__search1.json"
-      },
-      "getPSSysSearchField" : {
-        "modelref" : true,
-        "id" : "name"
-      }
-    } ],
     "getAllPSDEFUIModes" : [ {
       "codeName" : "Default",
       "name" : "[SN][编号]",
@@ -809,17 +798,6 @@
       "stdDataType" : 25,
       "valueOP" : "LIKE"
     } ],
-    "getAllPSDEFSearches" : [ {
-      "name" : "BXDNAME",
-      "getPSDESearch" : {
-        "modelref" : true,
-        "path" : "PSMODULES/common/PSDATAENTITIES/BXD/PSDESEARCHES/test__search1.json"
-      },
-      "getPSSysSearchField" : {
-        "modelref" : true,
-        "id" : "context"
-      }
-    } ],
     "getAllPSDEFUIModes" : [ {
       "codeName" : "MobileDefault",
       "name" : "[BXDNAME][报销单名称]移动端默认",
@@ -1449,9 +1427,9 @@
   "getAllPSDESearches" : [ {
     "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/BXD/PSDESEARCHES/test__search1.json",
     "name" : "BXD",
-    "getPSSysSearchDoc" : {
+    "getPSSysSearchDE" : {
       "modelref" : true,
-      "id" : "search1"
+      "id" : "Usr0315853911"
     },
     "getPSSysSearchScheme" : {
       "modelref" : true,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone.json

@@ -1303,17 +1303,6 @@
       "name" : "FIELD3",
       "standardColumnName" : "`FIELD3`"
     } ],
-    "getAllPSDEFSearches" : [ {
-      "name" : "FIELD3",
-      "getPSDESearch" : {
-        "modelref" : true,
-        "path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDESEARCHES/test__search1.json"
-      },
-      "getPSSysSearchField" : {
-        "modelref" : true,
-        "id" : "context"
-      }
-    } ],
     "getAllPSDEFUIModes" : [ {
       "codeName" : "MobileDefault",
       "name" : "[FIELD3][属性3]移动端默认",
@@ -1651,17 +1640,6 @@
       "stdDataType" : 25,
       "valueOP" : "LIKE"
     } ],
-    "getAllPSDEFSearches" : [ {
-      "name" : "PHONENAME",
-      "getPSDESearch" : {
-        "modelref" : true,
-        "path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDESEARCHES/test__search1.json"
-      },
-      "getPSSysSearchField" : {
-        "modelref" : true,
-        "id" : "name"
-      }
-    } ],
     "getAllPSDEFUIModes" : [ {
       "codeName" : "Default",
       "name" : "[PHONENAME][手机名称]",
@@ -4378,9 +4356,9 @@
   "getAllPSDESearches" : [ {
     "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDESEARCHES/test__search1.json",
     "name" : "PHONE",
-    "getPSSysSearchDoc" : {
+    "getPSSysSearchDE" : {
       "modelref" : true,
-      "id" : "search1"
+      "id" : "Usr0315403470"
     },
     "getPSSysSearchScheme" : {
       "modelref" : true,

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

@@ -59,6 +59,21 @@
     "pluginCode" : "DATA_PICKER_CUSTOM_SELECT",
     "pluginType" : "AC_ITEM",
     "refMode" : "DEACMODE"
+  }, {
+    "name" : "自定义用户信息",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "CUSTOM",
+      "pluginCode" : "AUTH_USERINFO",
+      "runtimeObject" : true
+    },
+    "pluginCode" : "AUTH_USERINFO",
+    "pluginType" : "CUSTOM",
+    "rTObjectName" : "IBizCustomUserInfo",
+    "rTObjectRepo" : "@ibiz-template-plm/custom-user-info@0.0.3-dev.3",
+    "refMode" : "CONTROLITEM",
+    "refTag" : "VIEWLAYOUTPANEL",
+    "refTag2" : "RAWITEM",
+    "runtimeObject" : true
   }, {
     "name" : "获取数据集插件",
     "getPSSysPFPlugin" : {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/TEST/PSWIZARDPANELS/default.json

@@ -1564,10 +1564,6 @@
       "formTag" : "first",
       "name" : "第一步",
       "getPSDEFormName" : "向导表单(流转)",
-      "getPSDEWizardStep" : {
-        "modelref" : true,
-        "id" : "第一步"
-      },
       "stepActions" : [ "NEXT" ],
       "firstForm" : true
     },
@@ -2093,10 +2089,6 @@
       "formTag" : "second",
       "name" : "第二步",
       "getPSDEFormName" : "向导表单(流转)",
-      "getPSDEWizardStep" : {
-        "modelref" : true,
-        "id" : "第二步"
-      },
       "stepActions" : [ "PREV", "NEXT" ],
       "firstForm" : false
     },
@@ -2622,10 +2614,6 @@
       "formTag" : "third",
       "name" : "第三步",
       "getPSDEFormName" : "向导表单(流转)",
-      "getPSDEWizardStep" : {
-        "modelref" : true,
-        "id" : "第三步"
-      },
       "stepActions" : [ "PREV", "NEXT", "FINISH" ],
       "firstForm" : false
     },
@@ -2685,10 +2673,6 @@
       "formTag" : "first",
       "name" : "第一步",
       "getPSDEFormName" : "向导表单(流转)",
-      "getPSDEWizardStep" : {
-        "modelref" : true,
-        "id" : "第一步"
-      },
       "stepActions" : [ "NEXT" ],
       "firstForm" : true
     }, {
@@ -2696,10 +2680,6 @@
       "formTag" : "second",
       "name" : "第二步",
       "getPSDEFormName" : "向导表单(流转)",
-      "getPSDEWizardStep" : {
-        "modelref" : true,
-        "id" : "第二步"
-      },
       "stepActions" : [ "PREV", "NEXT" ],
       "firstForm" : false
     }, {
@@ -2707,10 +2687,6 @@
       "formTag" : "third",
       "name" : "第三步",
       "getPSDEFormName" : "向导表单(流转)",
-      "getPSDEWizardStep" : {
-        "modelref" : true,
-        "id" : "第三步"
-      },
       "stepActions" : [ "PREV", "NEXT", "FINISH" ],
       "firstForm" : false
     } ],

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/ReginfoEditView.json

@@ -4,7 +4,6 @@
   "codeName" : "ReginfoEditView",
   "dynaModelFilePath" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/ReginfoEditView.json",
   "funcViewMode" : "EDITVIEW",
-  "markOpenDataMode" : "EDITDATA;DISPLAYOPPERSON;NOTICERELOAD",
   "memo" : "系统自动添加",
   "name" : "ReginfoEditView",
   "openMode" : "POPUPMODAL",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/TESTWizardView.json

@@ -1606,10 +1606,6 @@
         "formTag" : "first",
         "name" : "第一步",
         "getPSDEFormName" : "向导表单(流转)",
-        "getPSDEWizardStep" : {
-          "modelref" : true,
-          "id" : "第一步"
-        },
         "stepActions" : [ "NEXT" ],
         "firstForm" : true
       },
@@ -2135,10 +2131,6 @@
         "formTag" : "second",
         "name" : "第二步",
         "getPSDEFormName" : "向导表单(流转)",
-        "getPSDEWizardStep" : {
-          "modelref" : true,
-          "id" : "第二步"
-        },
         "stepActions" : [ "PREV", "NEXT" ],
         "firstForm" : false
       },
@@ -2664,10 +2656,6 @@
         "formTag" : "third",
         "name" : "第三步",
         "getPSDEFormName" : "向导表单(流转)",
-        "getPSDEWizardStep" : {
-          "modelref" : true,
-          "id" : "第三步"
-        },
         "stepActions" : [ "PREV", "NEXT", "FINISH" ],
         "firstForm" : false
       },
@@ -2727,10 +2715,6 @@
         "formTag" : "first",
         "name" : "第一步",
         "getPSDEFormName" : "向导表单(流转)",
-        "getPSDEWizardStep" : {
-          "modelref" : true,
-          "id" : "第一步"
-        },
         "stepActions" : [ "NEXT" ],
         "firstForm" : true
       }, {
@@ -2738,10 +2722,6 @@
         "formTag" : "second",
         "name" : "第二步",
         "getPSDEFormName" : "向导表单(流转)",
-        "getPSDEWizardStep" : {
-          "modelref" : true,
-          "id" : "第二步"
-        },
         "stepActions" : [ "PREV", "NEXT" ],
         "firstForm" : false
       }, {
@@ -2749,10 +2729,6 @@
         "formTag" : "third",
         "name" : "第三步",
         "getPSDEFormName" : "向导表单(流转)",
-        "getPSDEWizardStep" : {
-          "modelref" : true,
-          "id" : "第三步"
-        },
         "stepActions" : [ "PREV", "NEXT", "FINISH" ],
         "firstForm" : false
       } ],

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

@@ -1482,16 +1482,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     } ],
     "uniqueTag" : "VMGroup2"

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

@@ -1564,10 +1564,6 @@
       "formTag" : "first",
       "name" : "第一步",
       "getPSDEFormName" : "向导表单(流转)",
-      "getPSDEWizardStep" : {
-        "modelref" : true,
-        "id" : "第一步"
-      },
       "stepActions" : [ "NEXT" ],
       "firstForm" : true
     },
@@ -2093,10 +2089,6 @@
       "formTag" : "second",
       "name" : "第二步",
       "getPSDEFormName" : "向导表单(流转)",
-      "getPSDEWizardStep" : {
-        "modelref" : true,
-        "id" : "第二步"
-      },
       "stepActions" : [ "PREV", "NEXT" ],
       "firstForm" : false
     },
@@ -2622,10 +2614,6 @@
       "formTag" : "third",
       "name" : "第三步",
       "getPSDEFormName" : "向导表单(流转)",
-      "getPSDEWizardStep" : {
-        "modelref" : true,
-        "id" : "第三步"
-      },
       "stepActions" : [ "PREV", "NEXT", "FINISH" ],
       "firstForm" : false
     },
@@ -2685,10 +2673,6 @@
       "formTag" : "first",
       "name" : "第一步",
       "getPSDEFormName" : "向导表单(流转)",
-      "getPSDEWizardStep" : {
-        "modelref" : true,
-        "id" : "第一步"
-      },
       "stepActions" : [ "NEXT" ],
       "firstForm" : true
     }, {
@@ -2696,10 +2680,6 @@
       "formTag" : "second",
       "name" : "第二步",
       "getPSDEFormName" : "向导表单(流转)",
-      "getPSDEWizardStep" : {
-        "modelref" : true,
-        "id" : "第二步"
-      },
       "stepActions" : [ "PREV", "NEXT" ],
       "firstForm" : false
     }, {
@@ -2707,10 +2687,6 @@
       "formTag" : "third",
       "name" : "第三步",
       "getPSDEFormName" : "向导表单(流转)",
-      "getPSDEWizardStep" : {
-        "modelref" : true,
-        "id" : "第三步"
-      },
       "stepActions" : [ "PREV", "NEXT", "FINISH" ],
       "firstForm" : false
     } ],

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

@@ -4,7 +4,6 @@
   "codeName" : "ReginfoEditView",
   "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoEditView.json",
   "funcViewMode" : "EDITVIEW",
-  "markOpenDataMode" : "EDITDATA;DISPLAYOPPERSON;NOTICERELOAD",
   "name" : "ReginfoEditView",
   "openMode" : "POPUPMODAL",
   "getPSAppDataEntity" : {

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

@@ -1611,10 +1611,6 @@
         "formTag" : "first",
         "name" : "第一步",
         "getPSDEFormName" : "向导表单(流转)",
-        "getPSDEWizardStep" : {
-          "modelref" : true,
-          "id" : "第一步"
-        },
         "stepActions" : [ "NEXT" ],
         "firstForm" : true
       },
@@ -2140,10 +2136,6 @@
         "formTag" : "second",
         "name" : "第二步",
         "getPSDEFormName" : "向导表单(流转)",
-        "getPSDEWizardStep" : {
-          "modelref" : true,
-          "id" : "第二步"
-        },
         "stepActions" : [ "PREV", "NEXT" ],
         "firstForm" : false
       },
@@ -2669,10 +2661,6 @@
         "formTag" : "third",
         "name" : "第三步",
         "getPSDEFormName" : "向导表单(流转)",
-        "getPSDEWizardStep" : {
-          "modelref" : true,
-          "id" : "第三步"
-        },
         "stepActions" : [ "PREV", "NEXT", "FINISH" ],
         "firstForm" : false
       },
@@ -2732,10 +2720,6 @@
         "formTag" : "first",
         "name" : "第一步",
         "getPSDEFormName" : "向导表单(流转)",
-        "getPSDEWizardStep" : {
-          "modelref" : true,
-          "id" : "第一步"
-        },
         "stepActions" : [ "NEXT" ],
         "firstForm" : true
       }, {
@@ -2743,10 +2727,6 @@
         "formTag" : "second",
         "name" : "第二步",
         "getPSDEFormName" : "向导表单(流转)",
-        "getPSDEWizardStep" : {
-          "modelref" : true,
-          "id" : "第二步"
-        },
         "stepActions" : [ "PREV", "NEXT" ],
         "firstForm" : false
       }, {
@@ -2754,10 +2734,6 @@
         "formTag" : "third",
         "name" : "第三步",
         "getPSDEFormName" : "向导表单(流转)",
-        "getPSDEWizardStep" : {
-          "modelref" : true,
-          "id" : "第三步"
-        },
         "stepActions" : [ "PREV", "NEXT", "FINISH" ],
         "firstForm" : false
       } ],

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

@@ -1605,10 +1605,6 @@
         "formTag" : "first",
         "name" : "第一步",
         "getPSDEFormName" : "向导表单(流转)",
-        "getPSDEWizardStep" : {
-          "modelref" : true,
-          "id" : "第一步"
-        },
         "stepActions" : [ "NEXT" ],
         "firstForm" : true
       },
@@ -2134,10 +2130,6 @@
         "formTag" : "second",
         "name" : "第二步",
         "getPSDEFormName" : "向导表单(流转)",
-        "getPSDEWizardStep" : {
-          "modelref" : true,
-          "id" : "第二步"
-        },
         "stepActions" : [ "PREV", "NEXT" ],
         "firstForm" : false
       },
@@ -2663,10 +2655,6 @@
         "formTag" : "third",
         "name" : "第三步",
         "getPSDEFormName" : "向导表单(流转)",
-        "getPSDEWizardStep" : {
-          "modelref" : true,
-          "id" : "第三步"
-        },
         "stepActions" : [ "PREV", "NEXT", "FINISH" ],
         "firstForm" : false
       },
@@ -2726,10 +2714,6 @@
         "formTag" : "first",
         "name" : "第一步",
         "getPSDEFormName" : "向导表单(流转)",
-        "getPSDEWizardStep" : {
-          "modelref" : true,
-          "id" : "第一步"
-        },
         "stepActions" : [ "NEXT" ],
         "firstForm" : true
       }, {
@@ -2737,10 +2721,6 @@
         "formTag" : "second",
         "name" : "第二步",
         "getPSDEFormName" : "向导表单(流转)",
-        "getPSDEWizardStep" : {
-          "modelref" : true,
-          "id" : "第二步"
-        },
         "stepActions" : [ "PREV", "NEXT" ],
         "firstForm" : false
       }, {
@@ -2748,10 +2728,6 @@
         "formTag" : "third",
         "name" : "第三步",
         "getPSDEFormName" : "向导表单(流转)",
-        "getPSDEWizardStep" : {
-          "modelref" : true,
-          "id" : "第三步"
-        },
         "stepActions" : [ "PREV", "NEXT", "FINISH" ],
         "firstForm" : false
       } ],

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

@@ -7,7 +7,6 @@
   "codeName" : "bxdexEditView",
   "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bxdexEditView.json",
   "funcViewMode" : "EDITVIEW",
-  "markOpenDataMode" : "OPENDATA;EDITDATA;DISPLAYOPPERSON",
   "memo" : "系统自动添加",
   "name" : "bxdexEditView",
   "getPSAppDataEntity" : {

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

@@ -13373,16 +13373,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     } ],
     "uniqueTag" : "VMGroup2"
@@ -13414,16 +13414,16 @@
     "codeName" : "VMGroup3",
     "name" : "视图消息类型测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
       }
     }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
       }
     }, {
       "name" : "消息类型-常规信息",
@@ -13448,16 +13448,16 @@
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg10"
       }
     }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图上方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg7"
       }
     }, {
       "name" : "消息位置-视图内容区",
@@ -13466,10 +13466,10 @@
         "id" : "ViewMsg9"
       }
     }, {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg8"
       }
     } ],
     "uniqueTag" : "VMGroup4"
@@ -13482,6 +13482,12 @@
         "modelref" : true,
         "id" : "ViewMsg13"
       }
+    }, {
+      "name" : "消息位置-视图下方",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg8"
+      }
     }, {
       "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
@@ -13489,6 +13495,13 @@
         "id" : "ViewMsg6"
       },
       "position" : "POPUP"
+    }, {
+      "name" : "消息类型-警告信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg5"
+      },
+      "position" : "POPUP"
     }, {
       "name" : "关闭模式-无删除-上方-常规",
       "getPSAppViewMsg" : {
@@ -13503,10 +13516,10 @@
       },
       "position" : "POPUP"
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg9"
       }
     }, {
       "name" : "关闭模式-默认删除-上方-错误",
@@ -13514,31 +13527,12 @@
         "modelref" : true,
         "id" : "ViewMsg12"
       }
-    }, {
-      "name" : "消息类型-警告信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
-    }, {
-      "name" : "消息位置-视图内容区",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg9"
-      }
     } ],
     "uniqueTag" : "VMGroup8"
   }, {
     "codeName" : "VMGroup5",
     "name" : "视图消息关闭模式",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-无删除",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg11"
-      }
-    }, {
       "name" : "关闭模式-默认删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
@@ -13550,6 +13544,12 @@
         "modelref" : true,
         "id" : "ViewMsg13"
       }
+    }, {
+      "name" : "关闭模式-无删除",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg11"
+      }
     } ],
     "uniqueTag" : "VMGroup5"
   }, {

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

 {
+  "getAllPSSysSearchDEs" : [ {
+    "getAllPSSysSearchDEFields" : [ {
+      "codeName" : "Usr0315289888",
+      "name" : "BXDNAME",
+      "getPSDEField" : {
+        "name" : "BXDNAME",
+        "codeName" : "BXDName"
+      },
+      "getPSSysSearchField" : {
+        "modelref" : true,
+        "id" : "context"
+      }
+    }, {
+      "codeName" : "Usr0315320167",
+      "name" : "SN",
+      "getPSDEField" : {
+        "name" : "SN",
+        "codeName" : "SN"
+      },
+      "getPSSysSearchField" : {
+        "modelref" : true,
+        "id" : "name"
+      }
+    } ],
+    "codeName" : "Usr0315853911",
+    "name" : "BXD",
+    "getPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/BXD.json"
+    },
+    "getPSSysSearchDoc" : {
+      "modelref" : true,
+      "id" : "search1"
+    }
+  }, {
+    "getAllPSSysSearchDEFields" : [ {
+      "codeName" : "Usr0315970578",
+      "name" : "FIELD3",
+      "getPSDEField" : {
+        "name" : "FIELD3",
+        "codeName" : "FIELD3"
+      },
+      "getPSSysSearchField" : {
+        "modelref" : true,
+        "id" : "context"
+      }
+    }, {
+      "codeName" : "Usr0315516287",
+      "name" : "PHONENAME",
+      "getPSDEField" : {
+        "name" : "PHONENAME",
+        "codeName" : "PhoneName"
+      },
+      "getPSSysSearchField" : {
+        "modelref" : true,
+        "id" : "name"
+      }
+    } ],
+    "codeName" : "Usr0315403470",
+    "name" : "PHONE",
+    "getPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+    },
+    "getPSSysSearchDoc" : {
+      "modelref" : true,
+      "id" : "search1"
+    }
+  } ],
   "getAllPSSysSearchDocs" : [ {
     "getAllPSSysSearchFields" : [ {
       "codeName" : "context",

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: