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

pkg/common/constant/constant.go

@@ -231,3 +231,5 @@ func GroupIsBanPrivateChat(status int32) bool {
 }
 
 const BigVersion = "v3"
+
+const LogFileName = "OpenIM.log"

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
 }

pkg/common/log/logrus.go

@@ -63,10 +63,10 @@ func loggerInit(moduleName string) *Logger {
 }
 func NewLfsHook(rotationTime time.Duration, maxRemainNum uint, moduleName string) logrus.Hook {
 	lfsHook := lfshook.NewHook(lfshook.WriterMap{
-		logrus.DebugLevel: initRotateLogs(rotationTime, maxRemainNum, "debug", moduleName),
-		logrus.InfoLevel:  initRotateLogs(rotationTime, maxRemainNum, "info", moduleName),
-		logrus.WarnLevel:  initRotateLogs(rotationTime, maxRemainNum, "warn", moduleName),
-		logrus.ErrorLevel: initRotateLogs(rotationTime, maxRemainNum, "error", moduleName),
+		logrus.DebugLevel: initRotateLogs(rotationTime, maxRemainNum, "all", moduleName),
+		logrus.InfoLevel:  initRotateLogs(rotationTime, maxRemainNum, "all", moduleName),
+		logrus.WarnLevel:  initRotateLogs(rotationTime, maxRemainNum, "all", moduleName),
+		logrus.ErrorLevel: initRotateLogs(rotationTime, maxRemainNum, "all", moduleName),
 	}, &nested.Formatter{
 		TimestampFormat: "2006-01-02 15:04:05.000",
 		HideKeys:        false,

pkg/common/token_verify/jwt_token.go

@@ -101,7 +101,7 @@ func GetClaimFromToken(tokensString string) (*Claims, error) {
 }
 
 func IsAppManagerAccess(token string, OpUserID string) bool {
-	claims, err := ParseToken(token)
+	claims, err := ParseToken(token, "")
 	if err != nil {
 		return false
 	}
@@ -130,7 +130,7 @@ func CheckAccess(OpUserID string, OwnerUserID string) bool {
 }
 
 func GetUserIDFromToken(token string, operationID string) (bool, string) {
-	claims, err := ParseToken(token)
+	claims, err := ParseToken(token, operationID)
 	if err != nil {
 		log.Error(operationID, "ParseToken failed, ", err.Error(), token)
 		return false, ""
@@ -138,31 +138,31 @@ func GetUserIDFromToken(token string, operationID string) (bool, string) {
 	return true, claims.UID
 }
 
-func ParseToken(tokensString string) (claims *Claims, err error) {
-
+func ParseToken(tokensString, operationID string) (claims *Claims, err error) {
 	claims, err = GetClaimFromToken(tokensString)
 	if err != nil {
-		log.NewError("", "token validate err", err.Error())
+		log.NewError(operationID, "token validate err", err.Error(), tokensString)
 		return nil, err
 	}
 
 	m, err := commonDB.DB.GetTokenMapByUidPid(claims.UID, claims.Platform)
 	if err != nil {
-		log.NewError("", "get token from redis err", err.Error())
+		log.NewError(operationID, "get token from redis err", err.Error(), tokensString)
 		return nil, &constant.ErrTokenInvalid
 	}
 	if m == nil {
-		log.NewError("", "get token from redis err", "m is nil")
+		log.NewError(operationID, "get token from redis err", "m is nil", tokensString)
 		return nil, &constant.ErrTokenInvalid
 	}
 	if v, ok := m[tokensString]; ok {
 		switch v {
 		case constant.NormalToken:
-			log.NewDebug("", "this is normal return", claims)
+			log.NewDebug(operationID, "this is normal return", claims)
 			return claims, nil
 		case constant.InValidToken:
 			return nil, &constant.ErrTokenInvalid
 		case constant.KickedToken:
+			log.Error(operationID, "this token has been kicked by other same terminal ", constant.ErrTokenKicked)
 			return nil, &constant.ErrTokenKicked
 		case constant.ExpiredToken:
 			return nil, &constant.ErrTokenExpired
@@ -170,6 +170,7 @@ func ParseToken(tokensString string) (claims *Claims, err error) {
 			return nil, &constant.ErrTokenUnknown
 		}
 	}
+	log.NewError(operationID, "redis token map not find", constant.ErrTokenUnknown)
 	return nil, &constant.ErrTokenUnknown
 }
 
@@ -195,7 +196,7 @@ func ParseRedisInterfaceToken(redisToken interface{}) (*Claims, error) {
 
 //Validation token, false means failure, true means successful verification
 func VerifyToken(token, uid string) (bool, error) {
-	claims, err := ParseToken(token)
+	claims, err := ParseToken(token, "")
 	if err != nil {
 		return false, err
 	}
@@ -207,7 +208,7 @@ func VerifyToken(token, uid string) (bool, error) {
 	return true, nil
 }
 func WsVerifyToken(token, uid string, platformID string) (bool, error, string) {
-	claims, err := ParseToken(token)
+	claims, err := ParseToken(token, "")
 	if err != nil {
 		return false, err, "parse token err"
 	}

pkg/common/utils/utils.go

@@ -118,6 +118,10 @@ func GroupMemberDBCopyOpenIM(dst *open_im_sdk.GroupMemberFullInfo, src *db.Group
 		dst.AppMangerLevel = 1
 	}
 	dst.JoinTime = int32(src.JoinTime.Unix())
+	if src.MuteEndTime.Unix() < 0 {
+		dst.JoinTime = 0
+		return nil
+	}
 	dst.MuteEndTime = uint32(src.MuteEndTime.Unix())
 	if dst.MuteEndTime < uint32(time.Now().Unix()) {
 		dst.MuteEndTime = 0