Merge remote-tracking branch 'origin/tuoyun' into tuoyun

internal/api/chat/del_msg.go

@@ -1,32 +0,0 @@
-package apiChat
-
-//
-//import (
-//	apiStruct "Open_IM/pkg/base_info"
-//	"Open_IM/pkg/common/config"
-//	"Open_IM/pkg/common/log"
-//	"Open_IM/pkg/common/token_verify"
-//	"Open_IM/pkg/grpc-etcdv3/getcdv3"
-//	pbChat "Open_IM/pkg/proto/chat"
-//	"Open_IM/pkg/utils"
-//	"github.com/gin-gonic/gin"
-//	"net/http"
-//	"strings"
-//)
-//
-//func DelMsg(c *gin.Context) {
-//	var (
-//		req  apiStruct.DelMsgReq
-//		resp apiStruct.DelMsgResp
-//		reqPb pbChat.
-//	)
-//	ok, userID := token_verify.GetUserIDFromToken(c.Request.Header.Get("token"))
-//	if !ok {
-//		log.NewError(req.OperationID, "GetUserIDFromToken false ", c.Request.Header.Get("token"))
-//		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "GetUserIDFromToken failed"})
-//		return
-//	}
-//	grpcConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfflineMessageName)
-//	msgClient := pbChat.NewChatClient(grpcConn)
-//	//respPb, err := msgClient.DelMsgList()
-//}

internal/rpc/msg/del_msg.go

@@ -1,6 +1,7 @@
 package msg
 
 import (
+	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
 	commonPb "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
@@ -9,7 +10,10 @@ import (
 
 func (rpc *rpcChat) DelMsgList(_ context.Context, req *commonPb.DelMsgListReq) (*commonPb.DelMsgListResp, error) {
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
+	//if err := db.DelMsg(req.UserID, req.SeqList); err != nil {
+	//	log.NewError(req.OperationID, utils.GetSelfFuncName(), "DelMsg failed", err.Error())
+	//}
 	resp := &commonPb.DelMsgListResp{}
-	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp)
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String())
 	return resp, nil
 }