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

internal/common/check/conversation.go

@@ -31,5 +31,16 @@ func (c *ConversationChecker) getConn() (*grpc.ClientConn, error) {
 }
 
 func (c *ConversationChecker) GetSingleConversationRecvMsgOpt(ctx context.Context, userID, conversationID string) (int32, error) {
-	panic("implement me")
+	cc, err := c.getConn()
+	if err != nil {
+		return 0, err
+	}
+	var req conversation.GetConversationReq
+	req.OwnerUserID = userID
+	req.ConversationID = conversationID
+	sConversation, err := conversation.NewConversationClient(cc).GetConversation(ctx, &req)
+	if err != nil {
+		return 0, err
+	}
+	return sConversation.GetConversation().RecvMsgOpt, err
 }

internal/rpc/friend/black.go

@@ -7,17 +7,23 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/tokenverify"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/tracelog"
 	pbFriend "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/friend"
+	"time"
 )
 
 func (s *friendServer) GetPaginationBlacks(ctx context.Context, req *pbFriend.GetPaginationBlacksReq) (resp *pbFriend.GetPaginationBlacksResp, err error) {
-	resp = &pbFriend.GetPaginationBlacksResp{}
 	if err := s.userCheck.Access(ctx, req.UserID); err != nil {
 		return nil, err
 	}
-	blacks, total, err := s.BlackDatabase.FindOwnerBlacks(ctx, req.UserID, req.Pagination.PageNumber, req.Pagination.ShowNumber)
+	var pageNumber, showNumber int32
+	if req.Pagination != nil {
+		pageNumber = req.Pagination.PageNumber
+		showNumber = req.Pagination.ShowNumber
+	}
+	blacks, total, err := s.BlackDatabase.FindOwnerBlacks(ctx, req.UserID, pageNumber, showNumber)
 	if err != nil {
 		return nil, err
 	}
+	resp = &pbFriend.GetPaginationBlacksResp{}
 	resp.Blacks, err = (*convert.NewDBBlack(nil, s.RegisterCenter)).DB2PB(ctx, blacks)
 	if err != nil {
 		return nil, err
@@ -27,18 +33,17 @@ func (s *friendServer) GetPaginationBlacks(ctx context.Context, req *pbFriend.Ge
 }
 
 func (s *friendServer) IsBlack(ctx context.Context, req *pbFriend.IsBlackReq) (*pbFriend.IsBlackResp, error) {
-	resp := &pbFriend.IsBlackResp{}
 	in1, in2, err := s.BlackDatabase.CheckIn(ctx, req.UserID1, req.UserID2)
 	if err != nil {
 		return nil, err
 	}
+	resp := &pbFriend.IsBlackResp{}
 	resp.InUser1Blacks = in1
 	resp.InUser2Blacks = in2
 	return resp, nil
 }
 
 func (s *friendServer) RemoveBlack(ctx context.Context, req *pbFriend.RemoveBlackReq) (*pbFriend.RemoveBlackResp, error) {
-	resp := &pbFriend.RemoveBlackResp{}
 	if err := s.userCheck.Access(ctx, req.OwnerUserID); err != nil {
 		return nil, err
 	}
@@ -46,18 +51,17 @@ func (s *friendServer) RemoveBlack(ctx context.Context, req *pbFriend.RemoveBlac
 		return nil, err
 	}
 	s.notification.BlackDeletedNotification(ctx, req)
-	return resp, nil
+	return &pbFriend.RemoveBlackResp{}, nil
 }
 
 func (s *friendServer) AddBlack(ctx context.Context, req *pbFriend.AddBlackReq) (*pbFriend.AddBlackResp, error) {
-	resp := &pbFriend.AddBlackResp{}
 	if err := tokenverify.CheckAccessV3(ctx, req.OwnerUserID); err != nil {
 		return nil, err
 	}
-	black := relation.BlackModel{OwnerUserID: req.OwnerUserID, BlockUserID: req.BlackUserID, OperatorUserID: tracelog.GetOpUserID(ctx)}
+	black := relation.BlackModel{OwnerUserID: req.OwnerUserID, BlockUserID: req.BlackUserID, OperatorUserID: tracelog.GetOpUserID(ctx), CreateTime: time.Now()}
 	if err := s.BlackDatabase.Create(ctx, []*relation.BlackModel{&black}); err != nil {
 		return nil, err
 	}
 	s.notification.BlackAddedNotification(ctx, req)
-	return resp, nil
+	return &pbFriend.AddBlackResp{}, nil
 }

pkg/common/db/relation/mysql_init.go

@@ -1,8 +1,6 @@
 package relation
 
 import (
-	"context"
-	"errors"
 	"fmt"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
@@ -10,7 +8,6 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
 	mysqlDriver "github.com/go-sql-driver/mysql"
 	"gorm.io/driver/mysql"
-	gormUtils "gorm.io/gorm/utils"
 	"time"
 
 	"gorm.io/gorm"
@@ -40,7 +37,7 @@ func newMysqlGormDB() (*gorm.DB, error) {
 	}
 	dsn = fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8mb4&parseTime=true&loc=Local",
 		config.Config.Mysql.DBUserName, config.Config.Mysql.DBPassword, config.Config.Mysql.DBAddress[0], config.Config.Mysql.DBDatabaseName)
-	sqlLogger := NewSqlLogger(logger.LogLevel(config.Config.Mysql.LogLevel), true, time.Duration(config.Config.Mysql.SlowThreshold)*time.Millisecond)
+	sqlLogger := log.NewSqlLogger(logger.LogLevel(config.Config.Mysql.LogLevel), true, time.Duration(config.Config.Mysql.SlowThreshold)*time.Millisecond)
 	db, err = gorm.Open(mysql.Open(dsn), &gorm.Config{
 		Logger: sqlLogger,
 	})
@@ -77,66 +74,3 @@ func IsMysqlDuplicateKey(err error) bool {
 	}
 	return false
 }
-
-type SqlLogger struct {
-	LogLevel                  logger.LogLevel
-	IgnoreRecordNotFoundError bool
-	SlowThreshold             time.Duration
-}
-
-func NewSqlLogger(logLevel logger.LogLevel, ignoreRecordNotFoundError bool, slowThreshold time.Duration) *SqlLogger {
-	return &SqlLogger{
-		LogLevel:                  logLevel,
-		IgnoreRecordNotFoundError: ignoreRecordNotFoundError,
-		SlowThreshold:             slowThreshold,
-	}
-}
-
-func (l *SqlLogger) LogMode(logLevel logger.LogLevel) logger.Interface {
-	newLogger := *l
-	newLogger.LogLevel = logLevel
-	return &newLogger
-}
-
-func (SqlLogger) Info(ctx context.Context, msg string, args ...interface{}) {
-	log.ZInfo(ctx, msg, args)
-}
-
-func (SqlLogger) Warn(ctx context.Context, msg string, args ...interface{}) {
-	log.ZWarn(ctx, msg, nil, args)
-}
-
-func (SqlLogger) Error(ctx context.Context, msg string, args ...interface{}) {
-	log.ZError(ctx, msg, nil, args)
-}
-
-func (l SqlLogger) Trace(ctx context.Context, begin time.Time, fc func() (sql string, rowsAffected int64), err error) {
-	if l.LogLevel <= logger.Silent {
-		return
-	}
-	elapsed := time.Since(begin)
-	switch {
-	case err != nil && l.LogLevel >= logger.Error && (!errors.Is(err, gorm.ErrRecordNotFound) || !l.IgnoreRecordNotFoundError):
-		sql, rows := fc()
-		if rows == -1 {
-			log.ZError(ctx, "sql exec detail", err, "gorm", gormUtils.FileWithLineNum(), "time(ms)", float64(elapsed.Nanoseconds())/1e6, "sql", sql)
-		} else {
-			log.ZError(ctx, "sql exec detail", err, "gorm", gormUtils.FileWithLineNum(), "time(ms)", float64(elapsed.Nanoseconds())/1e6, "rows", rows, "sql", sql)
-		}
-	case elapsed > l.SlowThreshold && l.SlowThreshold != 0 && l.LogLevel >= logger.Warn:
-		sql, rows := fc()
-		slowLog := fmt.Sprintf("SLOW SQL >= %v", l.SlowThreshold)
-		if rows == -1 {
-			log.ZWarn(ctx, "sql exec detail", nil, "gorm", gormUtils.FileWithLineNum(), nil, "slow sql", slowLog, "time(ms)", float64(elapsed.Nanoseconds())/1e6, "sql", sql)
-		} else {
-			log.ZWarn(ctx, "sql exec detail", nil, "gorm", gormUtils.FileWithLineNum(), nil, "slow sql", slowLog, "time(ms)", float64(elapsed.Nanoseconds())/1e6, "rows", rows, "sql", sql)
-		}
-	case l.LogLevel == logger.Info:
-		sql, rows := fc()
-		if rows == -1 {
-			log.ZDebug(ctx, "sql exec detail", "gorm", gormUtils.FileWithLineNum(), "time(ms)", float64(elapsed.Nanoseconds())/1e6, "sql", sql)
-		} else {
-			log.ZDebug(ctx, "sql exec detail", "gorm", gormUtils.FileWithLineNum(), "time(ms)", float64(elapsed.Nanoseconds())/1e6, "rows", rows, "sql", sql)
-		}
-	}
-}

pkg/common/log/sql_logger.go

@@ -0,0 +1,74 @@
+package log
+
+import (
+	"context"
+	"fmt"
+	"github.com/pkg/errors"
+	"gorm.io/gorm"
+	gormLogger "gorm.io/gorm/logger"
+	gormUtils "gorm.io/gorm/utils"
+	"time"
+)
+
+type SqlLogger struct {
+	LogLevel                  gormLogger.LogLevel
+	IgnoreRecordNotFoundError bool
+	SlowThreshold             time.Duration
+}
+
+func NewSqlLogger(logLevel gormLogger.LogLevel, ignoreRecordNotFoundError bool, slowThreshold time.Duration) *SqlLogger {
+	return &SqlLogger{
+		LogLevel:                  logLevel,
+		IgnoreRecordNotFoundError: ignoreRecordNotFoundError,
+		SlowThreshold:             slowThreshold,
+	}
+}
+
+func (l *SqlLogger) LogMode(logLevel gormLogger.LogLevel) gormLogger.Interface {
+	newLogger := *l
+	newLogger.LogLevel = logLevel
+	return &newLogger
+}
+
+func (SqlLogger) Info(ctx context.Context, msg string, args ...interface{}) {
+	ZInfo(ctx, msg, args)
+}
+
+func (SqlLogger) Warn(ctx context.Context, msg string, args ...interface{}) {
+	ZWarn(ctx, msg, nil, args)
+}
+
+func (SqlLogger) Error(ctx context.Context, msg string, args ...interface{}) {
+	ZError(ctx, msg, nil, args)
+}
+
+func (l SqlLogger) Trace(ctx context.Context, begin time.Time, fc func() (sql string, rowsAffected int64), err error) {
+	if l.LogLevel <= gormLogger.Silent {
+		return
+	}
+	elapsed := time.Since(begin)
+	switch {
+	case err != nil && l.LogLevel >= gormLogger.Error && (!errors.Is(err, gorm.ErrRecordNotFound) || !l.IgnoreRecordNotFoundError):
+		sql, rows := fc()
+		if rows == -1 {
+			ZError(ctx, "sql exec detail", err, "gorm", gormUtils.FileWithLineNum(), "elapsed time", fmt.Sprintf("%f(ms)", float64(elapsed.Nanoseconds())/1e6), "sql", sql)
+		} else {
+			ZError(ctx, "sql exec detail", err, "gorm", gormUtils.FileWithLineNum(), "elapsed time", fmt.Sprintf("%f(ms)", float64(elapsed.Nanoseconds())/1e6), "rows", rows, "sql", sql)
+		}
+	case elapsed > l.SlowThreshold && l.SlowThreshold != 0 && l.LogLevel >= gormLogger.Warn:
+		sql, rows := fc()
+		slowLog := fmt.Sprintf("SLOW SQL >= %v", l.SlowThreshold)
+		if rows == -1 {
+			ZWarn(ctx, "sql exec detail", nil, "gorm", gormUtils.FileWithLineNum(), nil, "slow sql", slowLog, "elapsed time", fmt.Sprintf("%f(ms)", float64(elapsed.Nanoseconds())/1e6), "sql", sql)
+		} else {
+			ZWarn(ctx, "sql exec detail", nil, "gorm", gormUtils.FileWithLineNum(), nil, "slow sql", slowLog, "elapsed time", fmt.Sprintf("%f(ms)", float64(elapsed.Nanoseconds())/1e6), "rows", rows, "sql", sql)
+		}
+	case l.LogLevel == gormLogger.Info:
+		sql, rows := fc()
+		if rows == -1 {
+			ZDebug(ctx, "sql exec detail", "gorm", gormUtils.FileWithLineNum(), "elapsed time", fmt.Sprintf("%f(ms)", float64(elapsed.Nanoseconds())/1e6), "sql", sql)
+		} else {
+			ZDebug(ctx, "sql exec detail", "gorm", gormUtils.FileWithLineNum(), "elapsed time", fmt.Sprintf("%f(ms)", float64(elapsed.Nanoseconds())/1e6), "rows", rows, "sql", sql)
+		}
+	}
+}

pkg/common/log/zap.go

@@ -77,6 +77,7 @@ func (l *ZapLogger) cores() (zap.Option, error) {
 	c := zap.NewProductionEncoderConfig()
 	c.EncodeTime = zapcore.ISO8601TimeEncoder
 	c.EncodeDuration = zapcore.SecondsDurationEncoder
+	c.EncodeLevel = zapcore.CapitalLevelEncoder
 	c.MessageKey = "msg"
 	c.LevelKey = "level"
 	c.TimeKey = "time"