remove unuse rpc

internal/api/conversation.go

@@ -26,18 +26,6 @@ func (o *ConversationApi) GetConversations(c *gin.Context) {
 	a2r.Call(conversation.ConversationClient.GetConversations, o.Client, c)
 }
 
-func (o *ConversationApi) BatchSetConversations(c *gin.Context) {
-	a2r.Call(conversation.ConversationClient.BatchSetConversations, o.Client, c)
-}
-
-func (o *ConversationApi) SetRecvMsgOpt(c *gin.Context) {
-	a2r.Call(conversation.ConversationClient.SetRecvMsgOpt, o.Client, c)
-}
-
-func (o *ConversationApi) ModifyConversationField(c *gin.Context) {
-	a2r.Call(conversation.ConversationClient.ModifyConversationField, o.Client, c)
-}
-
 func (o *ConversationApi) SetConversations(c *gin.Context) {
 	a2r.Call(conversation.ConversationClient.SetConversations, o.Client, c)
 }

internal/api/route.go

@@ -144,9 +144,6 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive
 		conversationGroup.POST("/get_all_conversations", c.GetAllConversations)
 		conversationGroup.POST("/get_conversation", c.GetConversation)
 		conversationGroup.POST("/get_conversations", c.GetConversations)
-		conversationGroup.POST("/batch_set_conversation", c.BatchSetConversations)
-		conversationGroup.POST("/set_recv_msg_opt", c.SetRecvMsgOpt)
-		conversationGroup.POST("/modify_conversation_field", c.ModifyConversationField)
 		conversationGroup.POST("/set_conversations", c.SetConversations)
 	}
 

internal/rpc/conversation/conversaion.go

@@ -82,16 +82,6 @@ func (c *conversationServer) GetConversations(ctx context.Context, req *pbConver
 	return resp, nil
 }
 
