Merge branch 'v2.3.0release' of https://github.com/OpenIMSDK/Open-IM-Server into v2.3.0release

internal/api/client_init/init_config.go

@@ -9,7 +9,6 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"github.com/jinzhu/gorm"
 )
 
 func SetClientInitConfig(c *gin.Context) {
@@ -62,11 +61,10 @@ func GetClientInitConfig(c *gin.Context) {
 	}
 	config, err := imdb.GetClientInitConfig()
 	if err != nil {
-		if !gorm.IsRecordNotFoundError(err) {
-			log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error())
-			c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()})
-			return
-		}
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()})
+		return
+
 	}
 	resp.Data.DiscoverPageURL = config.DiscoverPageURL
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp ", resp)

internal/demo/register/ip_limit.go

@@ -10,7 +10,6 @@ import (
 
 	"github.com/gin-gonic/gin"
 
-	//"github.com/jinzhu/gorm"
 	"net/http"
 	"time"
 )

internal/msg_transfer/logic/online_msg_to_mongo_handler.go

@@ -61,7 +61,7 @@ func (mc *OnlineHistoryMongoConsumerHandler) handleChatWs2Mongo(cMsg *sarama.Con
 			if unexistSeqList, err := db.DB.DelMsgBySeqList(DeleteMessageTips.UserID, DeleteMessageTips.SeqList, v.OperationID); err != nil {
 				log.NewError(v.OperationID, utils.GetSelfFuncName(), "DelMsgBySeqList args: ", DeleteMessageTips.UserID, DeleteMessageTips.SeqList, v.OperationID, err.Error(), unexistSeqList)
 			}
-
+			//if v.MsgData.ContentType == ? {}
 		}
 	}
 }

internal/rpc/msg/callback.go

@@ -221,3 +221,9 @@ func callbackMsgModify(msg *pbChat.SendMsgReq) cbApi.CommonCallbackResp {
 	log.NewDebug(msg.OperationID, utils.GetSelfFuncName(), string(msg.MsgData.Content))
 	return callbackResp
 }
+
+func CallbackBeforeExtendMsgModify() cbApi.CommonCallbackResp {
+	callbackResp := cbApi.CommonCallbackResp{OperationID: ""}
+
+	return callbackResp
+}