test/go-fastdfs
1
0
Fork 0
mirror of https://gitee.com/sjqzhang/go-fastdfs.git synced 2024-11-30 10:17:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove files from url

Browse Source
This commit is contained in:
s_jqzhang 2019-01-07 17:19:06 +08:00
parent 8e3eb39a23
commit d55eaa51c0
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fileserver.go
View File

@ -417,7 +417,8 @@ func (this *Server) DownloadFromPeer(peer string, fileInfo *FileInfo) {
filename = fileInfo.ReName filename = fileInfo.ReName
} }
req := httplib.Get(peer + "/" + Config().Group + "/" + fileInfo.Path + "/" + filename) p := strings.Replace(fileInfo.Path, STORE_DIR+"/", "", 1)
req := httplib.Get(peer + "/" + Config().Group + "/" + p + "/" + filename)
req.SetTimeout(time.Second*5, time.Second*5) req.SetTimeout(time.Second*5, time.Second*5)
if err = req.ToFile(fileInfo.Path + "/" + filename); err != nil { if err = req.ToFile(fileInfo.Path + "/" + filename); err != nil {
@ -440,6 +441,8 @@ func (this *Server) Download(w http.ResponseWriter, r *http.Request) {
fullpath = r.RequestURI[len(Config().Group)+2 : len(r.RequestURI)] fullpath = r.RequestURI[len(Config().Group)+2 : len(r.RequestURI)]
fullpath = STORE_DIR + "/" + fullpath
if pathval, err = url.ParseQuery(fullpath); err != nil { if pathval, err = url.ParseQuery(fullpath); err != nil {
log.Error(err) log.Error(err)
} else { } else {
@ -865,7 +868,9 @@ func (this *Server) SyncFile(w http.ResponseWriter, r *http.Request) {
outname = v.ReName outname = v.ReName
} }
download_url := fmt.Sprintf("http://%s/%s", r.Host, Config().Group+"/"+v.Path+"/"+outname) p := strings.Replace(v.Path, STORE_DIR+"/", "", 1)
download_url := fmt.Sprintf("http://%s/%s", r.Host, Config().Group+"/"+p+"/"+outname)
w.Write([]byte(download_url)) w.Write([]byte(download_url))
return return
@ -929,7 +934,9 @@ func (this *Server) SyncFile(w http.ResponseWriter, r *http.Request) {
this.SaveFileMd5Log(&fileInfo, CONST_FILE_Md5_FILE_NAME) this.SaveFileMd5Log(&fileInfo, CONST_FILE_Md5_FILE_NAME)
download_url := fmt.Sprintf("http://%s/%s", r.Host, Config().Group+"/"+fileInfo.Path+"/"+fileInfo.Name) p := strings.Replace(fileInfo.Path, STORE_DIR+"/", "", 1)
download_url := fmt.Sprintf("http://%s/%s", r.Host, Config().Group+"/"+p+"/"+fileInfo.Name)
w.Write([]byte(download_url)) w.Write([]byte(download_url))
} }
@ -1057,9 +1064,10 @@ func (this *Server) Upload(w http.ResponseWriter, r *http.Request) {
if v.ReName != "" { if v.ReName != "" {
outname = v.ReName outname = v.ReName
} }
download_url := fmt.Sprintf("http://%s/%s", r.Host, Config().Group+"/"+v.Path+"/"+outname) p := strings.Replace(v.Path, STORE_DIR+"/", "", 1)
download_url := fmt.Sprintf("http://%s/%s", r.Host, Config().Group+"/"+p+"/"+outname)
if Config().DownloadDomain != "" { if Config().DownloadDomain != "" {
download_url = fmt.Sprintf("http://%s/%s", Config().DownloadDomain, Config().Group+"/"+v.Path+"/"+outname) download_url = fmt.Sprintf("http://%s/%s", Config().DownloadDomain, Config().Group+"/"+p+"/"+outname)
} }
w.Write([]byte(download_url)) w.Write([]byte(download_url))
@ -1132,9 +1140,11 @@ func (this *Server) Upload(w http.ResponseWriter, r *http.Request) {
this.SaveFileMd5Log(&fileInfo, CONST_FILE_Md5_FILE_NAME) this.SaveFileMd5Log(&fileInfo, CONST_FILE_Md5_FILE_NAME)
download_url := fmt.Sprintf("http://%s/%s", r.Host, Config().Group+"/"+fileInfo.Path+"/"+outname) p := strings.Replace(fileInfo.Path, STORE_DIR+"/", "", 1)
download_url := fmt.Sprintf("http://%s/%s", r.Host, Config().Group+"/"+p+"/"+outname)
if Config().DownloadDomain != "" { if Config().DownloadDomain != "" {
download_url = fmt.Sprintf("http://%s/%s", Config().DownloadDomain, Config().Group+"/"+fileInfo.Path+"/"+outname) download_url = fmt.Sprintf("http://%s/%s", Config().DownloadDomain, Config().Group+"/"+p+"/"+outname)
} }
w.Write([]byte(download_url)) w.Write([]byte(download_url))
return return
@ -1248,7 +1258,7 @@ func init() {
ParseConfig(CONST_CONF_FILE_NAME) ParseConfig(CONST_CONF_FILE_NAME)
staticHandler = http.StripPrefix("/"+Config().Group+"/"+STORE_DIR+"/", http.FileServer(http.Dir(STORE_DIR))) staticHandler = http.StripPrefix("/"+Config().Group+"/", http.FileServer(http.Dir(STORE_DIR)))
initComponent() initComponent()
} }
@ -1371,7 +1381,7 @@ func main() {
http.HandleFunc("/sync", server.Sync) http.HandleFunc("/sync", server.Sync)
http.HandleFunc("/stat", server.Stat) http.HandleFunc("/stat", server.Stat)
http.HandleFunc("/syncfile", server.SyncFile) http.HandleFunc("/syncfile", server.SyncFile)
http.HandleFunc("/"+Config().Group+"/"+STORE_DIR+"/", server.Download) http.HandleFunc("/"+Config().Group+"/", server.Download)
fmt.Println("Listen on " + Config().Addr) fmt.Println("Listen on " + Config().Addr)
err := http.ListenAndServe(Config().Addr, new(HttpHandler)) err := http.ListenAndServe(Config().Addr, new(HttpHandler))
log.Error(err) log.Error(err)