改造成api
This commit is contained in:
@@ -6,9 +6,9 @@ import (
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
"management/internal/erpserver/model/dto"
|
||||
"management/internal/erpserver/model/form"
|
||||
"management/internal/erpserver/model/system"
|
||||
"management/internal/erpserver/model/system/request"
|
||||
"management/internal/erpserver/model/view"
|
||||
"management/internal/erpserver/service/v1"
|
||||
"management/internal/pkg/crypto"
|
||||
@@ -44,7 +44,7 @@ func NewUserService(
|
||||
}
|
||||
}
|
||||
|
||||
func (s *userService) Create(ctx context.Context, req *form.User) error {
|
||||
func (s *userService) Create(ctx context.Context, req *request.CreateAndUpdateUser) error {
|
||||
salt, err := rand.String(10)
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -85,7 +85,7 @@ func (s *userService) Create(ctx context.Context, req *form.User) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *userService) Update(ctx context.Context, req *form.User) error {
|
||||
func (s *userService) Update(ctx context.Context, req *request.CreateAndUpdateUser) error {
|
||||
user, err := s.repo.Get(ctx, *req.ID)
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -113,7 +113,7 @@ func (s *userService) All(ctx context.Context) ([]*system.User, error) {
|
||||
return s.repo.All(ctx)
|
||||
}
|
||||
|
||||
func (s *userService) List(ctx context.Context, q dto.SearchDto) ([]*system.User, int64, error) {
|
||||
func (s *userService) List(ctx context.Context, q request.ListUser) ([]*system.User, int64, error) {
|
||||
count, err := s.repo.Count(ctx, q)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
@@ -136,6 +136,10 @@ func (s *userService) Get(ctx context.Context, id int32) (*system.User, error) {
|
||||
return s.repo.Get(ctx, id)
|
||||
}
|
||||
|
||||
func (s *userService) GetByUuid(ctx context.Context, uuid uuid.UUID) (*system.User, error) {
|
||||
return s.repo.GetByUuid(ctx, uuid)
|
||||
}
|
||||
|
||||
func (s *userService) GetByEmail(ctx context.Context, email string) (*system.User, error) {
|
||||
return s.repo.GetByEmail(ctx, email)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user