Merge branch 'release' into dev

modules/backend/handler/common/common.go

@@ -10,6 +10,7 @@ import (
 	"server/modules/backend/values"
 	"server/util"
 	"strings"
+	"time"
 
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 	"github.com/gin-gonic/gin"
@@ -96,6 +97,7 @@ func UploadOSS(c *gin.Context) {
 	if req.Folder != "" && !strings.HasSuffix(req.Folder, "/") {
 		req.Folder += "/"
 	}
+	now := time.Now().Unix()
 	rsp := new(values.UploadOSSResp)
 	a.Data = rsp
 	file, err := c.FormFile("file")
@@ -125,11 +127,11 @@ func UploadOSS(c *gin.Context) {
 			return
 		}
 	}
-	err = bucket.PutObject(ossConf.ObjectName+req.Folder+file.Filename, f)
+	err = bucket.PutObject(fmt.Sprintf("%s%s%d_%s", ossConf.ObjectName, req.Folder, now, file.Filename), f)
 	if err != nil {
 		a.Code = values.CodeRetry
 		log.Error("UploadOSS PutObject err:%v", err)
 		return
 	}
-	rsp.Url = fmt.Sprintf("https://%s/%s%s%s", ossConf.Domain, ossConf.ObjectName, req.Folder, file.Filename)
+	rsp.Url = fmt.Sprintf("https://%s/%s%s%d_%s", ossConf.Domain, ossConf.ObjectName, req.Folder, time.Now().Unix(), file.Filename)
 }