just rename for small file

Author: sjqzhang

build.sh

@@ -1,14 +1,14 @@
 #!/bin/bash
 
+rm -rf src
 
+git pull
 
 BIN_VERSION="go-fastdfs:${1-$(git describe  --tags `git rev-parse HEAD`)}"
 
-if [[ ! -d src ]];then
 
-cp -r vendor src
+cp -rf vendor src
 
-fi
 
 
 export GO111MODULE="off"
@@ -19,6 +19,7 @@ cp -rf cmd doc server main.go  src/github.com/sjqzhang/go-fastdfs
 
 GOPATH=`pwd`  go test -v server/*.go
 
+echo $?
 if [[ $? -ne 0 ]];then
   echo "test fail"
   exit 1

server/http_download.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"net/url"
 	"os"
 	"strconv"
 	"strings"
@@ -15,18 +14,6 @@ import (
 	log "github.com/sjqzhang/seelog"
 )
 
-func (c *Server) SetDownloadHeader(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "application/octet-stream")
-	if name, ok := r.URL.Query()["name"]; ok {
-		if v, err := url.QueryUnescape(name[0]); err == nil {
-			name[0] = c.TrimFileNameSpecialChar(v)
-		}
-		w.Header().Set("Content-Disposition", fmt.Sprintf("attachment;filename=%s", name[0]))
-	} else {
-		w.Header().Set("Content-Disposition", "attachment")
-	}
-}
-
 func (c *Server) ConsumerDownLoad() {
 	ConsumerFunc := func() {
 		for {
@@ -324,7 +311,7 @@ func (c *Server) DownloadSmallFileByURI(w http.ResponseWriter, r *http.Request)
 	_ = notFound
 	if data != nil && string(data[0]) == "1" {
 		if isDownload {
-			c.SetDownloadHeader(w, r)
+			c.SetDownloadHeader(w, r, true)
 		}
 		if imgWidth != 0 || imgHeight != 0 {
 			c.ResizeImageByBytes(w, data[1:], uint(imgWidth), uint(imgHeight))
@@ -374,7 +361,7 @@ func (c *Server) DownloadNormalFileByURI(w http.ResponseWriter, r *http.Request)
 		}
 	}
 	if isDownload {
-		c.SetDownloadHeader(w, r)
+		c.SetDownloadHeader(w, r, false)
 	}
 	fullpath, _ := c.GetFilePathFromRequest(w, r)
 	if imgWidth != 0 || imgHeight != 0 {
@@ -417,7 +404,7 @@ func (c *Server) DownloadNotFound(w http.ResponseWriter, r *http.Request) {
 			go c.DownloadFromPeer(peer, fileInfo)
 			//http.Redirect(w, r, peer+r.RequestURI, 302)
 			if isDownload {
-				c.SetDownloadHeader(w, r)
+				c.SetDownloadHeader(w, r, false)
 			}
 			c.DownloadFileToResponse(peer+r.RequestURI, w, r)
 			return

server/http_header.go

@@ -1,6 +1,10 @@
 package server
 
-import "net/http"
+import (
+	"fmt"
+	"net/http"
+	"net/url"
+)
 
 func (c *Server) CrossOrigin(w http.ResponseWriter, r *http.Request) {
 	if r.Header.Get("Origin") != "" {
@@ -15,3 +19,19 @@ func (c *Server) CrossOrigin(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Access-Control-Expose-Headers", "Authorization")
 	//https://blog.csdn.net/yanzisu_congcong/article/details/80552155
 }
+
+func (c *Server) SetDownloadHeader(w http.ResponseWriter, r *http.Request, isSmall bool) {
+	w.Header().Set("Content-Type", "application/octet-stream")
+	if name, ok := r.URL.Query()["name"]; ok {
+		if v, err := url.QueryUnescape(name[0]); err == nil {
+			if isSmall {
+				name[0] = c.TrimFileNameSpecialChar(v)
+			} else {
+				name[0] = v
+			}
+		}
+		w.Header().Set("Content-Disposition", fmt.Sprintf("attachment;filename=%s", name[0]))
+	} else {
+		w.Header().Set("Content-Disposition", "attachment")
+	}
+}