blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-12-03 02:42:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: change the resp

Browse Source
This commit is contained in:
luhaoling 2024-01-16 15:10:11 +08:00
parent d68f111cc4
commit 523d5172ec
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
internal/api/msg.go
View File

@ -30,8 +30,9 @@ import (
"github.com/go-playground/validator/v10" "github.com/go-playground/validator/v10"
"github.com/mitchellh/mapstructure" "github.com/mitchellh/mapstructure"
"github.com/openimsdk/open-im-server/v3/pkg/callbackstruct" "github.com/openimsdk/open-im-server/v3/pkg/callbackstruct"
"github.com/openimsdk/open-im-server/v3/pkg/common/http" http2 "github.com/openimsdk/open-im-server/v3/pkg/common/http"
pbmsg "github.com/openimsdk/open-im-server/v3/tools/data-conversion/openim/proto/msg" pbmsg "github.com/openimsdk/open-im-server/v3/tools/data-conversion/openim/proto/msg"
"net/http"
"time" "time"
"github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/authverify"
@ -410,7 +411,7 @@ func (m *MessageApi) CallbackExample(c *gin.Context) {
}, },
} }
apiresp.GinSuccess(c, resp) c.JSON(http.StatusOK, resp)
imAdmin := config.Config.IMAdmin.UserID[0] imAdmin := config.Config.IMAdmin.UserID[0]
if req.SendID == imAdmin { if req.SendID == imAdmin {
return return
@ -436,7 +437,7 @@ func (m *MessageApi) CallbackExample(c *gin.Context) {
log.ZDebug(c, "CallbackExample get User Token", "token", output_token) log.ZDebug(c, "CallbackExample get User Token", "token", output_token)
data, err := http.Post(c, url, header, input_token, 10) data, err := http2.Post(c, url, header, input_token, 10)
if err != nil { if err != nil {
log.ZError(c, "CallbackExample get Sender token failed", err) log.ZError(c, "CallbackExample get Sender token failed", err)
apiresp.GinError(c, errs.ErrInternalServer.WithDetail(err.Error()).Wrap()) apiresp.GinError(c, errs.ErrInternalServer.WithDetail(err.Error()).Wrap())
@ -489,7 +490,7 @@ func (m *MessageApi) CallbackExample(c *gin.Context) {
log.ZDebug(c, "CallbackExample Header", "header", header) log.ZDebug(c, "CallbackExample Header", "header", header)
b, err := http.Post(c, url, header, input, 10) b, err := http2.Post(c, url, header, input, 10)
if err != nil { if err != nil {
log.ZError(c, "CallbackExample send message failed", err) log.ZError(c, "CallbackExample send message failed", err)
apiresp.GinError(c, errs.ErrInternalServer.WithDetail(err.Error()).Wrap()) apiresp.GinError(c, errs.ErrInternalServer.WithDetail(err.Error()).Wrap())
@ -500,6 +501,11 @@ func (m *MessageApi) CallbackExample(c *gin.Context) {
apiresp.GinError(c, errs.ErrInternalServer.WithDetail(err.Error()).Wrap()) apiresp.GinError(c, errs.ErrInternalServer.WithDetail(err.Error()).Wrap())
return return
} }
res := &msg.SendMsgResp{
ServerMsgID: output.Data.ServerMsgID,
ClientMsgID: output.Data.ClientMsgID,
SendTime: output.Data.SendTime,
}
apiresp.GinSuccess(c, output) apiresp.GinSuccess(c, res)
} }