fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop

Browse Source
This commit is contained in:
laodaming 2023-08-10 14:03:39 +08:00
commit 63093c6953
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/upload/internal/logic/uploadfilesbackendlogic.go
View File

@ -145,7 +145,7 @@ func (l *UploadFilesBackendLogic) UploadFilesBackend(req *types.UploadFilesReq,
FileHash: resourceId, FileHash: resourceId,
FileByte: uploadDataInfo.FileData, FileByte: uploadDataInfo.FileData,
UploadBucket: 1, UploadBucket: 1,
ApiType: 2, ApiType: req.ApiType,
UserId: userId, UserId: userId,
GuestId: guestId, GuestId: guestId,
}) })

10
server/upload/internal/logic/uploadlogologic.go
View File

@ -5,8 +5,8 @@ import (
"fusenapi/model/gmodel" "fusenapi/model/gmodel"
"fusenapi/utils/auth" "fusenapi/utils/auth"
"fusenapi/utils/basic" "fusenapi/utils/basic"
"fusenapi/utils/curl"
"io" "io"
"net/http"
"strings" "strings"
"time" "time"
@ -83,11 +83,17 @@ func (l *UploadLogoLogic) UploadLogo(req *types.UploadLogoReq, userinfo *auth.Us
} }
var resultStr string var resultStr string
var err error var err error
var postMap = make(map[string]interface{}, 1) var postMap = make(map[string]interface{}, 1)
postMap["logo_url"] = req.ResourceUrl postMap["logo_url"] = req.ResourceUrl
postMapB, _ := json.Marshal(postMap) postMapB, _ := json.Marshal(postMap)
result, err := http.Post(l.svcCtx.Config.BLMService.ImageProcess.Url, "application/json", strings.NewReader(string(postMapB))) //result, err := http.Post(l.svcCtx.Config.BLMService.ImageProcess.Url, "application/json", strings.NewReader(string(postMapB)))
var headerData = make(map[string]string, 1)
headerData["Content-Type"] = "application/json"
result, err := curl.ApiCall(l.svcCtx.Config.BLMService.ImageProcess.Url, "POST", headerData, strings.NewReader(string(postMapB)), 20)
if err != nil { if err != nil {
logx.Error(err) logx.Error(err)
return resp.SetStatus(basic.CodeFileUploadLogoErr, "service fail") return resp.SetStatus(basic.CodeFileUploadLogoErr, "service fail")

4
utils/file/upload.go
View File

@ -109,7 +109,7 @@ func (upload *Upload) UploadFileByBase64(req *UploadBaseReq) (*UploadBaseRes, er
uploadBaseRes.ResourceUrl = url uploadBaseRes.ResourceUrl = url
var version string = "0.0.1" var version string = "0.0.1"
var nowTime = time.Now() var nowTime = time.Now()
_, err = resourceModelTS.Create(upload.Ctx, &gmodel.FsResource{ _, err = resourceModelTS.Create(ctx, &gmodel.FsResource{
ResourceId: resourceId, ResourceId: resourceId,
UserId: &req.UserId, UserId: &req.UserId,
GuestId: &req.GuestId, GuestId: &req.GuestId,
@ -198,7 +198,7 @@ func (upload *Upload) UploadFileByByte(req *UploadBaseReq) (*UploadBaseRes, erro
uploadBaseRes.ResourceUrl = url uploadBaseRes.ResourceUrl = url
var version string = "0.0.1" var version string = "0.0.1"
var nowTime = time.Now() var nowTime = time.Now()
_, err = resourceModelTS.Create(upload.Ctx, &gmodel.FsResource{ _, err = resourceModelTS.Create(ctx, &gmodel.FsResource{
ResourceId: resourceId, ResourceId: resourceId,
UserId: &req.UserId, UserId: &req.UserId,
GuestId: &req.GuestId, GuestId: &req.GuestId,