Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release

cmd/Open-IM-SDK-Core

@@ -1 +1 @@
-Subproject commit 3b9c0d84d43d45c2a73b56a3c3510f86b67ff9bb
+Subproject commit 1667b0f4e205fc4ed7c690ab55b662087d61c277

config/config.yaml

@@ -636,7 +636,7 @@ notification:
   #####################conversation#########################
   conversationOptUpdate:
     conversation:
-      reliabilityLevel: 2
+      reliabilityLevel: 1
       unreadCount: false
       offlinePush:
         switch: true

internal/api/manage/management_chat.go

@@ -460,7 +460,7 @@ type RevokeElem struct {
 }
 type OANotificationElem struct {
 	NotificationName    string      `mapstructure:"notificationName" json:"notificationName" validate:"required"`
-	NotificationFaceURL string      `mapstructure:"notificationFaceURL" json:"notificationFaceURL" validate:"required"`
+	NotificationFaceURL string      `mapstructure:"notificationFaceURL" json:"notificationFaceURL"`
 	NotificationType    int32       `mapstructure:"notificationType" json:"notificationType" validate:"required"`
 	Text                string      `mapstructure:"text" json:"text" validate:"required"`
 	Url                 string      `mapstructure:"url" json:"url"`

internal/rpc/conversation/conversaion.go

@@ -70,6 +70,9 @@ func (rpc *rpcConversation) ModifyConversationField(c context.Context, req *pbCo
 		err = imdb.UpdateColumnsConversations(haveUserID, req.Conversation.ConversationID, map[string]interface{}{"ex": conversation.Ex})
 	case constant.FieldAttachedInfo:
 		err = imdb.UpdateColumnsConversations(haveUserID, req.Conversation.ConversationID, map[string]interface{}{"attached_info": conversation.AttachedInfo})
+	case constant.FieldUnread:
+		err = imdb.UpdateColumnsConversations(haveUserID, req.Conversation.ConversationID, map[string]interface{}{"unread_count": conversation.UnreadCount})
+
 	}
 	if err != nil {
 		log.NewError(req.OperationID, utils.GetSelfFuncName(), "UpdateColumnsConversations error", err.Error())

pkg/common/constant/constant.go

@@ -252,6 +252,7 @@ const (
 	FieldGroupAtType   = 5
 	FieldIsNotInGroup  = 6
 	FieldEx            = 7
+	FieldUnread        = 8
 )
 
 const (