-func (c *conversationServer) BatchSetConversations(ctx context.Context, req *pbConversation.BatchSetConversationsReq) (*pbConversation.BatchSetConversationsResp, error) {
-	conversations := convert.ConversationsPb2DB(req.Conversations)
-	err := c.conversationDatabase.SetUserConversations(ctx, req.OwnerUserID, conversations)
-	if err != nil {
-		return nil, err
-	}
-	_ = c.conversationNotificationSender.ConversationChangeNotification(ctx, req.OwnerUserID)
-	return &pbConversation.BatchSetConversationsResp{}, nil
-}
-
 func (c *conversationServer) SetConversation(ctx context.Context, req *pbConversation.SetConversationReq) (*pbConversation.SetConversationResp, error) {
 	var conversation tableRelation.ConversationModel
 	if err := utils.CopyStructFields(&conversation, req.Conversation); err != nil {
@@ -106,60 +96,6 @@ func (c *conversationServer) SetConversation(ctx context.Context, req *pbConvers
 	return resp, nil
 }
 
-func (c *conversationServer) SetRecvMsgOpt(ctx context.Context, req *pbConversation.SetRecvMsgOptReq) (*pbConversation.SetRecvMsgOptResp, error) {
-	if err := c.conversationDatabase.SetUsersConversationFiledTx(ctx, []string{req.OwnerUserID}, &tableRelation.ConversationModel{OwnerUserID: req.OwnerUserID, ConversationID: req.ConversationID, RecvMsgOpt: req.RecvMsgOpt}, map[string]interface{}{"recv_msg_opt": req.RecvMsgOpt}); err != nil {
-		return nil, err
-	}
-	_ = c.conversationNotificationSender.ConversationChangeNotification(ctx, req.OwnerUserID)
-	return &pbConversation.SetRecvMsgOptResp{}, nil
-}
-
-func (c *conversationServer) ModifyConversationField(ctx context.Context, req *pbConversation.ModifyConversationFieldReq) (*pbConversation.ModifyConversationFieldResp, error) {
-	resp := &pbConversation.ModifyConversationFieldResp{}
-	var err error
-	if req.Conversation.ConversationType == constant.GroupChatType {
-		groupInfo, err := c.groupRpcClient.GetGroupInfo(ctx, req.Conversation.GroupID)
-		if err != nil {
-			return nil, err
-		}
-		if groupInfo.Status == constant.GroupStatusDismissed && req.FieldType != constant.FieldUnread {
-			return nil, err
-		}
-	}
-	conversation := convert.ConversationPb2DB(req.Conversation)
-	if req.FieldType == constant.FieldIsPrivateChat {
-		err := c.conversationDatabase.SyncPeerUserPrivateConversationTx(ctx, []*tableRelation.ConversationModel{conversation})
-		if err != nil {
-			return nil, err
-		}
-		c.conversationNotificationSender.ConversationSetPrivateNotification(ctx, req.Conversation.OwnerUserID, req.Conversation.UserID, req.Conversation.IsPrivateChat)
-		return resp, nil
-	}
-	filedMap := make(map[string]interface{})
-	switch req.FieldType {
-	case constant.FieldRecvMsgOpt:
-		filedMap["recv_msg_opt"] = req.Conversation.RecvMsgOpt
-	case constant.FieldGroupAtType:
-		filedMap["group_at_type"] = req.Conversation.GroupAtType
-	case constant.FieldIsPinned:
-		filedMap["is_pinned"] = req.Conversation.IsPinned
-	case constant.FieldEx:
-		filedMap["ex"] = req.Conversation.Ex
-	case constant.FieldAttachedInfo:
-		filedMap["attached_info"] = req.Conversation.AttachedInfo
-	case constant.FieldBurnDuration:
-		filedMap["burn_duration"] = req.Conversation.BurnDuration
-	}
-	err = c.conversationDatabase.SetUsersConversationFiledTx(ctx, req.UserIDList, conversation, filedMap)
-	if err != nil {
-		return nil, err
-	}
-	for _, v := range req.UserIDList {
-		c.conversationNotificationSender.ConversationChangeNotification(ctx, v)
-	}
-	return resp, nil
-}
-
 func (c *conversationServer) SetConversations(ctx context.Context, req *pbConversation.SetConversationsReq) (*pbConversation.SetConversationsResp, error) {
 	if req.Conversation == nil {
 		return nil, errs.ErrArgs.Wrap("conversation must not be nil")

pkg/common/log/sql_logger.go

@@ -60,9 +60,9 @@ func (l *SqlLogger) Trace(ctx context.Context, begin time.Time, fc func() (sql s
 		sql, rows := fc()
 		slowLog := fmt.Sprintf("SLOW SQL >= %v", l.SlowThreshold)
 		if rows == -1 {
-			ZWarn(ctx, "sql exec detail", nil, "gorm", gormUtils.FileWithLineNum(), nil, "slow sql", slowLog, "elapsed time", fmt.Sprintf("%f(ms)", float64(elapsed.Nanoseconds())/1e6), "sql", sql)
+			ZWarn(ctx, "sql exec detail", nil, "gorm", gormUtils.FileWithLineNum(), "slow sql", slowLog, "elapsed time", fmt.Sprintf("%f(ms)", float64(elapsed.Nanoseconds())/1e6), "sql", sql)
 		} else {
-			ZWarn(ctx, "sql exec detail", nil, "gorm", gormUtils.FileWithLineNum(), nil, "slow sql", slowLog, "elapsed time", fmt.Sprintf("%f(ms)", float64(elapsed.Nanoseconds())/1e6), "rows", rows, "sql", sql)
+			ZWarn(ctx, "sql exec detail", nil, "gorm", gormUtils.FileWithLineNum(), "slow sql", slowLog, "elapsed time", fmt.Sprintf("%f(ms)", float64(elapsed.Nanoseconds())/1e6), "rows", rows, "sql", sql)
 		}
 	case l.LogLevel == gormLogger.Info:
 		sql, rows := fc()

pkg/proto/conversation/conversation.proto

@@ -36,15 +36,6 @@ message ConversationReq{
   OpenIMServer.protobuf.Int32Value groupAtType = 13;
 }
 
-message ModifyConversationFieldReq{
-  repeated string userIDList = 1;
-  int32 FieldType = 2;
-  Conversation conversation = 3;
-}
-
-message ModifyConversationFieldResp{
-}
-
 message SetConversationReq{
   Conversation conversation = 1; 
 }
@@ -52,15 +43,6 @@ message SetConversationReq{
 message SetConversationResp{
 }
 
-message SetRecvMsgOptReq {
-  string ownerUserID = 1;
-  string conversationID = 2;
-  int32 recvMsgOpt = 3;
-}
-
-message SetRecvMsgOptResp {
-}
-
 message GetConversationReq{
   string conversationID = 1;
   string ownerUserID = 2;
@@ -87,13 +69,6 @@ message GetAllConversationsResp{
   repeated Conversation conversations = 2;
 }
 
-message BatchSetConversationsReq{
-  repeated Conversation conversations = 1;
-  string ownerUserID = 2;
-}
-
-message BatchSetConversationsResp{
-}
 
 message GetRecvMsgNotNotifyUserIDsReq {
   string groupID = 1;
@@ -163,13 +138,10 @@ message GetConversationsByConversationIDResp {
 }
 
 service conversation {
-  rpc ModifyConversationField(ModifyConversationFieldReq)returns(ModifyConversationFieldResp);
   rpc GetConversation(GetConversationReq)returns(GetConversationResp);
   rpc GetAllConversations(GetAllConversationsReq)returns(GetAllConversationsResp);
   rpc GetConversations(GetConversationsReq)returns(GetConversationsResp);
-  rpc BatchSetConversations(BatchSetConversationsReq)returns(BatchSetConversationsResp);
   rpc SetConversation(SetConversationReq)returns(SetConversationResp);
-  rpc SetRecvMsgOpt(SetRecvMsgOptReq)returns(SetRecvMsgOptResp);
   rpc GetRecvMsgNotNotifyUserIDs(GetRecvMsgNotNotifyUserIDsReq) returns (GetRecvMsgNotNotifyUserIDsResp);
   rpc CreateSingleChatConversations(CreateSingleChatConversationsReq) returns (CreateSingleChatConversationsResp);
   rpc CreateGroupChatConversations(CreateGroupChatConversationsReq) returns (CreateGroupChatConversationsResp);

pkg/rpcclient/conversation.go

@@ -32,11 +32,6 @@ func NewConversationRpcClient(discov discoveryregistry.SvcDiscoveryRegistry) Con
 	return ConversationRpcClient(*NewConversation(discov))
 }
 
-func (c *ConversationRpcClient) ModifyConversationField(ctx context.Context, req *pbConversation.ModifyConversationFieldReq) error {
-	_, err := c.Client.ModifyConversationField(ctx, req)
-	return err
-}
-
 func (c *ConversationRpcClient) GetSingleConversationRecvMsgOpt(ctx context.Context, userID, conversationID string) (int32, error) {
 	var req pbConversation.GetConversationReq
 	req.OwnerUserID = userID