diff --git a/fssc/internal/handler/nfhandler.go b/fssc/internal/handler/nfhandler.go index f5d7cbd..80191cb 100644 --- a/fssc/internal/handler/nfhandler.go +++ b/fssc/internal/handler/nfhandler.go @@ -10,14 +10,15 @@ import ( // json 结构体 type Response struct { - Status string `json:"status"` - Data FilesListJson `json:"data"` + Status string `json:"status"` //状态 + Data FilesListJson `json:"data"` //目录下的文件 + Scdir string // 扫描的目录 } // 文件输出的结构 type FileJson struct { - Fname string `json:"fname"` - Isdir bool `json:isdir` + Fname string `json:"fname"` + Dirflag int `json:isdir` } type FilesListJson struct { @@ -37,16 +38,12 @@ func NfTest(w http.ResponseWriter, r *http.Request) { } data := struct { - DeviceName string - Loip string Rundir string IsDir bool FileName string DownloadPath string // Files []os.DirEntry }{ - DeviceName: config.G.DeviceName, - Loip: config.G.LocalIP, Rundir: config.G.FilePath, DownloadPath: downloadPath, } @@ -65,17 +62,18 @@ func NfTest(w http.ResponseWriter, r *http.Request) { // data.Files = files for _, v := range files { - flist.Flist = append(flist.Flist, FileJson{Fname: v.Name(), Isdir: v.IsDir()}) + flist.Flist = append(flist.Flist, FileJson{Fname: v.Name(), Dirflag: 1}) } } else { data.FileName = filepath.Base(realFilePath) - flist.Flist = append(flist.Flist, FileJson{Fname: filepath.Base(realFilePath), Isdir: true}) + flist.Flist = append(flist.Flist, FileJson{Fname: filepath.Base(realFilePath), Dirflag: 0}) } // respone file list response := Response{ Status: "success", + Scdir: realFilePath, Data: flist, } //