|
|
@@ -8,6 +8,7 @@ import (
|
|
|
"github.com/gogf/gf/v2/util/gconv"
|
|
|
"io"
|
|
|
"net/http"
|
|
|
+ "net/url"
|
|
|
"strings"
|
|
|
|
|
|
"bp.jydev.jianyu360.cn/BaseService/biService/api/internal/svc"
|
|
|
@@ -49,6 +50,21 @@ func (l *UpFileLogic) UpFile(req *types.UpFileReq) (resp *types.BiResp, err erro
|
|
|
break
|
|
|
}
|
|
|
fileSize := size + "KB"
|
|
|
+ fileName := ""
|
|
|
+ formUrl := l.r.Form.Get("url")
|
|
|
+ u, err := url.Parse(formUrl)
|
|
|
+ if err != nil {
|
|
|
+ fmt.Println("Failed to parse URL:", err)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ queryValues, _ := url.ParseQuery(u.RawQuery)
|
|
|
+ fileName = queryValues.Get("fileId")
|
|
|
+ index := strings.Index(fileName, "-")
|
|
|
+ // 截取 "-" 后边的内容
|
|
|
+ fileName = fileName[index+1:]
|
|
|
+ if fileName == "" {
|
|
|
+ fileName = req.FileName
|
|
|
+ }
|
|
|
res, err := l.svcCtx.BiServiceRpc.UpFile(l.ctx, &biservice.UpFileReq{
|
|
|
AppId: req.AppId,
|
|
|
UserId: req.BaseUserId,
|
|
|
@@ -57,7 +73,7 @@ func (l *UpFileLogic) UpFile(req *types.UpFileReq) (resp *types.BiResp, err erro
|
|
|
EntId: req.EntId,
|
|
|
Stype: req.FileType,
|
|
|
File: bt,
|
|
|
- FileName: req.FileName,
|
|
|
+ FileName: fileName,
|
|
|
FileSize: fileSize,
|
|
|
})
|
|
|
data := gconv.Map(gconv.UnsafeBytesToStr(res.Data))
|
