改造成api

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

@@ -7,10 +7,10 @@ import (
 )
 
 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"`
+	Email     string `json:"email" binding:"required,email"`
+	Password  string `json:"password" binding:"required,min=6"`
+	Captcha   string `json:"captcha" binding:"required"`
+	CaptchaID string `json:"captcha_id" binding:"required"`
 
 	// 平台信息
 	Os       string

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

@@ -0,0 +1,29 @@
+package request
+
+type GetUserID struct {
+	ID int32 `uri:"id" binding:"required,min=1"`
+}
+
+type CreateAndUpdateUser struct {
+	ID             *int32 `form:"id"`
+	Email          string `form:"email" binding:"required,email"`
+	Username       string `form:"username" binding:"required"`
+	Password       string `form:"password" binding:"required,min=6"`
+	ChangePassword string `form:"change_password"`
+	Avatar         string `form:"File"`
+	Gender         int32  `form:"gender"`
+	DepartmentID   int32  `form:"department_id"`
+	RoleID         int32  `form:"role_id"`
+	Status         *int32 `form:"status" binding:"required"`
+}
+
+type ListUser 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"`
+	ID        int64  `form:"id"`
+	Name      string `form:"name"`
+	Email     string `form:"email"`
+	Status    int32  `form:"status"`
+}

internal/erpserver/model/system/user.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"management/internal/erpserver/model/dto"
+	"management/internal/erpserver/model/system/request"
 
 	"github.com/google/uuid"
 )
@@ -14,10 +14,11 @@ type UserRepository interface {
 	Create(ctx context.Context, obj *User) error
 	Update(ctx context.Context, obj *User) error
 	Get(ctx context.Context, id int32) (*User, error)
+	GetByUuid(ctx context.Context, uuid uuid.UUID) (*User, error)
 	GetByEmail(ctx context.Context, email string) (*User, error)
 	All(ctx context.Context) ([]*User, error)
-	Count(ctx context.Context, filter dto.SearchDto) (int64, error)
-	List(ctx context.Context, filter dto.SearchDto) ([]*User, error)
+	Count(ctx context.Context, filter request.ListUser) (int64, error)
+	List(ctx context.Context, filter request.ListUser) ([]*User, error)
 }
 
 type User struct {