blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-05-04 17:16:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

mongo

Browse Source
This commit is contained in:
wangchuxiao 2022-03-23 16:13:18 +08:00
parent 4cdcdee8e4
commit 4bdb4cbbb5
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/api/third/minio_storage_credential.go
View File

@ -21,7 +21,15 @@ func MinioUploadFile(c *gin.Context) {
req apiStruct.MinioUploadFileReq req apiStruct.MinioUploadFileReq
resp apiStruct.MinioUploadFileResp resp apiStruct.MinioUploadFileResp
) )
if err := c.BindJSON(&req); err != nil { defer func() {
if r := recover(); r != nil {
log.NewError(req.OperationID, recover())
log.NewError(req.OperationID, utils.GetSelfFuncName(), r)
c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": r})
return
}
}()
if err := c.Bind(&req); err != nil {
log.NewError("0", utils.GetSelfFuncName(), "BindJSON failed ", err.Error()) log.NewError("0", utils.GetSelfFuncName(), "BindJSON failed ", err.Error())
c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
return return
@ -34,12 +42,14 @@ func MinioUploadFile(c *gin.Context) {
if err != nil { if err != nil {
log.NewError(req.OperationID, utils.GetSelfFuncName(), "Open file error", err.Error()) log.NewError(req.OperationID, utils.GetSelfFuncName(), "Open file error", err.Error())
c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
return
} }
snapShotNewName, snapShotNewType := utils.GetNewFileNameAndContentType(snapShotFile.Filename) snapShotNewName, snapShotNewType := utils.GetNewFileNameAndContentType(snapShotFile.Filename)
_, err = minioClient.PutObject(context.Background(), config.Config.Credential.Minio.Bucket, snapShotNewName, snapShotFileObj, snapShotFile.Size, minio.PutObjectOptions{ContentType: snapShotNewType}) _, err = minioClient.PutObject(context.Background(), config.Config.Credential.Minio.Bucket, snapShotNewName, snapShotFileObj, snapShotFile.Size, minio.PutObjectOptions{ContentType: snapShotNewType})
if err != nil { if err != nil {
log.NewError(req.OperationID, utils.GetSelfFuncName(), "PutObject snapShotFile error", err.Error()) log.NewError(req.OperationID, utils.GetSelfFuncName(), "PutObject snapShotFile error", err.Error())
c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
return
} }
resp.SnapshotURL = config.Config.Credential.Minio.Endpoint + "/" + config.Config.Credential.Minio.Bucket + "/" + snapShotNewName resp.SnapshotURL = config.Config.Credential.Minio.Endpoint + "/" + config.Config.Credential.Minio.Bucket + "/" + snapShotNewName
resp.SnapshotNewName = snapShotNewName resp.SnapshotNewName = snapShotNewName

4
pkg/base_info/minio_api_struct.go
View File

@ -13,8 +13,8 @@ type MiniostorageCredentialResp struct {
} }
type MinioUploadFileReq struct { type MinioUploadFileReq struct {
OperationID string `json:"operationID"` OperationID string `form:"operationID"`
FileType int `json:"fileType"` FileType int `form:"fileType"`
} }
type MinioUploadFileResp struct { type MinioUploadFileResp struct {