From a23664ce61515375aa1a7993f74b7094d352784d Mon Sep 17 00:00:00 2001 From: chulin <316014408@qq.com> Date: Wed, 30 Nov 2016 15:33:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89fileUrl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- weed/server/filer_server_handlers_read.go | 5 ++--- weed/server/volume_server_handlers_read.go | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/weed/server/filer_server_handlers_read.go b/weed/server/filer_server_handlers_read.go index a455ac22a..cd6fb4849 100644 --- a/weed/server/filer_server_handlers_read.go +++ b/weed/server/filer_server_handlers_read.go @@ -20,8 +20,7 @@ import ( "github.com/syndtr/goleveldb/leveldb" ) -//文件服务器地址 -var fileUrl string = "http://127.0.0.1:8888" +//七牛资源域名 var resourceUrl string = "http://resource.k12cloud.cn" // listDirectoryHandler lists directories and folers under a directory @@ -106,7 +105,7 @@ func (fs *FilerServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request, } jwt := security.GetJwt(r) - _, err = operation.Upload(fileUrl+r.URL.Path, fileName, bytes.NewReader(data), false, contentType, jwt) + _, err = operation.Upload("http://"+r.Host+r.URL.Path, fileName, bytes.NewReader(data), false, contentType, jwt) if err != nil { glog.V(0).Infoln(err) return diff --git a/weed/server/volume_server_handlers_read.go b/weed/server/volume_server_handlers_read.go index 49027a135..1f8434d7f 100644 --- a/weed/server/volume_server_handlers_read.go +++ b/weed/server/volume_server_handlers_read.go @@ -145,7 +145,7 @@ func (vs *VolumeServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request) reqUrl := r.Header.Get("path") + "?w=" + r.FormValue("w") + "&h=" + r.FormValue("h") + "&r=" + r.FormValue("r") jwt := security.GetJwt(r) - _, err = operation.Upload(fileUrl+reqUrl, filename, bytes.NewReader(n.Data), false, "image/jpeg", jwt) + _, err = operation.Upload("http://"+r.Host+reqUrl, filename, bytes.NewReader(n.Data), false, "image/jpeg", jwt) if err != nil { glog.V(0).Infoln(err) }