v1
This commit is contained in:
@@ -10,8 +10,8 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"management/internal/erpserver/model/form"
|
||||
"management/internal/erpserver/model/system"
|
||||
"management/internal/erpserver/model/system/request"
|
||||
v1 "management/internal/erpserver/service/v1"
|
||||
"management/internal/pkg/crypto"
|
||||
"management/internal/pkg/know"
|
||||
@@ -98,7 +98,7 @@ func NewAuth(
|
||||
}
|
||||
}
|
||||
|
||||
func (a *Auth) Authenticate(ctx context.Context, req form.Login) (*RiskCheckResult, error) {
|
||||
func (a *Auth) Authenticate(ctx context.Context, req request.Login) (*RiskCheckResult, error) {
|
||||
l := system.NewLoginLog(req.Email, req.Os, req.Ip, req.Browser, req.Url, req.Referrer)
|
||||
|
||||
locked, duration, err := a.isAccountLocked(ctx, req.Email)
|
||||
|
||||
@@ -7,6 +7,7 @@ import (
|
||||
"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/pkg/cache"
|
||||
"management/internal/pkg/session"
|
||||
@@ -41,7 +42,7 @@ type ConfigService interface {
|
||||
Create(ctx context.Context, obj *system.Config) error
|
||||
Update(ctx context.Context, obj *system.Config) error
|
||||
Get(ctx context.Context, id int32) (*system.Config, error)
|
||||
List(ctx context.Context, q dto.SearchDto) ([]*system.Config, int64, error)
|
||||
List(ctx context.Context, q request.ListConfig) ([]*system.Config, int64, error)
|
||||
Pear(ctx context.Context) (*dto.PearConfig, error)
|
||||
|
||||
RefreshCache(ctx context.Context, key string) error
|
||||
@@ -62,7 +63,7 @@ type UserService interface {
|
||||
|
||||
type LoginLogService interface {
|
||||
Create(ctx context.Context, req *system.LoginLog) error
|
||||
List(ctx context.Context, q dto.SearchDto) ([]*system.LoginLog, int64, error)
|
||||
List(ctx context.Context, q request.ListLoginLog) ([]*system.LoginLog, int64, error)
|
||||
|
||||
LoginTime(ctx context.Context, email string) (dto.LoginTimeDto, error)
|
||||
LoginCount(ctx context.Context, email string) int64
|
||||
@@ -73,15 +74,15 @@ type LoginLogService interface {
|
||||
type AuditLogService interface {
|
||||
Create(ctx context.Context, req *system.AuditLog) error
|
||||
BatchCreate(ctx context.Context, objs []*system.AuditLog) error
|
||||
List(ctx context.Context, q dto.SearchDto) ([]*system.AuditLog, int64, error)
|
||||
List(ctx context.Context, q request.ListAudit) ([]*system.AuditLog, int64, error)
|
||||
}
|
||||
|
||||
type RoleService interface {
|
||||
Create(ctx context.Context, req *form.Role) error
|
||||
Update(ctx context.Context, req *form.Role) error
|
||||
Create(ctx context.Context, req *request.CreateAndUpdateRole) error
|
||||
Update(ctx context.Context, req *request.CreateAndUpdateRole) error
|
||||
Get(ctx context.Context, id int32) (*system.Role, error)
|
||||
All(ctx context.Context) ([]*system.Role, error)
|
||||
List(ctx context.Context, q dto.SearchDto) ([]*system.Role, int64, error)
|
||||
List(ctx context.Context, q request.ListRole) ([]*system.Role, int64, error)
|
||||
RefreshCache(ctx context.Context) error
|
||||
RebuildParentPath(ctx context.Context) error
|
||||
|
||||
|
||||
@@ -3,8 +3,8 @@ package system
|
||||
import (
|
||||
"context"
|
||||
|
||||
"management/internal/erpserver/model/dto"
|
||||
"management/internal/erpserver/model/system"
|
||||
"management/internal/erpserver/model/system/request"
|
||||
"management/internal/erpserver/service/v1"
|
||||
)
|
||||
|
||||
@@ -28,7 +28,7 @@ func (b *auditLogService) BatchCreate(ctx context.Context, objs []*system.AuditL
|
||||
return b.repo.BatchCreate(ctx, objs)
|
||||
}
|
||||
|
||||
func (b *auditLogService) List(ctx context.Context, q dto.SearchDto) ([]*system.AuditLog, int64, error) {
|
||||
func (b *auditLogService) List(ctx context.Context, q request.ListAudit) ([]*system.AuditLog, int64, error) {
|
||||
count, err := b.repo.Count(ctx, q)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
|
||||
@@ -8,6 +8,7 @@ import (
|
||||
|
||||
"management/internal/erpserver/model/dto"
|
||||
"management/internal/erpserver/model/system"
|
||||
"management/internal/erpserver/model/system/request"
|
||||
"management/internal/erpserver/service/util"
|
||||
"management/internal/erpserver/service/v1"
|
||||
"management/internal/pkg/know"
|
||||
@@ -40,7 +41,7 @@ func (s *configService) Get(ctx context.Context, id int32) (*system.Config, erro
|
||||
return s.repo.Get(ctx, id)
|
||||
}
|
||||
|
||||
func (s *configService) List(ctx context.Context, q dto.SearchDto) ([]*system.Config, int64, error) {
|
||||
func (s *configService) List(ctx context.Context, q request.ListConfig) ([]*system.Config, int64, error) {
|
||||
count, err := s.repo.Count(ctx, q)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
|
||||
@@ -6,6 +6,7 @@ import (
|
||||
|
||||
"management/internal/erpserver/model/dto"
|
||||
"management/internal/erpserver/model/system"
|
||||
"management/internal/erpserver/model/system/request"
|
||||
"management/internal/erpserver/service/v1"
|
||||
)
|
||||
|
||||
@@ -25,7 +26,7 @@ func (s *loginLogService) Create(ctx context.Context, req *system.LoginLog) erro
|
||||
return s.repo.Create(ctx, req)
|
||||
}
|
||||
|
||||
func (s *loginLogService) List(ctx context.Context, q dto.SearchDto) ([]*system.LoginLog, int64, error) {
|
||||
func (s *loginLogService) List(ctx context.Context, q request.ListLoginLog) ([]*system.LoginLog, int64, error) {
|
||||
count, err := s.repo.Count(ctx, q)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
@@ -56,8 +57,8 @@ func (s *loginLogService) LoginTime(ctx context.Context, email string) (dto.Logi
|
||||
}
|
||||
|
||||
func (s *loginLogService) LoginCount(ctx context.Context, email string) int64 {
|
||||
count, err := s.repo.Count(ctx, dto.SearchDto{
|
||||
SearchEmail: email,
|
||||
count, err := s.repo.Count(ctx, request.ListLoginLog{
|
||||
Email: email,
|
||||
})
|
||||
if err != nil {
|
||||
return 0
|
||||
|
||||
@@ -7,9 +7,8 @@ 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/util"
|
||||
"management/internal/erpserver/service/v1"
|
||||
@@ -30,7 +29,7 @@ func NewRoleService(service *v1.Service, repo system.RoleRepository) v1.RoleServ
|
||||
}
|
||||
}
|
||||
|
||||
func (s *roleService) Create(ctx context.Context, req *form.Role) error {
|
||||
func (s *roleService) Create(ctx context.Context, req *request.CreateAndUpdateRole) error {
|
||||
parent := &system.Role{
|
||||
ID: 0,
|
||||
ParentID: 0,
|
||||
@@ -70,7 +69,7 @@ func (s *roleService) Create(ctx context.Context, req *form.Role) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *roleService) Update(ctx context.Context, req *form.Role) error {
|
||||
func (s *roleService) Update(ctx context.Context, req *request.CreateAndUpdateRole) error {
|
||||
parent := &system.Role{
|
||||
ID: 0,
|
||||
ParentID: 0,
|
||||
@@ -84,7 +83,7 @@ func (s *roleService) Update(ctx context.Context, req *form.Role) error {
|
||||
}
|
||||
}
|
||||
|
||||
role, err := s.repo.Get(ctx, *req.ID)
|
||||
role, err := s.repo.Get(ctx, req.ID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -117,7 +116,7 @@ func (s *roleService) All(ctx context.Context) ([]*system.Role, error) {
|
||||
return res, err
|
||||
}
|
||||
|
||||
func (s *roleService) List(ctx context.Context, q dto.SearchDto) ([]*system.Role, int64, error) {
|
||||
func (s *roleService) List(ctx context.Context, q request.ListRole) ([]*system.Role, int64, error) {
|
||||
count, err := s.repo.Count(ctx, q)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
|
||||
Reference in New Issue
Block a user