debug

models/database.go

@@ -90,6 +90,7 @@ type XyuSmallRoomRecord struct {
 type XyuSmallTempFiles struct {
 	Id      int
 	RoomNum string `form:"room_num"`
+	Name    string `form:"name"`
 	Type    int    `form:"type"`
 	Url     string `form:"url"`
 	Time    string `form:"time"'`

upload/upload.go

@@ -135,7 +135,7 @@ func Down(v *models.XyuSmallTempFiles)  {
 	room_file["is_courseware"] = "1"
 	room_file["private"] = "1"
 	room_file["nickname"] = "助教"
-	room_file["name"] = filename
+	room_file["name"] = v.Name
 	room_file["time"] = now
 	if v.Type == 1 {
 		room_file["is_material"] = 1
@@ -176,10 +176,12 @@ func Down(v *models.XyuSmallTempFiles)  {
 		return
 	}
 	defer fd.Close()
-	objectPath := "documents/" + v.RoomNum + "/" + contentHash + "/" + fileHashName + "/"
-	objectName := objectPath + contentHash + ext
+
+	//objectPath := "documents/" + v.RoomNum + "/" + contentHash + "/" + fileHashName + "/"
+	objectName := v.Url[strings.Index(v.Url, "com/")+4:]
 	fmt.Println("objectName == ", objectName)
-	room_file["path"] = objectPath
+	objectPath := objectName[0:strings.LastIndex(objectName, "/")]+"/"
+	room_file["path"] = objectName
 	err = bucket.PutObject(objectName, fd)
 	if err != nil {
 		fmt.Println(err)
@@ -193,7 +195,7 @@ func Down(v *models.XyuSmallTempFiles)  {
 	}
 
 	room_file["files_size"] = strconv.Itoa(int(maps["FileSize"].(float64)))
-	room_file["link"] = furl
+	room_file["link"] = v.Url
 
 	wordFloat64 := getWords(maps)