1

internal/erpserver/biz/biz.go

@@ -9,6 +9,7 @@ import (
 	incomev1 "management/internal/erpserver/biz/v1/income"
 	projectv1 "management/internal/erpserver/biz/v1/project"
 	systemv1 "management/internal/erpserver/biz/v1/system"
+	"management/internal/erpserver/store"
 	"management/internal/pkg/redis"
 	"management/internal/pkg/session"
 )
@@ -33,20 +34,22 @@ type IBiz interface {
 
 // biz 是 IBiz 的一个具体实现.
 type biz struct {
-	store   db.Store
-	redis   redis.IRedis
-	session session.ISession
+	database store.IStore
+	store    db.Store
+	redis    redis.IRedis
+	session  session.ISession
 }
 
 // 确保 biz 实现了 IBiz 接口.
 var _ IBiz = (*biz)(nil)
 
 // NewBiz 创建一个 IBiz 类型的实例.
-func NewBiz(store db.Store, redis redis.IRedis, session session.ISession) *biz {
+func NewBiz(database store.IStore, store db.Store, redis redis.IRedis, session session.ISession) *biz {
 	return &biz{
-		store:   store,
-		redis:   redis,
-		session: session,
+		database: database,
+		store:    store,
+		redis:    redis,
+		session:  session,
 	}
 }
 
@@ -57,7 +60,7 @@ func (b *biz) CommonV1() commonv1.CommonBiz {
 
 // SystemV1 返回一个实现了 SystemBiz 接口的实例.
 func (b *biz) SystemV1() systemv1.SystemBiz {
-	return systemv1.New(b.store, b.redis, b.session)
+	return systemv1.New(b.database, b.store, b.redis, b.session)
 }
 
 func (b *biz) ProjectV1() projectv1.ProjectBiz {

internal/erpserver/biz/v1/system/system.go

@@ -2,6 +2,7 @@ package system
 
 import (
 	db "management/internal/db/sqlc"
+	"management/internal/erpserver/store"
 	"management/internal/pkg/redis"
 	"management/internal/pkg/session"
 )
@@ -18,23 +19,25 @@ type SystemBiz interface {
 }
 
 type systemBiz struct {
-	store   db.Store
-	redis   redis.IRedis
-	session session.ISession
+	database store.IStore
+	store    db.Store
+	redis    redis.IRedis
+	session  session.ISession
 }
 
 var _ SystemBiz = (*systemBiz)(nil)
 
-func New(store db.Store, redis redis.IRedis, session session.ISession) *systemBiz {
+func New(database store.IStore, store db.Store, redis redis.IRedis, session session.ISession) *systemBiz {
 	return &systemBiz{
-		store:   store,
-		redis:   redis,
-		session: session,
+		database: database,
+		store:    store,
+		redis:    redis,
+		session:  session,
 	}
 }
 
 func (b *systemBiz) UserBiz() UserBiz {
-	return NewUser(b.store, b.session)
+	return NewUser(b.database, b.store, b.session)
 }
 
 func (b *systemBiz) MenuBiz() MenuBiz {

internal/erpserver/biz/v1/system/user.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"strconv"
 	"time"
 
@@ -11,6 +12,7 @@ import (
 	db "management/internal/db/sqlc"
 	"management/internal/erpserver/model/form"
 	"management/internal/erpserver/model/view"
+	"management/internal/erpserver/store"
 	"management/internal/pkg/crypto"
 	"management/internal/pkg/know"
 	"management/internal/pkg/rand"
@@ -39,17 +41,19 @@ type UserExpansion interface {
 
 // userBiz 是 UserBiz 接口的实现.
 type userBiz struct {
-	store   db.Store
-	session session.ISession
+	database store.IStore
+	store    db.Store
+	session  session.ISession
 }
 
 // 确保 userBiz 实现了 UserBiz 接口.
 var _ UserBiz = (*userBiz)(nil)
 
-func NewUser(store db.Store, session session.ISession) *userBiz {
+func NewUser(database store.IStore, store db.Store, session session.ISession) *userBiz {
 	return &userBiz{
-		store:   store,
-		session: session,
+		database: database,
+		store:    store,
+		session:  session,
 	}
 }
 
@@ -190,12 +194,14 @@ func (b *userBiz) Login(ctx context.Context, req *form.Login) error {
 		Browser:    req.Browser,
 	}
 
-	user, err := b.store.GetSysUserByEmail(ctx, req.Email)
+	user, err := b.database.User().GetByEmail(ctx, req.Email)
+	// user, err = b.store.GetSysUserByEmail(ctx, req.Email)
 	if err != nil {
 		log.Message = err.Error()
 		_ = b.store.CreateSysUserLoginLog(ctx, log)
 		return err
 	}
+	fmt.Printf("%+v", user)
 	log.UserUuid = user.Uuid
 	log.Username = user.Username