Parcourir la source

添加上传文件后的url地址返回

tangs il y a 7 ans
Parent
commit
1b234edd8c
2 fichiers modifiés avec 14 ajouts et 10 suppressions
  1. 2 1
      config.json
  2. 12 9
      src/fs/fs.go

+ 2 - 1
config.json

@@ -1,4 +1,5 @@
 {
     "filePath": "/home/tangs/file",
-    "log": "/var/log/fileUpload/log.log"
+    "log": "/var/log/fileUpload/log.log",
+    "addr": "http://file.5tangs.com/"
 }

+ 12 - 9
src/fs/fs.go

@@ -12,7 +12,8 @@ import (
 
 type Config struct {
 	FilePath string `json:"filePath"`
-	Log string `json:"log"`
+	Log      string `json:"log"`
+	Addr     string `json:"addr"`
 }
 
 var Conf = &Config{}
@@ -20,10 +21,12 @@ var Conf = &Config{}
 func FileUploadHandle(w http.ResponseWriter, r *http.Request) {
 	var code int
 	var msg string
+	var filename string
 	defer func() {
 		resp := map[string]interface{}{
 			"code": code,
-			"msg": msg,
+			"msg":  msg,
+			"url":  Conf.Addr + filename,
 		}
 		bys, _ := json.Marshal(resp)
 		w.Write(bys)
@@ -36,12 +39,12 @@ func FileUploadHandle(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	defer file.Close()
-
+	
 	originFilename := fileHeader.Filename
 	now := time.Now()
 	timePoint := fmt.Sprintf("%v-%v-%v-%v-%v-%v", now.Year(), now.Month(), now.Day(), now.Hour(), now.Minute(), now.Second())
-	var filename string = timePoint + "-" + originFilename
-
+	filename = timePoint + "-" + originFilename
+	
 	// check file path
 	fmt.Println(os.Getwd())
 	fp := Conf.FilePath
@@ -56,8 +59,8 @@ func FileUploadHandle(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 	}
-
-	filename = fp + "/" +filename
+	
+	filename = fp + "/" + filename
 	f, err := os.Create(filename)
 	if err != nil {
 		log.Error("FileUploadHandle create file (%v) error ->(%v)", filename, err)
@@ -73,8 +76,8 @@ func FileUploadHandle(w http.ResponseWriter, r *http.Request) {
 		msg = err.Error()
 		return
 	}
-
+	
 	log.Debug("FileUploadHandle copy file (%v) success with length(%v)", filename, length)
 	code = 0
 	msg = "Ok"
-}
+}