From 5b216e6a3a61d48b7cdd73527c23ccd1c47ce763 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Wed, 28 Sep 2022 14:43:43 +0800 Subject: [PATCH 1/2] revoke message struct update --- internal/api/manage/management_chat.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/api/manage/management_chat.go b/internal/api/manage/management_chat.go index 947a6a8b5..9a74dcb60 100644 --- a/internal/api/manage/management_chat.go +++ b/internal/api/manage/management_chat.go @@ -503,9 +503,9 @@ type OANotificationElem struct { Ex string `mapstructure:"ex" json:"ex"` } type MessageRevoked struct { - RevokerID string `mapstructure:"notificationName" json:"revokerID" validate:"required"` - RevokerRole int32 `mapstructure:"notificationName" json:"revokerRole" validate:"required"` - ClientMsgID string `mapstructure:"notificationName" json:"clientMsgID" validate:"required"` - RevokerNickname string `mapstructure:"notificationName" json:"revokerNickname"` - SessionType int32 `mapstructure:"notificationName" json:"sessionType" validate:"required"` + RevokerID string `mapstructure:"revokerID" json:"revokerID" validate:"required"` + RevokerRole int32 `mapstructure:"revokerRole" json:"revokerRole" validate:"required"` + ClientMsgID string `mapstructure:"clientMsgID" json:"clientMsgID" validate:"required"` + RevokerNickname string `mapstructure:"revokerNickname" json:"revokerNickname"` + SessionType int32 `mapstructure:"sessionType" json:"sessionType" validate:"required"` } From 9d9d3db701bdb607a3118ce3e3cb9f115b8e7117 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Wed, 28 Sep 2022 15:33:49 +0800 Subject: [PATCH 2/2] http status change --- internal/api/msg/del_msg.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/api/msg/del_msg.go b/internal/api/msg/del_msg.go index 07322f8d9..7ded12d59 100644 --- a/internal/api/msg/del_msg.go +++ b/internal/api/msg/del_msg.go @@ -80,7 +80,7 @@ func DelSuperGroupMsg(c *gin.Context) { ) rpcReq := &rpc.DelSuperGroupMsgReq{} if err := c.BindJSON(&req); err != nil { - c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) + c.JSON(http.StatusOK, gin.H{"errCode": 400, "errMsg": err.Error()}) return } utils.CopyStructFields(rpcReq, &req) @@ -91,7 +91,7 @@ func DelSuperGroupMsg(c *gin.Context) { if !ok { errMsg := req.OperationID + " " + rpcReq.OpUserID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token") log.NewError(req.OperationID, errMsg) - c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": errMsg}) + c.JSON(http.StatusOK, gin.H{"errCode": 500, "errMsg": errMsg}) return } options := make(map[string]bool, 5)