Browse Source

去掉fileUrl

pull/439/head
chulin 9 years ago
parent
commit
a23664ce61
  1. 5
      weed/server/filer_server_handlers_read.go
  2. 2
      weed/server/volume_server_handlers_read.go

5
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

2
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)
}

Loading…
Cancel
Save