tony001 部署微服务接口 [TrainSys，默认服务接口]

b4639cc2 · ibizdev · ff7dc028 · b4639cc2 · b4639cc2 · b4639cc2
--- a/config.xml
+++ b/config.xml
@@ -55,6 +55,12 @@
 	  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>

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/FILE.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/FILE.json
@@ -189,6 +189,9 @@
    }, {
      "name" : "TYPE",
      "codeName" : "TYPE"
+    }, {
+      "name" : "ISTOP",
+      "codeName" : "ISTOP"
    }, {
      "name" : "FILENAME",
      "codeName" : "FILEName"
@@ -256,6 +259,54 @@
      "type" : "DTOS"
    },
    "defaultMode" : true
+  }, {
+    "getAllPSDEDataQueryCodes" : [ {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSDATAENTITIES/FILE/PSDEDATAQUERIES/TOP/PSDEDQCODES/MYSQL5.json"
+    } ],
+    "codeName" : "TOP",
+    "logicName" : "顶层节点查询",
+    "name" : "TOP",
+    "getPSDEDQMain" : {
+      "getJoinPSDataEntity" : {
+        "modelref" : true,
+        "path" : "PSMODULES/Test/PSDATAENTITIES/FILE.json"
+      },
+      "joinType" : "MAIN",
+      "name" : "FILE",
+      "getPSDEDQGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "连接条件",
+        "getPSDEDQConditions" : [ {
+          "condOp" : "EQ",
+          "condType" : "SINGLE",
+          "condValue" : "1",
+          "fieldName" : "ISTOP",
+          "name" : "(ISTOP) 等于(=) 1",
+          "getPSDEField" : {
+            "name" : "ISTOP",
+            "codeName" : "ISTOP"
+          }
+        } ]
+      }
+    },
+    "getPSDEDataQueryInput" : {
+      "name" : "TOPInput",
+      "getPSDEFilterDTO" : {
+        "modelref" : true,
+        "id" : "FILEFilterDTO"
+      },
+      "type" : "DTO"
+    },
+    "getPSDEDataQueryReturn" : {
+      "name" : "TOPResult",
+      "getPSDEMethodDTO" : {
+        "modelref" : true,
+        "id" : "FILEDTO"
+      },
+      "type" : "DTOS"
+    }
  }, {
    "getAllPSDEDataQueryCodes" : [ {
      "modelref" : true,
@@ -321,6 +372,32 @@
    "defaultMode" : true,
    "enableBackend" : true,
    "enableFront" : true
+  }, {
+    "codeName" : "TOP",
+    "logicName" : "顶层节点",
+    "name" : "TOP",
+    "getPSDEDataQueries" : [ {
+      "modelref" : true,
+      "id" : "TOP"
+    } ],
+    "getPSDEDataSetInput" : {
+      "name" : "TOPInput",
+      "getPSDEFilterDTO" : {
+        "modelref" : true,
+        "id" : "FILEFilterDTO"
+      },
+      "type" : "DTO"
+    },
+    "getPSDEDataSetReturn" : {
+      "name" : "TOPResult",
+      "getPSDEMethodDTO" : {
+        "modelref" : true,
+        "id" : "FILEDTO"
+      },
+      "type" : "PAGE"
+    },
+    "enableBackend" : true,
+    "enableFront" : true
  } ],
  "getAllPSDEFields" : [ {
    "getAllPSDEFDTColumns" : [ {
@@ -488,6 +565,74 @@
    "stdDataType" : 25,
    "stringLength" : 60,
    "valueFormat" : "%1$s"
+  }, {
+    "getAllPSDEFDTColumns" : [ {
+      "columnName" : "ISTOP",
+      "dBType" : "MYSQL5",
+      "name" : "ISTOP",
+      "queryCodeExp" : "t1.`ISTOP`",
+      "standardColumnName" : "`ISTOP`"
+    } ],
+    "getAllPSDEFUIModes" : [ {
+      "codeName" : "Default",
+      "name" : "[ISTOP][是否顶层节点]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "DROPDOWNLIST_100",
+        "name" : "[ISTOP][是否顶层节点]",
+        "uIMode" : "DEFAULT",
+        "needCodeListConfig" : true
+      },
+      "type" : "DEFAULT"
+    }, {
+      "codeName" : "MobileDefault",
+      "name" : "[ISTOP][是否顶层节点]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBSWITCH",
+        "name" : "[ISTOP][是否顶层节点]移动端默认",
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true,
+        "needCodeListConfig" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    } ],
+    "getAllPSDEFValueRules" : [ {
+      "codeName" : "Default",
+      "name" : "默认规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组"
+      },
+      "ruleInfo" : "默认规则",
+      "checkDefault" : true,
+      "defaultMode" : true,
+      "enableBackend" : true,
+      "enableFront" : true
+    } ],
+    "codeName" : "ISTOP",
+    "dEFType" : 1,
+    "dataType" : "YESNO",
+    "importOrder" : 1000,
+    "logicName" : "是否顶层节点",
+    "name" : "ISTOP",
+    "getPSCodeList" : {
+      "modelref" : true,
+      "path" : "PSCODELISTS/YesNo.json"
+    },
+    "getPSDEDBTable" : {
+      "modelref" : true,
+      "id" : "Table"
+    },
+    "getPSSysDBColumn" : {
+      "modelref" : true,
+      "id" : "ISTOP"
+    },
+    "serviceCodeName" : "ISTOP",
+    "stdDataType" : 9,
+    "valueFormat" : "%1$s"
  }, {
    "getAllPSDEFDTColumns" : [ {
      "columnName" : "FILENAME",
@@ -1239,6 +1384,16 @@
      "stdDataType" : 25,
      "stringLength" : 60,
      "type" : "SIMPLE"
+    }, {
+      "logicName" : "是否顶层节点",
+      "name" : "ISTOP",
+      "getPSDEField" : {
+        "name" : "ISTOP",
+        "codeName" : "ISTOP"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 9,
+      "type" : "SIMPLE"
    }, {
      "jsonFormat" : "yyyy-MM-dd HH:mm:ss",
      "logicName" : "建立时间",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/FILE/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/FILE/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json
@@ -16,6 +16,9 @@
  }, {
    "expression" : "t1.`ICON`",
    "name" : "ICON"
+  }, {
+    "expression" : "t1.`ISTOP`",
+    "name" : "ISTOP"
  }, {
    "expression" : "t1.`PFILEID`",
    "name" : "PFILEID"
@@ -32,6 +35,6 @@
    "expression" : "t1.`UPDATEMAN`",
    "name" : "UPDATEMAN"
  } ],
-  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`FILEID`,\nt1.`FILENAME`,\nt1.`ICON`,\nt1.`PFILEID`,\nt11.`FILENAME` AS `PFILENAME`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_FILE` t1 \nLEFT JOIN `T_FILE` t11 ON t1.`PFILEID` = t11.`FILEID` \n",
+  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`FILEID`,\nt1.`FILENAME`,\nt1.`ICON`,\nt1.`ISTOP`,\nt1.`PFILEID`,\nt11.`FILENAME` AS `PFILENAME`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_FILE` t1 \nLEFT JOIN `T_FILE` t11 ON t1.`PFILEID` = t11.`FILEID` \n",
  "id" : "PSMODULES/Test/PSDATAENTITIES/FILE/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/FILE/PSDEDATAQUERIES/TOP/PSDEDQCODES/MYSQL5.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/FILE/PSDEDATAQUERIES/TOP/PSDEDQCODES/MYSQL5.json
+{
+  "dBType" : "MYSQL5",
+  "name" : "MySQL5",
+  "getPSDEDataQueryCodeConds" : [ {
+    "condType" : "CUSTOM",
+    "customCond" : "( t1.`ISTOP` = 1 )",
+    "name" : "查询条件"
+  } ],
+  "getPSDEDataQueryCodeExps" : [ {
+    "expression" : "t1.`CREATEDATE`",
+    "name" : "CREATEDATE"
+  }, {
+    "expression" : "t1.`CREATEMAN`",
+    "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`FILEID`",
+    "name" : "FILEID"
+  }, {
+    "expression" : "t1.`FILENAME`",
+    "name" : "FILENAME"
+  }, {
+    "expression" : "t1.`ICON`",
+    "name" : "ICON"
+  }, {
+    "expression" : "t1.`ISTOP`",
+    "name" : "ISTOP"
+  }, {
+    "expression" : "t1.`PFILEID`",
+    "name" : "PFILEID"
+  }, {
+    "expression" : "t11.`FILENAME`",
+    "name" : "PFILENAME"
+  }, {
+    "expression" : "t1.`TYPE`",
+    "name" : "TYPE"
+  }, {
+    "expression" : "t1.`UPDATEDATE`",
+    "name" : "UPDATEDATE"
+  }, {
+    "expression" : "t1.`UPDATEMAN`",
+    "name" : "UPDATEMAN"
+  } ],
+  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`FILEID`,\nt1.`FILENAME`,\nt1.`ICON`,\nt1.`ISTOP`,\nt1.`PFILEID`,\nt11.`FILENAME` AS `PFILENAME`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_FILE` t1 \nLEFT JOIN `T_FILE` t11 ON t1.`PFILEID` = t11.`FILEID` \n",
+  "id" : "PSMODULES/Test/PSDATAENTITIES/FILE/PSDEDATAQUERIES/TOP/PSDEDQCODES/MYSQL5.json"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/FILE/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/FILE/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json
@@ -16,6 +16,9 @@
  }, {
    "expression" : "t1.`ICON`",
    "name" : "ICON"
+  }, {
+    "expression" : "t1.`ISTOP`",
+    "name" : "ISTOP"
  }, {
    "expression" : "t1.`PFILEID`",
    "name" : "PFILEID"
@@ -32,6 +35,6 @@
    "expression" : "t1.`UPDATEMAN`",
    "name" : "UPDATEMAN"
  } ],
-  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`FILEID`,\nt1.`FILENAME`,\nt1.`ICON`,\nt1.`PFILEID`,\nt11.`FILENAME` AS `PFILENAME`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_FILE` t1 \nLEFT JOIN `T_FILE` t11 ON t1.`PFILEID` = t11.`FILEID` \n",
+  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`FILEID`,\nt1.`FILENAME`,\nt1.`ICON`,\nt1.`ISTOP`,\nt1.`PFILEID`,\nt11.`FILENAME` AS `PFILENAME`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_FILE` t1 \nLEFT JOIN `T_FILE` t11 ON t1.`PFILEID` = t11.`FILEID` \n",
  "id" : "PSMODULES/Test/PSDATAENTITIES/FILE/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE.json
@@ -321,6 +321,42 @@
    "requestParamType" : "ENTITY",
    "requestPath" : "/fetchdefault",
    "builtinMethod" : false
+  }, {
+    "codeName" : "FetchTOP",
+    "methodType" : "FETCH",
+    "name" : "FetchTOP",
+    "getPSAppDEMethodInput" : {
+      "name" : "输入对象",
+      "getPSAppDEMethodDTO" : {
+        "modelref" : true,
+        "id" : "FILEFilterDTO"
+      },
+      "type" : "DTO"
+    },
+    "getPSAppDEMethodReturn" : {
+      "name" : "返回对象",
+      "getPSAppDEMethodDTO" : {
+        "modelref" : true,
+        "id" : "FILEDTO"
+      },
+      "type" : "PAGE"
+    },
+    "getPSDEDataSet" : {
+      "modelref" : true,
+      "id" : "TOP"
+    },
+    "getPSDEOPPriv" : {
+      "modelref" : true,
+      "id" : "READ"
+    },
+    "getPSDEServiceAPIMethod" : {
+      "modelref" : true,
+      "id" : "FetchTOP"
+    },
+    "requestMethod" : "POST",
+    "requestParamType" : "ENTITY",
+    "requestPath" : "/fetchtop",
+    "builtinMethod" : false
  } ],
  "getAllPSAppDEFields" : [ {
    "getAllPSAppDEFUIModes" : [ {
@@ -386,6 +422,36 @@
    "name" : "TYPE",
    "stdDataType" : 25,
    "stringLength" : 60
+  }, {
+    "getAllPSAppDEFUIModes" : [ {
+      "codeName" : "Default",
+      "name" : "[ISTOP][是否顶层节点]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "DROPDOWNLIST_100",
+        "name" : "[ISTOP][是否顶层节点]",
+        "uIMode" : "DEFAULT",
+        "needCodeListConfig" : true
+      },
+      "type" : "DEFAULT"
+    }, {
+      "codeName" : "MobileDefault",
+      "name" : "[ISTOP][是否顶层节点]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBSWITCH",
+        "name" : "[ISTOP][是否顶层节点]移动端默认",
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true,
+        "needCodeListConfig" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    } ],
+    "codeName" : "ISTOP",
+    "logicName" : "是否顶层节点",
+    "name" : "ISTOP",
+    "stdDataType" : 9
  }, {
    "getAllPSAppDEFUIModes" : [ {
      "codeName" : "Default",
@@ -703,6 +769,17 @@
      "sourceType" : "DEFIELD",
      "stdDataType" : 25,
      "type" : "SIMPLE"
+    }, {
+      "codeName" : "ISTOP",
+      "logicName" : "是否顶层节点",
+      "name" : "ISTOP",
+      "getPSAppDEField" : {
+        "name" : "ISTOP",
+        "codeName" : "ISTOP"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 9,
+      "type" : "SIMPLE"
    }, {
      "codeName" : "CreateDate",
      "jsonFormat" : "yyyy-MM-dd HH:mm:ss",
@@ -1164,6 +1241,42 @@
    "requestParamType" : "ENTITY",
    "requestPath" : "/fetchdefault",
    "builtinMethod" : false
+  }, {
+    "codeName" : "FetchTOP",
+    "methodType" : "FETCH",
+    "name" : "FetchTOP",
+    "getPSAppDEMethodInput" : {
+      "name" : "输入对象",
+      "getPSAppDEMethodDTO" : {
+        "modelref" : true,
+        "id" : "FILEFilterDTO"
+      },
+      "type" : "DTO"
+    },
+    "getPSAppDEMethodReturn" : {
+      "name" : "返回对象",
+      "getPSAppDEMethodDTO" : {
+        "modelref" : true,
+        "id" : "FILEDTO"
+      },
+      "type" : "PAGE"
+    },
+    "getPSDEDataSet" : {
+      "modelref" : true,
+      "id" : "TOP"
+    },
+    "getPSDEOPPriv" : {
+      "modelref" : true,
+      "id" : "READ"
+    },
+    "getPSDEServiceAPIMethod" : {
+      "modelref" : true,
+      "id" : "FetchTOP"
+    },
+    "requestMethod" : "POST",
+    "requestParamType" : "ENTITY",
+    "requestPath" : "/fetchtop",
+    "builtinMethod" : false
  }, {
    "codeName" : "FilterCreate",
    "methodType" : "FILTERACTION",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE/PSFORMS/Main.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE/PSFORMS/Main.json
@@ -119,6 +119,13 @@
      "name" : "FILENAME",
      "codeName" : "FILEName"
    }
+  }, {
+    "id" : "istop",
+    "dataType" : 9,
+    "getPSAppDEField" : {
+      "name" : "ISTOP",
+      "codeName" : "ISTOP"
+    }
  }, {
    "id" : "type",
    "dataType" : 25,
@@ -200,6 +207,43 @@
        },
        "allowEmpty" : true,
        "showCaption" : true
+      }, {
+        "caption" : "是否顶层节点",
+        "codeName" : "istop",
+        "dataType" : 9,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "itemWidth" : 230.0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "istop",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "ISTOP",
+          "codeName" : "ISTOP"
+        },
+        "getPSEditor" : {
+          "editorType" : "DROPDOWNLIST_100",
+          "editorWidth" : 100.0,
+          "name" : "istop",
+          "getPSAppCodeList" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/YesNo.json"
+          },
+          "singleSelect" : true
+        },
+        "getPSLayoutPos" : {
+          "colLG" : 12,
+          "colMD" : 12,
+          "colSM" : 12,
+          "colXS" : 12,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "needCodeListConfig" : true,
+        "showCaption" : true
      }, {
        "caption" : "类型",
        "codeName" : "type",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/FILEEditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/FILEEditView.json
@@ -815,6 +815,13 @@
        "name" : "FILENAME",
        "codeName" : "FILEName"
      }
+    }, {
+      "id" : "istop",
+      "dataType" : 9,
+      "getPSAppDEField" : {
+        "name" : "ISTOP",
+        "codeName" : "ISTOP"
+      }
    }, {
      "id" : "type",
      "dataType" : 25,
@@ -896,6 +903,43 @@
          },
          "allowEmpty" : true,
          "showCaption" : true
+        }, {
+          "caption" : "是否顶层节点",
+          "codeName" : "istop",
+          "dataType" : 9,
+          "detailStyle" : "DEFAULT",
+          "detailType" : "FORMITEM",
+          "enableCond" : 3,
+          "ignoreInput" : 0,
+          "itemWidth" : 230.0,
+          "labelPos" : "LEFT",
+          "labelWidth" : 130,
+          "name" : "istop",
+          "noPrivDisplayMode" : 1,
+          "getPSAppDEField" : {
+            "name" : "ISTOP",
+            "codeName" : "ISTOP"
+          },
+          "getPSEditor" : {
+            "editorType" : "DROPDOWNLIST_100",
+            "editorWidth" : 100.0,
+            "name" : "istop",
+            "getPSAppCodeList" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/YesNo.json"
+            },
+            "singleSelect" : true
+          },
+          "getPSLayoutPos" : {
+            "colLG" : 12,
+            "colMD" : 12,
+            "colSM" : 12,
+            "colXS" : 12,
+            "layout" : "TABLE_24COL"
+          },
+          "allowEmpty" : true,
+          "needCodeListConfig" : true,
+          "showCaption" : true
        }, {
          "caption" : "类型",
          "codeName" : "type",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSDBSCHEMES/DEFAULT.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSDBSCHEMES/DEFAULT.json
@@ -1683,6 +1683,12 @@
      "name" : "ICON",
      "stdDataType" : 25,
      "nullable" : true
+    }, {
+      "codeName" : "ISTOP",
+      "logicName" : "是否顶层节点",
+      "name" : "ISTOP",
+      "stdDataType" : 9,
+      "nullable" : true
    }, {
      "codeName" : "PFILEID",
      "length" : 100,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSSERVICEAPIS/TrainSys.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSSERVICEAPIS/TrainSys.json
@@ -640,6 +640,39 @@
      "tempDataMode" : 0,
      "uniqueTag" : "FILE__FETCH__DEFAULT",
      "enableTestMethod" : false
+    }, {
+      "actionType" : "FETCH",
+      "codeName" : "FetchTOP",
+      "dataAccessAction" : "READ",
+      "methodType" : "FETCH",
+      "name" : "FetchTOP",
+      "getPSDEDataSet" : {
+        "modelref" : true,
+        "id" : "TOP"
+      },
+      "getPSDEServiceAPIMethodInput" : {
+        "name" : "输入对象",
+        "getPSDEMethodDTO" : {
+          "modelref" : true,
+          "id" : "FILEFilterDTO"
+        },
+        "type" : "DTO"
+      },
+      "getPSDEServiceAPIMethodReturn" : {
+        "name" : "返回对象",
+        "getPSDEMethodDTO" : {
+          "modelref" : true,
+          "id" : "FILEDTO"
+        },
+        "type" : "PAGE"
+      },
+      "parentKeyMode" : "DEFAULT",
+      "requestMethod" : "POST",
+      "requestParamType" : "ENTITY",
+      "requestPath" : "/fetchtop",
+      "tempDataMode" : 0,
+      "uniqueTag" : "FILE__FETCH__TOP",
+      "enableTestMethod" : false
    }, {
      "actionType" : "SELECT",
      "codeName" : "Select",
@@ -7907,6 +7940,18 @@
      "enableModify" : true,
      "keyField" : false,
      "majorField" : false
+    }, {
+      "codeName" : "ISTOP",
+      "codeName2" : "ISTOP",
+      "logicName" : "是否顶层节点",
+      "name" : "ISTOP",
+      "orderValue" : 200,
+      "stdDataType" : 9,
+      "allowEmpty" : true,
+      "enableCreate" : true,
+      "enableModify" : true,
+      "keyField" : false,
+      "majorField" : false
    }, {
      "codeName" : "FILEName",
      "codeName2" : "FILEName",
@@ -8232,6 +8277,35 @@
      "requestParamType" : "ENTITY",
      "requestPath" : "/fetchdefault",
      "uniqueTag" : "FILE__FETCH__DEFAULT"
+    }, {
+      "codeName" : "FetchTOP",
+      "dataAccessAction" : "READ",
+      "methodType" : "FETCH",
+      "name" : "FetchTOP",
+      "getPSDEDataSet" : {
+        "modelref" : true,
+        "id" : "TOP"
+      },
+      "getPSDEServiceAPIMethodInput" : {
+        "name" : "输入对象",
+        "getPSDEMethodDTO" : {
+          "modelref" : true,
+          "id" : "FILEFilterDTO"
+        },
+        "type" : "DTO"
+      },
+      "getPSDEServiceAPIMethodReturn" : {
+        "name" : "返回对象",
+        "getPSDEMethodDTO" : {
+          "modelref" : true,
+          "id" : "FILEDTO"
+        },
+        "type" : "PAGE"
+      },
+      "requestMethod" : "POST",
+      "requestParamType" : "ENTITY",
+      "requestPath" : "/fetchtop",
+      "uniqueTag" : "FILE__FETCH__TOP"
    }, {
      "codeName" : "Select",
      "dataAccessAction" : "READ",

--- a/trainsys-provider/pom.xml
+++ b/trainsys-provider/pom.xml
@@ -33,7 +33,7 @@

    <profiles>
        <profile>
-            <id>runtime</id>
+            <id>trainsys</id>
            <build>
                <resources>
                    <resource>

--- a/trainsys-provider/src/main/docker/Dockerfile
+++ b/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 8081
+EXPOSE 50000

 ADD trainsys-provider.jar /trainsys-provider.jar
--- a/trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
+++ b/trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
@@ -22,7 +22,32 @@ spec:
        image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
        imagePullPolicy: Always
        ports:
-        - containerPort: 8081
+        - 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"      

 ---
 apiVersion: v1
@@ -35,9 +60,9 @@ spec:
  type: NodePort
  ports:
  - name: http
-    port: 8081
-    targetPort: 8081
-    nodePort: 8081
+    port: 50000
+    targetPort: 50000
+    nodePort: 50000
    protocol: TCP
  selector:
    app: trainsys-provider

--- a/trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
+++ b/trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
@@ -3,9 +3,23 @@ services:
  trainsys-provider:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
    ports:
-      - "8081:8081"
+      - "50000:50000"
    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: