v1

internal/erpserver/model/system/audit_log.go

@@ -7,14 +7,14 @@ import (
 	"strings"
 	"time"
 
-	"management/internal/erpserver/model/dto"
+	"management/internal/erpserver/model/system/request"
 )
 
 type AuditLogRepository interface {
 	Create(ctx context.Context, obj *AuditLog) error
 	BatchCreate(ctx context.Context, objs []*AuditLog) error
-	Count(ctx context.Context, filter dto.SearchDto) (int64, error)
-	List(ctx context.Context, q dto.SearchDto) ([]*AuditLog, error)
+	Count(ctx context.Context, filter request.ListAudit) (int64, error)
+	List(ctx context.Context, filter request.ListAudit) ([]*AuditLog, error)
 }
 
 type AuditLog struct {

internal/erpserver/model/system/config.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"management/internal/erpserver/model/dto"
+	"management/internal/erpserver/model/system/request"
 
 	"gorm.io/datatypes"
 )
@@ -15,8 +15,8 @@ type ConfigRepository interface {
 	Update(ctx context.Context, obj *Config) error
 	Get(ctx context.Context, id int32) (*Config, error)
 	GetByKey(ctx context.Context, key string) (*Config, error)
-	Count(ctx context.Context, filter dto.SearchDto) (int64, error)
-	List(ctx context.Context, filter dto.SearchDto) ([]*Config, error)
+	Count(ctx context.Context, filter request.ListConfig) (int64, error)
+	List(ctx context.Context, filter request.ListConfig) ([]*Config, error)
 }
 
 type Config struct {

internal/erpserver/model/system/login_log.go

@@ -4,14 +4,14 @@ import (
 	"context"
 	"time"
 
-	"management/internal/erpserver/model/dto"
+	"management/internal/erpserver/model/system/request"
 )
 
 type LoginLogRepository interface {
 	Create(ctx context.Context, obj *LoginLog) error
 	GetLatest(ctx context.Context, email string) ([]*LoginLog, error)
-	Count(ctx context.Context, filter dto.SearchDto) (int64, error)
-	List(ctx context.Context, filter dto.SearchDto) ([]*LoginLog, error)
+	Count(ctx context.Context, filter request.ListLoginLog) (int64, error)
+	List(ctx context.Context, filter request.ListLoginLog) ([]*LoginLog, error)
 	HistoricalLogin(ctx context.Context, email string, createdAt time.Time) ([]*LoginLog, error)
 }
 

internal/erpserver/model/system/request/audit.go

@@ -0,0 +1,9 @@
+package request
+
+type ListAudit struct {
+	PageID    int    `form:"page_id" binding:"required,min=1"`
+	PageSize  int    `form:"page_size" binding:"required,min=5,max=20"`
+	StartTime string `form:"start_time"`
+	EndTime   string `form:"end_time"`
+	Email     string `form:"email"`
+}

internal/erpserver/model/system/request/auth.go

@@ -0,0 +1,35 @@
+package request
+
+import (
+	"net/http"
+
+	"github.com/zhang2092/browser"
+)
+
+type Login struct {
+	Email     string `form:"email" binding:"required,email"`
+	Password  string `form:"password" binding:"required,min=6"`
+	Captcha   string `form:"captcha" binding:"required"`
+	CaptchaID string `form:"captcha_id" binding:"required"`
+
+	// 平台信息
+	Os       string
+	Ip       string
+	Browser  string
+	Referrer string
+	Url      string
+}
+
+func (login Login) SetAttributes(r *http.Request) Login {
+	login.Ip = r.RemoteAddr
+	login.Referrer = r.Header.Get("Referer")
+	login.Url = r.URL.RequestURI()
+
+	br, err := browser.NewBrowser(r.Header.Get("User-Agent"))
+	if err == nil {
+		login.Os = br.Platform().Name()
+		login.Browser = br.Name()
+	}
+
+	return login
+}

internal/erpserver/model/system/request/config.go

@@ -0,0 +1,18 @@
+package request
+
+type GetID struct {
+	ID int32 `uri:"id" binding:"required,min=1"`
+}
+
+type CreateAndUpdateConfig struct {
+	Key   string `json:"key" binding:"required"`
+	Value string `json:"value" binding:"required"`
+}
+
+type ListConfig struct {
+	PageID    int    `form:"page_id" binding:"required,min=1"`
+	PageSize  int    `form:"page_size" binding:"required,min=5,max=20"`
+	StartTime string `form:"start_time"`
+	EndTime   string `form:"end_time"`
+	Name      string `form:"name"`
+}

internal/erpserver/model/system/request/login_log.go

@@ -0,0 +1,9 @@
+package request
+
+type ListLoginLog struct {
+	PageID    int    `form:"page_id" binding:"required,min=1"`
+	PageSize  int    `form:"page_size" binding:"required,min=5,max=20"`
+	StartTime string `form:"start_time"`
+	EndTime   string `form:"end_time"`
+	Email     string `form:"email"`
+}

internal/erpserver/model/system/request/role.go

@@ -0,0 +1,30 @@
+package request
+
+type GetRoleID struct {
+	ID int32 `uri:"id" binding:"required,min=1"`
+}
+
+type CreateAndUpdateRole struct {
+	ID          int32  `json:"id"`
+	Name        string `json:"name" binding:"required"`
+	ParentID    *int32 `json:"parent_id" binding:"required"`
+	DisplayName string `json:"display_name" binding:"required"`
+	Sort        *int32 `json:"sort"`
+	Status      *int32 `json:"status" binding:"required"`
+}
+
+type SetMenu struct {
+	RoleID  int32   `json:"role_id" binding:"required"`
+	MenuIDs []int32 `json:"menu_ids" binding:"required"`
+}
+
+type ListRole struct {
+	PageID    int    `form:"page_id" binding:"required,min=1"`
+	PageSize  int    `form:"page_size" binding:"required,min=5,max=20"`
+	StartTime string `form:"start_time"`
+	EndTime   string `form:"end_time"`
+	Name      string `form:"name"`
+	ID        int64  `form:"id"`
+	Status    int    `form:"status"`
+	ParentID  int    `form:"parent_id"`
+}

internal/erpserver/model/system/role.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"management/internal/erpserver/model/dto"
+	"management/internal/erpserver/model/system/request"
 )
 
 type RoleRepository interface {
@@ -14,8 +14,8 @@ type RoleRepository interface {
 	Get(ctx context.Context, id int32) (*Role, error)
 	GetByVip(ctx context.Context, vip bool) (*Role, error)
 	All(ctx context.Context) ([]*Role, error)
-	Count(ctx context.Context, filter dto.SearchDto) (int64, error)
-	List(ctx context.Context, filter dto.SearchDto) ([]*Role, error)
+	Count(ctx context.Context, filter request.ListRole) (int64, error)
+	List(ctx context.Context, filter request.ListRole) ([]*Role, error)
 	RebuildParentPath(ctx context.Context) error
 }