Merge pull request #171 from jumpserver/dev_bugfix

[Update] fix web sftp

pkg/model/nodetree.go

@@ -2,15 +2,15 @@ package model
 
 import "encoding/json"
 
-
 type NodeTreeList []NodeTreeAsset
 
-
 type NodeTreeAsset struct {
-	ID    string                 `json:"id"`
-	Name  string                 `json:"name"`
-	Title string                 `json:"title"`
-	Meta  map[string]interface{} `json:"meta"`
+	ID       string                 `json:"id"`
+	Name     string                 `json:"name"`
+	Title    string                 `json:"title"`
+	Pid      string                 `json:"pId"`
+	IsParent bool                   `json:"isParent"`
+	Meta     map[string]interface{} `json:"meta"`
 }
 
 func ConvertMetaToNode(body []byte) (node Node, err error) {

pkg/srvconn/sftpconn.go

@@ -252,6 +252,9 @@ func (u *UserSftpConn) initial() {
 		u.Dirs = map[string]os.FileInfo{}
 	}
 	for _, item := range nodeTrees {
+		if item.Pid != "" {
+			continue
+		}
 		typeName, ok := item.Meta["type"].(string)
 		if !ok {
 			continue