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

Author: skiffer-git

internal/conversation_msg/conversation_msg.go

@@ -289,12 +289,13 @@ func (c *Conversation) doMsgNew(c2v common.Cmd2Value) {
 	log.Info(operationID, "trigger map is :", newConversationSet, conversationChangedSet)
 	//u.doUpdateConversation(cmd2Value{Value: updateConNode{"", NewCon, mapKeyToStringList(newConversationSet)}})
 	//u.doUpdateConversation(cmd2Value{Value: updateConNode{"", ConChange, mapKeyToStringList(conversationChangSet)}})
-	if len(conversationChangedSet) != 0 {
-		c.ConversationListener.OnConversationChanged(utils.StructToJsonString(mapConversationToList(conversationChangedSet)))
-	}
 	if len(newConversationSet) != 0 {
 		c.ConversationListener.OnNewConversation(utils.StructToJsonString(mapConversationToList(newConversationSet)))
 	}
+	if len(conversationChangedSet) != 0 {
+		c.ConversationListener.OnConversationChanged(utils.StructToJsonString(mapConversationToList(conversationChangedSet)))
+	}
+
 	if isTriggerUnReadCount {
 		c.doUpdateConversation(common.Cmd2Value{Value: common.UpdateConNode{"", constant.TotalUnreadMessageChanged, ""}})
 	}

internal/login/init_login.go

@@ -146,11 +146,14 @@ func (u *LoginMgr) login(userID, token string, cb open_im_sdk_callback.Base, ope
 	log.Info(operationID, "forcedSynchronization success...")
 	log.NewInfo(operationID, u.imConfig.ObjectStorage)
 	var objStorage comm2.ObjectStorage
+	objStorage = comm2.NewCOS(p)
 	switch u.imConfig.ObjectStorage {
 	case "cos":
 		objStorage = comm2.NewCOS(p)
 	case "minio":
 		objStorage = comm2.NewMinio(p)
+	default:
+		objStorage = comm2.NewCOS(p)
 	}
 	u.conversation = conv.NewConversation(u.ws, u.db, p, u.conversationCh,
 		u.loginUserID, u.imConfig.Platform, u.imConfig.DataDir,

ws_wrapper/ws_local_server/ws_conversation_msg.go

@@ -553,6 +553,16 @@ func (wsRouter *WsFuncRouter) SendMessageNotOss(input string, operationID string
 
 }
 
+func (wsRouter *WsFuncRouter) ClearC2CHistoryMessage(input string, operationID string) {
+	userWorker := open_im_sdk.GetUserWorker(wsRouter.uId)
+	userWorker.Conversation().ClearC2CHistoryMessage(&BaseSuccFailed{runFuncName(),operationID,wsRouter.uId},input,operationID)
+}
+
+func (wsRouter *WsFuncRouter) ClearGroupHistoryMessage(input string, operationID string) {
+	userWorker := open_im_sdk.GetUserWorker(wsRouter.uId)
+	userWorker.Conversation().ClearGroupHistoryMessage(&BaseSuccFailed{runFuncName(),operationID,wsRouter.uId},input,operationID)
+}
+
 //func (wsRouter *WsFuncRouter) SetSdkLog(input string, operationID string) {
 //	m := make(map[string]interface{})
 //	if err := json.Unmarshal([]byte(input), &m); err != nil {