Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun

pkg/common/db/model.go

@@ -2,6 +2,7 @@ package db
 
 import (
 	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/utils"
 	"fmt"
@@ -33,6 +34,7 @@ func key(dbAddress, dbName string) string {
 }
 
 func init() {
+	log.NewPrivateLog(constant.LogFileName)
 	//var mgoSession *mgo.Session
 	var mongoClient *mongo.Client
 	var err1 error
@@ -51,7 +53,7 @@ func init() {
 	}
 
 	mongoClient, err := mongo.Connect(context.TODO(), options.Client().ApplyURI(uri))
-	if err != nil{
+	if err != nil {
 		log.NewError(" mongo.Connect  failed, try ", utils.GetSelfFuncName(), err.Error(), uri)
 		time.Sleep(time.Duration(30) * time.Second)
 		mongoClient, err1 = mongo.Connect(context.TODO(), options.Client().ApplyURI(uri))

pkg/common/db/mongoModel.go

@@ -499,7 +499,7 @@ func (d *DataBases) SetTag(userID, tagID, newName string, increaseUserIDList []s
 		}
 	}
 	tag.UserList = append(tag.UserList, increaseUserIDList...)
-	tag.UserList = utils.RemoveUserIDRepByMap(tag.UserList)
+	tag.UserList = utils.RemoveRepeatedStringInList(tag.UserList)
 	for _, v := range reduceUserIDList {
 		for i2, v2 := range tag.UserList {
 			if v == v2 {

pkg/common/db/mysql_model/im_mysql_model/group_model.go

@@ -216,10 +216,10 @@ func GetGroupMaster(groupId string) (db.GroupMember, error) {
 	return groupMember, nil
 }
 
-func UpdateGroupInfoDefaultZero(groupInfo db.Group, args map[string]interface{}) error {
+func UpdateGroupInfoDefaultZero(groupID string, args map[string]interface{}) error {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return err
 	}
-	return dbConn.Model(groupInfo).Updates(args).Error
+	return dbConn.Table("groups").Where("group_id = ? ", groupID).Update(args).Error
 }