Merge pull request #11 from lanyulei/dev

修复无法上传logo后地址不正确的bug。
This commit is contained in:
lyl_task 2020-08-19 17:13:27 +08:00 committed by GitHub
commit d1d4040c2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 5 deletions

View File

@ -118,6 +118,7 @@ QQ群1127401830
* 吻住,我们能赢 10.24元 * 吻住,我们能赢 10.24元
* *悟 3元 * *悟 3元
* Super_z 10元 * Super_z 10元
* T*i 10元
支付宝: 支付宝:

View File

@ -7,6 +7,9 @@ import (
"ferry/tools/app" "ferry/tools/app"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"strings"
"github.com/spf13/viper"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/google/uuid" "github.com/google/uuid"
@ -23,8 +26,16 @@ import (
// @Router /api/v1/public/uploadFile [post] // @Router /api/v1/public/uploadFile [post]
func UploadFile(c *gin.Context) { func UploadFile(c *gin.Context) {
tag, _ := c.GetPostForm("type") var (
urlPerfix := fmt.Sprintf("http://%s/", c.Request.Host) tag string
urlPrefix string
)
tag, _ = c.GetPostForm("type")
if strings.HasSuffix(viper.GetString("settings.domain"), "/") {
urlPrefix = viper.GetString("settings.domain")
} else {
urlPrefix = fmt.Sprintf("%v/", viper.GetString("settings.domain"))
}
if tag == "" { if tag == "" {
app.Error(c, 200, errors.New(""), "缺少标识") app.Error(c, 200, errors.New(""), "缺少标识")
return return
@ -41,7 +52,7 @@ func UploadFile(c *gin.Context) {
singleFile := "static/uploadfile/" + guid + utils.GetExt(files.Filename) singleFile := "static/uploadfile/" + guid + utils.GetExt(files.Filename)
_ = c.SaveUploadedFile(files, singleFile) _ = c.SaveUploadedFile(files, singleFile)
app.OK(c, urlPerfix+singleFile, "上传成功") app.OK(c, urlPrefix+singleFile, "上传成功")
return return
case "2": // 多图 case "2": // 多图
files := c.Request.MultipartForm.File["file"] files := c.Request.MultipartForm.File["file"]
@ -50,7 +61,7 @@ func UploadFile(c *gin.Context) {
guid := uuid.New().String() guid := uuid.New().String()
multipartFileName := "static/uploadfile/" + guid + utils.GetExt(f.Filename) multipartFileName := "static/uploadfile/" + guid + utils.GetExt(f.Filename)
_ = c.SaveUploadedFile(f, multipartFileName) _ = c.SaveUploadedFile(f, multipartFileName)
multipartFile = append(multipartFile, urlPerfix+multipartFileName) multipartFile = append(multipartFile, urlPrefix+multipartFileName)
} }
app.OK(c, multipartFile, "上传成功") app.OK(c, multipartFile, "上传成功")
return return
@ -59,7 +70,7 @@ func UploadFile(c *gin.Context) {
ddd, _ := base64.StdEncoding.DecodeString(files) ddd, _ := base64.StdEncoding.DecodeString(files)
guid := uuid.New().String() guid := uuid.New().String()
_ = ioutil.WriteFile("static/uploadfile/"+guid+".jpg", ddd, 0666) _ = ioutil.WriteFile("static/uploadfile/"+guid+".jpg", ddd, 0666)
app.OK(c, urlPerfix+"static/uploadfile/"+guid+".jpg", "上传成功") app.OK(c, urlPrefix+"static/uploadfile/"+guid+".jpg", "上传成功")
} }
} }
} }