chore: modify db param

Author: qloog

conf/config.sample.yaml

@@ -8,9 +8,9 @@ app:
 log:
   writers: file,stdout            # 有2个可选项：file,stdout, 可以两者同时选择输出位置，有2个可选项：file,stdout。选择file会将日志记录到logger_file指定的日志文件中，选择stdout会将日志输出到标准输出，当然也可以两者同时选择
   logger_level: DEBUG             # 日志级别，DEBUG, INFO, WARN, ERROR, FATAL
-  logger_file: /data/log/fastim.log   # 日志文件
-  logger_warn_file: /data/log/fastim.wf.log
-  logger_error_file: /data/log/fastim.err.log
+  logger_file: /data/logs/fastim.log   # 日志文件
+  logger_warn_file: /data/logs/fastim.wf.log
+  logger_error_file: /data/logs/fastim.err.log
   log_format_text: false          # 日志的输出格式，json或者plaintext，目前设置为false即可，暂时也只支持json格式
   log_rolling_policy: daily,      # rotate依据，可选的有：daily, hourly。如果选daily(默认)则根据天进行转存，如果是hourly则根据小时进行转存
   log_rotate_date: 1              # rotate转存时间，配合rollingPolicy: daily使用

handler/v1/user/login.go

@@ -5,8 +5,8 @@ import (
 	"github.com/1024casts/fastim/internal/model"
 	"github.com/1024casts/fastim/internal/service"
 	"github.com/1024casts/fastim/pkg/errno"
+	"github.com/1024casts/snake/pkg/log"
 	"github.com/gin-gonic/gin"
-	"github.com/lexkong/log"
 )
 
 // PhoneLogin 手机登录接口
@@ -43,7 +43,7 @@ func PhoneLogin(c *gin.Context) {
 	}
 
 	// 登录
-	t, err := service.UserSvc.PhoneLogin(c, req.Phone, req.VerifyCode)
+	t, err := service.NewUserService().PhoneLogin(c, req.Phone, req.VerifyCode)
 	if err != nil {
 		handler.SendResponse(c, errno.ErrVerifyCode, nil)
 		return

internal/dao/user_dao.go

@@ -3,6 +3,8 @@ package dao
 import (
 	"context"
 
+	"github.com/jinzhu/gorm"
+
 	"github.com/1024casts/fastim/internal/model"
 	"github.com/pkg/errors"
 )
@@ -14,10 +16,14 @@ type UserDao interface {
 	GetUserByPhone(ctx context.Context, phone int64) (*model.UserBaseModel, error)
 }
 
-type userDao struct{}
+type userDao struct {
+	db *gorm.DB
+}
 
-func NewUserDao() UserDao {
-	return &userDao{}
+func NewUserDao(db *gorm.DB) UserDao {
+	return &userDao{
+		db: db,
+	}
 }
 
 func (repo *userDao) CreateUser(user model.UserBaseModel) (id uint64, err error) {
@@ -48,8 +54,8 @@ func (repo *userDao) GetUsersByIds(ids []uint64) ([]*model.UserBaseModel, error)
 // GetUserByPhone 根据手机号获取用户
 func (repo *userDao) GetUserByPhone(ctx context.Context, phone int64) (*model.UserBaseModel, error) {
 	user := model.UserBaseModel{}
-	err := model.DB.Where("phone = ?", phone).First(&user).Error
-	if err != nil {
+	err := repo.db.Where("phone = ?", phone).First(&user).Error
+	if err != nil && err != gorm.ErrRecordNotFound {
 		return nil, errors.Wrap(err, "[user_repo] get user err by phone")
 	}
 

internal/service/im_service.go

@@ -61,8 +61,9 @@ type imService struct {
 }
 
 func NewIMService() IMService {
+	db := model.GetDB()
 	return &imService{
-		userRepo:    dao.NewUserDao(),
+		userRepo:    dao.NewUserDao(db),
 		chatMsgRepo: dao.NewCHatMsgDao(),
 	}
 }

internal/service/user_service.go

@@ -7,7 +7,6 @@ import (
 	"github.com/1024casts/fastim/internal/dao"
 	"github.com/1024casts/fastim/internal/model"
 	"github.com/1024casts/snake/pkg/token"
-	"github.com/jinzhu/gorm"
 	"github.com/pkg/errors"
 )
 
@@ -26,8 +25,9 @@ type userService struct {
 }
 
 func NewUserService() UserService {
+	db := model.GetDB()
 	return &userService{
-		userRepo: dao.NewUserDao(),
+		userRepo: dao.NewUserDao(db),
 	}
 }
 
@@ -51,7 +51,7 @@ func (srv *userService) GetUserById(id uint64) (*model.UserBaseModel, error) {
 
 func (srv *userService) GetUserByPhone(ctx context.Context, phone int64) (*model.UserBaseModel, error) {
 	userModel, err := srv.userRepo.GetUserByPhone(ctx, phone)
-	if err != nil || gorm.IsRecordNotFoundError(err) {
+	if err != nil {
 		return userModel, errors.Wrapf(err, "get user info err from db by phone: %d", phone)
 	}