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/TemplatePublish/PSSYSAPP.json

@@ -1309,16 +1309,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"
       }
     } ]
   }, {

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

@@ -302,7 +302,8 @@
     "logicName" : "类型",
     "name" : "TYPE",
     "stdDataType" : 25,
-    "stringLength" : 100
+    "stringLength" : 100,
+    "enableFrontOnly" : true
   }, {
     "getAllPSAppDEFUIModes" : [ {
       "codeName" : "MobileDefault",
@@ -357,6 +358,7 @@
     "name" : "BOOKCHILD2ID",
     "stdDataType" : 25,
     "stringLength" : 100,
+    "enableFrontOnly" : true,
     "keyField" : true
   }, {
     "getAllPSAppDEFUIModes" : [ {
@@ -410,6 +412,7 @@
     "name" : "BOOKCHILD2NAME",
     "stdDataType" : 25,
     "stringLength" : 200,
+    "enableFrontOnly" : true,
     "enableQuickSearch" : true,
     "majorField" : true
   }, {
@@ -465,7 +468,8 @@
     "logicName" : "建立人",
     "name" : "CREATEMAN",
     "stdDataType" : 25,
-    "stringLength" : 60
+    "stringLength" : 60,
+    "enableFrontOnly" : true
   }, {
     "getAllPSAppDEFUIModes" : [ {
       "codeName" : "MobileDefault",
@@ -519,7 +523,8 @@
     "logicName" : "更新人",
     "name" : "UPDATEMAN",
     "stdDataType" : 25,
-    "stringLength" : 60
+    "stringLength" : 60,
+    "enableFrontOnly" : true
   }, {
     "getAllPSAppDEFUIModes" : [ {
       "codeName" : "Default",
@@ -573,7 +578,8 @@
     "logicName" : "建立时间",
     "name" : "CREATEDATE",
     "stdDataType" : 5,
-    "valueFormat" : "YYYY-MM-DD HH:mm:ss"
+    "valueFormat" : "YYYY-MM-DD HH:mm:ss",
+    "enableFrontOnly" : true
   }, {
     "getAllPSAppDEFUIModes" : [ {
       "codeName" : "MobileDefault",
@@ -627,7 +633,8 @@
     "logicName" : "更新时间",
     "name" : "UPDATEDATE",
     "stdDataType" : 5,
-    "valueFormat" : "YYYY-MM-DD HH:mm:ss"
+    "valueFormat" : "YYYY-MM-DD HH:mm:ss",
+    "enableFrontOnly" : true
   }, {
     "getAllPSAppDEFUIModes" : [ {
       "codeName" : "MobileDefault",
@@ -666,7 +673,8 @@
     "logicName" : "书标识",
     "name" : "BOOKID",
     "stdDataType" : 25,
-    "stringLength" : 100
+    "stringLength" : 100,
+    "enableFrontOnly" : true
   } ],
   "getAllPSAppDEMethodDTOs" : [ {
     "codeName" : "BOOKCHILD2DTO",
@@ -1099,8 +1107,6 @@
     "name" : "UPDATE"
   } ],
   "codeName" : "BOOKCHILD2",
-  "dEAPICodeName" : "BOOKCHILD2",
-  "dEAPITag" : "BOOKCHILD2",
   "dataAccCtrlArch" : 1,
   "dataAccCtrlMode" : 1,
   "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BOOKCHILD2.json",
@@ -1123,29 +1129,20 @@
   },
   "name" : "BOOKCHILD2",
   "getPSDEName" : "BOOKCHILD2",
-  "getPSDEServiceAPI" : {
-    "modelref" : true,
-    "id" : "BOOKCHILD2"
-  },
   "getPSDataEntity" : {
     "modelref" : true,
     "path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD2.json"
   },
-  "getPSSysServiceAPI" : {
-    "modelref" : true,
-    "path" : "PSSYSSERVICEAPIS/TrainSys.json"
-  },
   "getQuickSearchPSAppDEFields" : [ {
     "name" : "BOOKCHILD2NAME",
     "codeName" : "BOOKCHILD2Name"
   } ],
-  "storageMode" : 0,
-  "sysAPITag" : "TrainSys",
+  "storageMode" : 4,
   "defaultMode" : true,
   "enableFilterActions" : true,
   "enableUICreate" : true,
   "enableUIModify" : true,
   "enableUIRemove" : true,
   "enableWFActions" : false,
-  "major" : false
+  "major" : true
 }
\ No newline at end of file

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

@@ -32,11 +32,13 @@
   } ],
   "getAllPSAppDEActions" : [ {
     "actionMode" : "CHECKKEY",
+    "actionType" : "BUILTIN",
     "codeName" : "CheckKey",
     "methodType" : "DEACTION",
     "name" : "CheckKey",
     "getPSAppDEMethodInput" : {
-      "name" : "输入对象",
+      "codeName" : "CheckKeyInput",
+      "name" : "CheckKeyInput",
       "getPSAppDEMethodDTO" : {
         "modelref" : true,
         "id" : "BOOKCHILD5DTO"
@@ -44,7 +46,8 @@
       "type" : "DTO"
     },
     "getPSAppDEMethodReturn" : {
-      "name" : "返回对象",
+      "codeName" : "CheckKeyResult",
+      "name" : "CheckKeyResult",
       "stdDataType" : 9,
       "type" : "SIMPLE"
     },
@@ -56,21 +59,16 @@
       "modelref" : true,
       "id" : "CREATE"
     },
-    "getPSDEServiceAPIMethod" : {
-      "modelref" : true,
-      "id" : "CheckKey"
-    },
-    "requestMethod" : "POST",
-    "requestParamType" : "ENTITY",
-    "requestPath" : "/checkkey",
-    "builtinMethod" : false
+    "builtinMethod" : true
   }, {
     "actionMode" : "CREATE",
+    "actionType" : "BUILTIN",
     "codeName" : "Create",
     "methodType" : "DEACTION",
     "name" : "Create",
     "getPSAppDEMethodInput" : {
-      "name" : "输入对象",
+      "codeName" : "CreateInput",
+      "name" : "CreateInput",
       "getPSAppDEMethodDTO" : {
         "modelref" : true,
         "id" : "BOOKCHILD5DTO"
@@ -79,12 +77,9 @@
       "output" : true
     },
     "getPSAppDEMethodReturn" : {
-      "name" : "返回对象",
-      "getPSAppDEMethodDTO" : {
-        "modelref" : true,
-        "id" : "BOOKCHILD5DTO"
-      },
-      "type" : "DTO"
+      "codeName" : "CreateResult",
+      "name" : "CreateResult",
+      "type" : "VOID"
     },
     "getPSDEAction" : {
       "modelref" : true,
@@ -94,29 +89,25 @@
       "modelref" : true,
       "id" : "CREATE"
     },
-    "getPSDEServiceAPIMethod" : {
-      "modelref" : true,
-      "id" : "Create"
-    },
-    "requestMethod" : "POST",
-    "requestParamType" : "ENTITY",
-    "builtinMethod" : false,
-    "noServiceCodeName" : true
+    "builtinMethod" : true
   }, {
     "actionMode" : "READ",
+    "actionType" : "BUILTIN",
     "codeName" : "Get",
     "methodType" : "DEACTION",
     "name" : "Get",
     "getPSAppDEMethodInput" : {
+      "codeName" : "GetInput",
       "getKeyPSAppDEField" : {
         "name" : "BOOKCHILD5ID",
         "codeName" : "BOOKCHILD5Id"
       },
-      "name" : "输入对象",
+      "name" : "GetInput",
       "type" : "KEYFIELD"
     },
     "getPSAppDEMethodReturn" : {
-      "name" : "返回对象",
+      "codeName" : "GetResult",
+      "name" : "GetResult",
       "getPSAppDEMethodDTO" : {
         "modelref" : true,
         "id" : "BOOKCHILD5DTO"
@@ -131,23 +122,16 @@
       "modelref" : true,
       "id" : "READ"
     },
-    "getPSDEServiceAPIMethod" : {
-      "modelref" : true,
-      "id" : "Get"
-    },
-    "requestField" : "BOOKCHILD5ID",
-    "requestMethod" : "GET",
-    "requestParamType" : "FIELD",
-    "builtinMethod" : false,
-    "needResourceKey" : true,
-    "noServiceCodeName" : true
+    "builtinMethod" : true
   }, {
     "actionMode" : "GETDRAFT",
+    "actionType" : "BUILTIN",
     "codeName" : "GetDraft",
     "methodType" : "DEACTION",
     "name" : "GetDraft",
     "getPSAppDEMethodInput" : {
-      "name" : "输入对象",
+      "codeName" : "GetDraftInput",
+      "name" : "GetDraftInput",
       "getPSAppDEMethodDTO" : {
         "modelref" : true,
         "id" : "BOOKCHILD5DTO"
@@ -155,7 +139,8 @@
       "type" : "DTO"
     },
     "getPSAppDEMethodReturn" : {
-      "name" : "返回对象",
+      "codeName" : "GetDraftResult",
+      "name" : "GetDraftResult",
       "getPSAppDEMethodDTO" : {
         "modelref" : true,
         "id" : "BOOKCHILD5DTO"
@@ -170,30 +155,26 @@
       "modelref" : true,
       "id" : "CREATE"
     },
-    "getPSDEServiceAPIMethod" : {
-      "modelref" : true,
-      "id" : "GetDraft"
-    },
-    "requestMethod" : "GET",
-    "requestParamType" : "NONE",
-    "requestPath" : "/getdraft",
-    "builtinMethod" : false
+    "builtinMethod" : true
   }, {
     "actionMode" : "DELETE",
+    "actionType" : "BUILTIN",
     "batchActionMode" : 1,
     "codeName" : "Remove",
     "methodType" : "DEACTION",
     "name" : "Remove",
     "getPSAppDEMethodInput" : {
+      "codeName" : "RemoveInput",
       "getKeyPSAppDEField" : {
         "name" : "BOOKCHILD5ID",
         "codeName" : "BOOKCHILD5Id"
       },
-      "name" : "输入对象",
+      "name" : "RemoveInput",
       "type" : "KEYFIELDS"
     },
     "getPSAppDEMethodReturn" : {
-      "name" : "返回对象",
+      "codeName" : "RemoveResult",
+      "name" : "RemoveResult",
       "type" : "VOID"
     },
     "getPSDEAction" : {
@@ -204,24 +185,17 @@
       "modelref" : true,
       "id" : "DELETE"
     },
-    "getPSDEServiceAPIMethod" : {
-      "modelref" : true,
-      "id" : "Remove"
-    },
-    "requestField" : "BOOKCHILD5ID",
-    "requestMethod" : "DELETE",
-    "requestParamType" : "FIELD",
-    "builtinMethod" : false,
-    "enableBatchAction" : true,
-    "needResourceKey" : true,
-    "noServiceCodeName" : true
+    "builtinMethod" : true,
+    "enableBatchAction" : true
   }, {
     "actionMode" : "UNKNOWN",
+    "actionType" : "BUILTIN",
     "codeName" : "Save",
     "methodType" : "DEACTION",
     "name" : "Save",
     "getPSAppDEMethodInput" : {
-      "name" : "输入对象",
+      "codeName" : "SaveInput",
+      "name" : "SaveInput",
       "getPSAppDEMethodDTO" : {
         "modelref" : true,
         "id" : "BOOKCHILD5DTO"
@@ -229,29 +203,24 @@
       "type" : "DTO"
     },
     "getPSAppDEMethodReturn" : {
-      "name" : "返回对象",
+      "codeName" : "SaveResult",
+      "name" : "SaveResult",
       "type" : "VOID"
     },
     "getPSDEAction" : {
       "modelref" : true,
       "path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5/PSDEACTIONS/Save.json"
     },
-    "getPSDEServiceAPIMethod" : {
-      "modelref" : true,
-      "id" : "Save"
-    },
-    "requestMethod" : "POST",
-    "requestParamType" : "ENTITY",
-    "requestPath" : "/save",
-    "builtinMethod" : false,
-    "needResourceKey" : true
+    "builtinMethod" : true
   }, {
     "actionMode" : "UPDATE",
+    "actionType" : "BUILTIN",
     "codeName" : "Update",
     "methodType" : "DEACTION",
     "name" : "Update",
     "getPSAppDEMethodInput" : {
-      "name" : "输入对象",
+      "codeName" : "UpdateInput",
+      "name" : "UpdateInput",
       "getPSAppDEMethodDTO" : {
         "modelref" : true,
         "id" : "BOOKCHILD5DTO"
@@ -260,12 +229,9 @@
       "output" : true
     },
     "getPSAppDEMethodReturn" : {
-      "name" : "返回对象",
-      "getPSAppDEMethodDTO" : {
-        "modelref" : true,
-        "id" : "BOOKCHILD5DTO"
-      },
-      "type" : "DTO"
+      "codeName" : "UpdateResult",
+      "name" : "UpdateResult",
+      "type" : "VOID"
     },
     "getPSDEAction" : {
       "modelref" : true,
@@ -275,22 +241,16 @@
       "modelref" : true,
       "id" : "UPDATE"
     },
-    "getPSDEServiceAPIMethod" : {
-      "modelref" : true,
-      "id" : "Update"
-    },
-    "requestMethod" : "PUT",
-    "requestParamType" : "ENTITY",
-    "builtinMethod" : false,
-    "needResourceKey" : true,
-    "noServiceCodeName" : true
+    "builtinMethod" : true
   } ],
   "getAllPSAppDEDataSets" : [ {
     "codeName" : "FetchDefault",
+    "dataSetType" : "DATAQUERY",
     "methodType" : "FETCH",
-    "name" : "FetchDefault",
+    "name" : "DEFAULT",
     "getPSAppDEMethodInput" : {
-      "name" : "输入对象",
+      "codeName" : "DefaultInput",
+      "name" : "DefaultInput",
       "getPSAppDEMethodDTO" : {
         "modelref" : true,
         "id" : "BOOKCHILD5FilterDTO"
@@ -298,7 +258,8 @@
       "type" : "DTO"
     },
     "getPSAppDEMethodReturn" : {
-      "name" : "返回对象",
+      "codeName" : "DefaultResult",
+      "name" : "DefaultResult",
       "getPSAppDEMethodDTO" : {
         "modelref" : true,
         "id" : "BOOKCHILD5DTO"
@@ -309,17 +270,6 @@
       "modelref" : true,
       "id" : "Default"
     },
-    "getPSDEOPPriv" : {
-      "modelref" : true,
-      "id" : "READ"
-    },
-    "getPSDEServiceAPIMethod" : {
-      "modelref" : true,
-      "id" : "FetchDefault"
-    },
-    "requestMethod" : "POST",
-    "requestParamType" : "ENTITY",
-    "requestPath" : "/fetchdefault",
     "builtinMethod" : false
   } ],
   "getAllPSAppDEFields" : [ {
@@ -861,11 +811,13 @@
   } ],
   "getAllPSAppDEMethods" : [ {
     "actionMode" : "CHECKKEY",
+    "actionType" : "BUILTIN",
     "codeName" : "CheckKey",
     "methodType" : "DEACTION",
     "name" : "CheckKey",
     "getPSAppDEMethodInput" : {
-      "name" : "输入对象",
+      "codeName" : "CheckKeyInput",
+      "name" : "CheckKeyInput",
       "getPSAppDEMethodDTO" : {
         "modelref" : true,
         "id" : "BOOKCHILD5DTO"
@@ -873,7 +825,8 @@
       "type" : "DTO"
     },
     "getPSAppDEMethodReturn" : {
-      "name" : "返回对象",
+      "codeName" : "CheckKeyResult",
+      "name" : "CheckKeyResult",
       "stdDataType" : 9,
       "type" : "SIMPLE"
     },
@@ -885,21 +838,16 @@
       "modelref" : true,
       "id" : "CREATE"
     },
-    "getPSDEServiceAPIMethod" : {
-      "modelref" : true,
-      "id" : "CheckKey"
-    },
-    "requestMethod" : "POST",
-    "requestParamType" : "ENTITY",
-    "requestPath" : "/checkkey",
-    "builtinMethod" : false
+    "builtinMethod" : true
   }, {
     "actionMode" : "CREATE",
+    "actionType" : "BUILTIN",
     "codeName" : "Create",
     "methodType" : "DEACTION",
     "name" : "Create",
     "getPSAppDEMethodInput" : {
-      "name" : "输入对象",
+      "codeName" : "CreateInput",
+      "name" : "CreateInput",
       "getPSAppDEMethodDTO" : {
         "modelref" : true,
         "id" : "BOOKCHILD5DTO"
@@ -908,12 +856,9 @@
       "output" : true
     },
     "getPSAppDEMethodReturn" : {
-      "name" : "返回对象",
-      "getPSAppDEMethodDTO" : {
-        "modelref" : true,
-        "id" : "BOOKCHILD5DTO"
-      },
-      "type" : "DTO"
+      "codeName" : "CreateResult",
+      "name" : "CreateResult",
+      "type" : "VOID"
     },
     "getPSDEAction" : {
       "modelref" : true,
@@ -923,29 +868,25 @@
       "modelref" : true,
       "id" : "CREATE"
     },
-    "getPSDEServiceAPIMethod" : {
-      "modelref" : true,
-      "id" : "Create"
-    },
-    "requestMethod" : "POST",
-    "requestParamType" : "ENTITY",
-    "builtinMethod" : false,
-    "noServiceCodeName" : true
+    "builtinMethod" : true
   }, {
     "actionMode" : "READ",
+    "actionType" : "BUILTIN",
     "codeName" : "Get",
     "methodType" : "DEACTION",
     "name" : "Get",
     "getPSAppDEMethodInput" : {
+      "codeName" : "GetInput",
       "getKeyPSAppDEField" : {
         "name" : "BOOKCHILD5ID",
         "codeName" : "BOOKCHILD5Id"
       },
-      "name" : "输入对象",
+      "name" : "GetInput",
       "type" : "KEYFIELD"
     },
     "getPSAppDEMethodReturn" : {
-      "name" : "返回对象",
+      "codeName" : "GetResult",
+      "name" : "GetResult",
       "getPSAppDEMethodDTO" : {
         "modelref" : true,
         "id" : "BOOKCHILD5DTO"
@@ -960,23 +901,16 @@
       "modelref" : true,
       "id" : "READ"
     },
-    "getPSDEServiceAPIMethod" : {
-      "modelref" : true,
-      "id" : "Get"
-    },
-    "requestField" : "BOOKCHILD5ID",
-    "requestMethod" : "GET",
-    "requestParamType" : "FIELD",
-    "builtinMethod" : false,
-    "needResourceKey" : true,
-    "noServiceCodeName" : true
+    "builtinMethod" : true
   }, {
     "actionMode" : "GETDRAFT",
+    "actionType" : "BUILTIN",
     "codeName" : "GetDraft",
     "methodType" : "DEACTION",
     "name" : "GetDraft",
     "getPSAppDEMethodInput" : {
-      "name" : "输入对象",
+      "codeName" : "GetDraftInput",
+      "name" : "GetDraftInput",
       "getPSAppDEMethodDTO" : {
         "modelref" : true,
         "id" : "BOOKCHILD5DTO"
@@ -984,7 +918,8 @@
       "type" : "DTO"
     },
     "getPSAppDEMethodReturn" : {
-      "name" : "返回对象",
+      "codeName" : "GetDraftResult",
+      "name" : "GetDraftResult",
       "getPSAppDEMethodDTO" : {
         "modelref" : true,
         "id" : "BOOKCHILD5DTO"
@@ -999,30 +934,26 @@
       "modelref" : true,
       "id" : "CREATE"
     },
-    "getPSDEServiceAPIMethod" : {
-      "modelref" : true,
-      "id" : "GetDraft"
-    },
-    "requestMethod" : "GET",
-    "requestParamType" : "NONE",
-    "requestPath" : "/getdraft",
-    "builtinMethod" : false
+    "builtinMethod" : true
   }, {
     "actionMode" : "DELETE",
+    "actionType" : "BUILTIN",
     "batchActionMode" : 1,
     "codeName" : "Remove",
     "methodType" : "DEACTION",
     "name" : "Remove",
     "getPSAppDEMethodInput" : {
+      "codeName" : "RemoveInput",
       "getKeyPSAppDEField" : {
         "name" : "BOOKCHILD5ID",
         "codeName" : "BOOKCHILD5Id"
       },
-      "name" : "输入对象",
+      "name" : "RemoveInput",
       "type" : "KEYFIELDS"
     },
     "getPSAppDEMethodReturn" : {
-      "name" : "返回对象",
+      "codeName" : "RemoveResult",
+      "name" : "RemoveResult",
       "type" : "VOID"
     },
     "getPSDEAction" : {
@@ -1033,24 +964,17 @@
       "modelref" : true,
       "id" : "DELETE"
     },
-    "getPSDEServiceAPIMethod" : {
-      "modelref" : true,
-      "id" : "Remove"
-    },
-    "requestField" : "BOOKCHILD5ID",
-    "requestMethod" : "DELETE",
-    "requestParamType" : "FIELD",
-    "builtinMethod" : false,
-    "enableBatchAction" : true,
-    "needResourceKey" : true,
-    "noServiceCodeName" : true
+    "builtinMethod" : true,
+    "enableBatchAction" : true
   }, {
     "actionMode" : "UNKNOWN",
+    "actionType" : "BUILTIN",
     "codeName" : "Save",
     "methodType" : "DEACTION",
     "name" : "Save",
     "getPSAppDEMethodInput" : {
-      "name" : "输入对象",
+      "codeName" : "SaveInput",
+      "name" : "SaveInput",
       "getPSAppDEMethodDTO" : {
         "modelref" : true,
         "id" : "BOOKCHILD5DTO"
@@ -1058,29 +982,24 @@
       "type" : "DTO"
     },
     "getPSAppDEMethodReturn" : {
-      "name" : "返回对象",
+      "codeName" : "SaveResult",
+      "name" : "SaveResult",
       "type" : "VOID"
     },
     "getPSDEAction" : {
       "modelref" : true,
       "path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5/PSDEACTIONS/Save.json"
     },
-    "getPSDEServiceAPIMethod" : {
-      "modelref" : true,
-      "id" : "Save"
-    },
-    "requestMethod" : "POST",
-    "requestParamType" : "ENTITY",
-    "requestPath" : "/save",
-    "builtinMethod" : false,
-    "needResourceKey" : true
+    "builtinMethod" : true
   }, {
     "actionMode" : "UPDATE",
+    "actionType" : "BUILTIN",
     "codeName" : "Update",
     "methodType" : "DEACTION",
     "name" : "Update",
     "getPSAppDEMethodInput" : {
-      "name" : "输入对象",
+      "codeName" : "UpdateInput",
+      "name" : "UpdateInput",
       "getPSAppDEMethodDTO" : {
         "modelref" : true,
         "id" : "BOOKCHILD5DTO"
@@ -1089,12 +1008,9 @@
       "output" : true
     },
     "getPSAppDEMethodReturn" : {
-      "name" : "返回对象",
-      "getPSAppDEMethodDTO" : {
-        "modelref" : true,
-        "id" : "BOOKCHILD5DTO"
-      },
-      "type" : "DTO"
+      "codeName" : "UpdateResult",
+      "name" : "UpdateResult",
+      "type" : "VOID"
     },
     "getPSDEAction" : {
       "modelref" : true,
@@ -1104,21 +1020,15 @@
       "modelref" : true,
       "id" : "UPDATE"
     },
-    "getPSDEServiceAPIMethod" : {
-      "modelref" : true,
-      "id" : "Update"
-    },
-    "requestMethod" : "PUT",
-    "requestParamType" : "ENTITY",
-    "builtinMethod" : false,
-    "needResourceKey" : true,
-    "noServiceCodeName" : true
+    "builtinMethod" : true
   }, {
     "codeName" : "FetchDefault",
+    "dataSetType" : "DATAQUERY",
     "methodType" : "FETCH",
-    "name" : "FetchDefault",
+    "name" : "DEFAULT",
     "getPSAppDEMethodInput" : {
-      "name" : "输入对象",
+      "codeName" : "DefaultInput",
+      "name" : "DefaultInput",
       "getPSAppDEMethodDTO" : {
         "modelref" : true,
         "id" : "BOOKCHILD5FilterDTO"
@@ -1126,7 +1036,8 @@
       "type" : "DTO"
     },
     "getPSAppDEMethodReturn" : {
-      "name" : "返回对象",
+      "codeName" : "DefaultResult",
+      "name" : "DefaultResult",
       "getPSAppDEMethodDTO" : {
         "modelref" : true,
         "id" : "BOOKCHILD5DTO"
@@ -1137,17 +1048,6 @@
       "modelref" : true,
       "id" : "Default"
     },
-    "getPSDEOPPriv" : {
-      "modelref" : true,
-      "id" : "READ"
-    },
-    "getPSDEServiceAPIMethod" : {
-      "modelref" : true,
-      "id" : "FetchDefault"
-    },
-    "requestMethod" : "POST",
-    "requestParamType" : "ENTITY",
-    "requestPath" : "/fetchdefault",
     "builtinMethod" : false
   }, {
     "codeName" : "FilterCreate",
@@ -1184,30 +1084,6 @@
     "methodType" : "FILTERACTION",
     "name" : "FILTERUPDATE",
     "builtinMethod" : true
-  }, {
-    "codeName" : "Select",
-    "methodType" : "SELECT",
-    "name" : "Select",
-    "getPSAppDEMethodInput" : {
-      "name" : "输入对象",
-      "type" : "UNKNOWN"
-    },
-    "getPSAppDEMethodReturn" : {
-      "name" : "返回对象",
-      "type" : "UNKNOWN"
-    },
-    "getPSDEOPPriv" : {
-      "modelref" : true,
-      "id" : "READ"
-    },
-    "getPSDEServiceAPIMethod" : {
-      "modelref" : true,
-      "id" : "Select"
-    },
-    "requestMethod" : "POST",
-    "requestParamType" : "ENTITY",
-    "requestPath" : "/select",
-    "builtinMethod" : false
   } ],
   "getAllPSDEOPPrivs" : [ {
     "logicName" : "建立",
@@ -1271,5 +1147,5 @@
   "enableUIModify" : true,
   "enableUIRemove" : true,
   "enableWFActions" : false,
-  "major" : true
+  "major" : false
 }
\ No newline at end of file

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

@@ -3211,16 +3211,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"
       }
     } ]
   } ],

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

@@ -9343,7 +9343,7 @@
     "enableDataImport" : true,
     "major" : true
   }, {
-    "aPIMode" : 1,
+    "aPIMode" : 9,
     "codeName" : "BOOKCHILD5",
     "getLNPSLanguageRes" : {
       "defaultContent" : "图书子5",
@@ -9499,253 +9499,14 @@
       "keyField" : false,
       "majorField" : false
     } ],
-    "getPSDEServiceAPIMethods" : [ {
-      "dataAccessAction" : "CREATE",
-      "methodType" : "DEACTION",
-      "name" : "Create",
-      "getPSDEAction" : {
-        "modelref" : true,
-        "path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5/PSDEACTIONS/Create.json"
-      },
-      "getPSDEServiceAPIMethodInput" : {
-        "name" : "输入对象",
-        "getPSDEMethodDTO" : {
-          "modelref" : true,
-          "id" : "BOOKCHILD5DTO"
-        },
-        "type" : "DTO"
-      },
-      "getPSDEServiceAPIMethodReturn" : {
-        "name" : "返回对象",
-        "getPSDEMethodDTO" : {
-          "modelref" : true,
-          "id" : "BOOKCHILD5DTO"
-        },
-        "type" : "DTO"
-      },
-      "requestMethod" : "POST",
-      "requestParamType" : "ENTITY",
-      "uniqueTag" : "BOOKCHILD5__DEACTION__CREATE",
-      "noServiceCodeName" : true
-    }, {
-      "dataAccessAction" : "READ",
-      "methodType" : "DEACTION",
-      "name" : "Get",
-      "getPSDEAction" : {
-        "modelref" : true,
-        "path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5/PSDEACTIONS/Get.json"
-      },
-      "getPSDEServiceAPIMethodInput" : {
-        "getKeyPSDEServiceAPIField" : {
-          "modelref" : true,
-          "id" : "BOOKCHILD5Id"
-        },
-        "name" : "输入对象",
-        "type" : "KEYFIELD"
-      },
-      "getPSDEServiceAPIMethodReturn" : {
-        "name" : "返回对象",
-        "getPSDEMethodDTO" : {
-          "modelref" : true,
-          "id" : "BOOKCHILD5DTO"
-        },
-        "type" : "DTO"
-      },
-      "requestField" : "BOOKCHILD5ID",
-      "requestMethod" : "GET",
-      "requestParamType" : "FIELD",
-      "uniqueTag" : "BOOKCHILD5__DEACTION__GET",
-      "needResourceKey" : true,
-      "noServiceCodeName" : true
-    }, {
-      "dataAccessAction" : "DELETE",
-      "methodType" : "DEACTION",
-      "name" : "Remove",
-      "getPSDEAction" : {
-        "modelref" : true,
-        "path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5/PSDEACTIONS/Remove.json"
-      },
-      "getPSDEServiceAPIMethodInput" : {
-        "getKeyPSDEServiceAPIField" : {
-          "modelref" : true,
-          "id" : "BOOKCHILD5Id"
-        },
-        "name" : "输入对象",
-        "type" : "KEYFIELDS"
-      },
-      "getPSDEServiceAPIMethodReturn" : {
-        "name" : "返回对象",
-        "type" : "VOID"
-      },
-      "requestField" : "BOOKCHILD5ID",
-      "requestMethod" : "DELETE",
-      "requestParamType" : "FIELD",
-      "uniqueTag" : "BOOKCHILD5__DEACTION__REMOVE",
-      "needResourceKey" : true,
-      "noServiceCodeName" : true
-    }, {
-      "dataAccessAction" : "UPDATE",
-      "methodType" : "DEACTION",
-      "name" : "Update",
-      "getPSDEAction" : {
-        "modelref" : true,
-        "path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5/PSDEACTIONS/Update.json"
-      },
-      "getPSDEServiceAPIMethodInput" : {
-        "name" : "输入对象",
-        "getPSDEMethodDTO" : {
-          "modelref" : true,
-          "id" : "BOOKCHILD5DTO"
-        },
-        "type" : "DTO"
-      },
-      "getPSDEServiceAPIMethodReturn" : {
-        "name" : "返回对象",
-        "getPSDEMethodDTO" : {
-          "modelref" : true,
-          "id" : "BOOKCHILD5DTO"
-        },
-        "type" : "DTO"
-      },
-      "requestMethod" : "PUT",
-      "requestParamType" : "ENTITY",
-      "uniqueTag" : "BOOKCHILD5__DEACTION__UPDATE",
-      "needResourceKey" : true,
-      "noServiceCodeName" : true
-    }, {
-      "codeName" : "CheckKey",
-      "dataAccessAction" : "CREATE",
-      "methodType" : "DEACTION",
-      "name" : "CheckKey",
-      "getPSDEAction" : {
-        "modelref" : true,
-        "path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5/PSDEACTIONS/CheckKey.json"
-      },
-      "getPSDEServiceAPIMethodInput" : {
-        "name" : "输入对象",
-        "getPSDEMethodDTO" : {
-          "modelref" : true,
-          "id" : "BOOKCHILD5DTO"
-        },
-        "type" : "DTO"
-      },
-      "getPSDEServiceAPIMethodReturn" : {
-        "name" : "返回对象",
-        "stdDataType" : 9,
-        "type" : "SIMPLE"
-      },
-      "requestMethod" : "POST",
-      "requestParamType" : "ENTITY",
-      "requestPath" : "/checkkey",
-      "uniqueTag" : "BOOKCHILD5__DEACTION__CHECKKEY"
-    }, {
-      "codeName" : "GetDraft",
-      "dataAccessAction" : "CREATE",
-      "methodType" : "DEACTION",
-      "name" : "GetDraft",
-      "getPSDEAction" : {
-        "modelref" : true,
-        "path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5/PSDEACTIONS/GetDraft.json"
-      },
-      "getPSDEServiceAPIMethodInput" : {
-        "name" : "输入对象",
-        "getPSDEMethodDTO" : {
-          "modelref" : true,
-          "id" : "BOOKCHILD5DTO"
-        },
-        "type" : "DTO"
-      },
-      "getPSDEServiceAPIMethodReturn" : {
-        "name" : "返回对象",
-        "getPSDEMethodDTO" : {
-          "modelref" : true,
-          "id" : "BOOKCHILD5DTO"
-        },
-        "type" : "DTO"
-      },
-      "requestMethod" : "GET",
-      "requestParamType" : "NONE",
-      "requestPath" : "/getdraft",
-      "uniqueTag" : "BOOKCHILD5__DEACTION__GETDRAFT"
-    }, {
-      "codeName" : "Save",
-      "methodType" : "DEACTION",
-      "name" : "Save",
-      "getPSDEAction" : {
-        "modelref" : true,
-        "path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5/PSDEACTIONS/Save.json"
-      },
-      "getPSDEServiceAPIMethodInput" : {
-        "name" : "输入对象",
-        "getPSDEMethodDTO" : {
-          "modelref" : true,
-          "id" : "BOOKCHILD5DTO"
-        },
-        "type" : "DTO"
-      },
-      "getPSDEServiceAPIMethodReturn" : {
-        "name" : "返回对象",
-        "type" : "VOID"
-      },
-      "requestMethod" : "POST",
-      "requestParamType" : "ENTITY",
-      "requestPath" : "/save",
-      "uniqueTag" : "BOOKCHILD5__DEACTION__SAVE",
-      "needResourceKey" : true
-    }, {
-      "codeName" : "FetchDefault",
-      "dataAccessAction" : "READ",
-      "methodType" : "FETCH",
-      "name" : "FetchDefault",
-      "getPSDEDataSet" : {
-        "modelref" : true,
-        "id" : "Default"
-      },
-      "getPSDEServiceAPIMethodInput" : {
-        "name" : "输入对象",
-        "getPSDEMethodDTO" : {
-          "modelref" : true,
-          "id" : "BOOKCHILD5FilterDTO"
-        },
-        "type" : "DTO"
-      },
-      "getPSDEServiceAPIMethodReturn" : {
-        "name" : "返回对象",
-        "getPSDEMethodDTO" : {
-          "modelref" : true,
-          "id" : "BOOKCHILD5DTO"
-        },
-        "type" : "PAGE"
-      },
-      "requestMethod" : "POST",
-      "requestParamType" : "ENTITY",
-      "requestPath" : "/fetchdefault",
-      "uniqueTag" : "BOOKCHILD5__FETCH__DEFAULT"
-    }, {
-      "codeName" : "Select",
-      "dataAccessAction" : "READ",
-      "methodType" : "SELECT",
-      "name" : "Select",
-      "getPSDEServiceAPIMethodInput" : {
-        "name" : "输入对象",
-        "type" : "UNKNOWN"
-      },
-      "getPSDEServiceAPIMethodReturn" : {
-        "name" : "返回对象",
-        "type" : "UNKNOWN"
-      },
-      "requestMethod" : "POST",
-      "requestParamType" : "ENTITY",
-      "requestPath" : "/select",
-      "uniqueTag" : "BOOKCHILD5__SELECT"
-    } ],
     "getPSDataEntity" : {
       "modelref" : true,
       "path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5.json"
     },
     "enableDataExport" : true,
     "enableDataImport" : true,
-    "major" : true
+    "major" : false,
+    "nested" : true
   }, {
     "aPIMode" : 9,
     "codeName" : "BOOKCHILD2",

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: