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

pkg/common/constant/error.go

@@ -9,7 +9,7 @@ type ErrInfo struct {
 }
 
 var (
-	OK = ErrInfo{0, ""}
+	OK        = ErrInfo{0, ""}
 	ErrServer = ErrInfo{500, "server error"}
 
 	//	ErrMysql             = ErrInfo{100, ""}
@@ -47,10 +47,11 @@ var (
 	ErrTokenMalformed   = ErrInfo{703, TokenMalformedMsg.Error()}
 	ErrTokenNotValidYet = ErrInfo{704, TokenNotValidYetMsg.Error()}
 	ErrTokenUnknown     = ErrInfo{705, TokenUnknownMsg.Error()}
+	ErrTokenKicked      = ErrInfo{706, TokenUserKickedMsg.Error()}
 
-	ErrAccess = ErrInfo{ErrCode: 801, ErrMsg: AccessMsg.Error()}
-	ErrDB     = ErrInfo{ErrCode: 802, ErrMsg: DBMsg.Error()}
-	ErrArgs   = ErrInfo{ErrCode: 8003, ErrMsg: ArgsMsg.Error()}
+	ErrAccess   = ErrInfo{ErrCode: 801, ErrMsg: AccessMsg.Error()}
+	ErrDB       = ErrInfo{ErrCode: 802, ErrMsg: DBMsg.Error()}
+	ErrArgs     = ErrInfo{ErrCode: 8003, ErrMsg: ArgsMsg.Error()}
 	ErrCallback = ErrInfo{ErrCode: 809, ErrMsg: CallBackMsg.Error()}
 )
 
@@ -61,11 +62,11 @@ var (
 	TokenNotValidYetMsg = errors.New("token not active yet")
 	TokenMalformedMsg   = errors.New("that's not even a token")
 	TokenUnknownMsg     = errors.New("couldn't handle this token")
-
-	AccessMsg = errors.New("no permission")
-	DBMsg     = errors.New("db failed")
-	ArgsMsg   = errors.New("args failed")
-	CallBackMsg = errors.New("callback failed")
+	TokenUserKickedMsg  = errors.New("user has been kicked")
+	AccessMsg           = errors.New("no permission")
+	DBMsg               = errors.New("db failed")
+	ArgsMsg             = errors.New("args failed")
+	CallBackMsg         = errors.New("callback failed")
 
 	ThirdPartyMsg = errors.New("third party error")
 )
@@ -90,7 +91,7 @@ const (
 	IntentionalError     = 10007
 )
 
-func (e ErrInfo) Error() string {
+func (e *ErrInfo) Error() string {
 	return e.ErrMsg
 }
 

pkg/common/db/model.go

@@ -17,15 +17,14 @@ import (
 	//"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
 	//	"go.mongodb.org/mongo-driver/mongo/options"
-
 )
 
 var DB DataBases
 
 type DataBases struct {
-	MysqlDB    mysqlDB
-	mgoSession *mgo.Session
-	redisPool  *redis.Pool
+	MysqlDB     mysqlDB
+	mgoSession  *mgo.Session
+	redisPool   *redis.Pool
 	mongoClient *mongo.Client
 }
 
@@ -42,12 +41,12 @@ func init() {
 	// mongo init
 	// "mongodb://sysop:moon@localhost/records"
 	uri := "mongodb://sample.host:27017/?maxPoolSize=20&w=majority"
-	uri = fmt.Sprintf("mongodb://%s/%s/?maxPoolSize=%d",
-		config.Config.Mongo.DBAddress[0],config.Config.Mongo.DBDatabase,
+	uri = fmt.Sprintf("mongodb://%s/%s/?connect=direct&maxPoolSize=%d",
+		config.Config.Mongo.DBAddress[0], config.Config.Mongo.DBDatabase,
 		config.Config.Mongo.DBMaxPoolSize)
 
 	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/token_verify/jwt_token.go

@@ -129,9 +129,10 @@ func CheckAccess(OpUserID string, OwnerUserID string) bool {
 	return false
 }
 
-func GetUserIDFromToken(token string) (bool, string) {
+func GetUserIDFromToken(token string, operationID string) (bool, string) {
 	claims, err := ParseToken(token)
 	if err != nil {
+		log.Error(operationID, "ParseToken failed, ", err.Error(), token)
 		return false, ""
 	}
 	return true, claims.UID
@@ -162,7 +163,7 @@ func ParseToken(tokensString string) (claims *Claims, err error) {
 		case constant.InValidToken:
 			return nil, &constant.ErrTokenInvalid
 		case constant.KickedToken:
-			return nil, &constant.ErrTokenInvalid
+			return nil, &constant.ErrTokenKicked
 		case constant.ExpiredToken:
 			return nil, &constant.ErrTokenExpired
 		default: