epuiment

services/task/internal/logic/infoLogic.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"lone-services/pkg/modelbase"
 	"lone-services/pkg/utils"
+	"lone-services/pkg/validate"
 	product "lone-services/rpc/product/pb"
 	"lone-services/services/task/internal/dao"
 	"lone-services/services/task/internal/model"
-	"lone-services/services/task/validator"
 	"strconv"
 
 	"lone-services/rpc/task/pb"
@@ -32,7 +32,7 @@ func NewInfoLogic(ctx context.Context, svcCtx *svc.ServiceContext) *InfoLogic {
 }
 
 func (l *InfoLogic) Info(in *task.IdRequest) (*task.Response, error) {
-	var v validator.TaskInfoValidator
+	var v validate.InfoValidator
 	if fail := l.checkParams(in, &v); fail != nil {
 		return fail, nil
 	}

services/task/internal/logic/statusLogic.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"lone-services/pkg/modelbase"
 	"lone-services/pkg/utils"
+	"lone-services/pkg/validate"
 	"lone-services/services/task/internal/dao"
 	"lone-services/services/task/internal/model"
-	"lone-services/services/task/validator"
 	"strconv"
 
 	"lone-services/rpc/task/pb"
@@ -31,7 +31,7 @@ func NewStatusLogic(ctx context.Context, svcCtx *svc.ServiceContext) *StatusLogi
 }
 
 func (l *StatusLogic) Status(in *task.StatusRequest) (*task.Response, error) {
-	var v validator.TaskStatusValidator
+	var v validate.StatusValidator
 	if fail := l.checkParams(in, &v); fail != nil {
 		return fail, nil
 	}

services/task/validator/task.go

@@ -34,27 +34,12 @@ type TaskEditValidator struct {
 // GetMessage 提示消息
 func (p TaskEditValidator) GetMessage() validate.ValidatorMessages {
 	return validate.ValidatorMessages{
-		"Id.required":    "ID不能为空",
+		validate.FieldId: validate.FieldIdValue,
 		"Task.required":  "任务不能为空",
 		"Award.required": "奖励不能为空",
 	}
 }
 
-type TaskStatusValidator struct {
-	Id     int64  `form:"id" json:"id" validate:"required"`
-	Status int32  `form:"status" json:"status" validate:"required"`
-	Reason string `form:"reason" json:"reason" validate:"required_if=Status 2"`
-}
-
-// GetMessage 提示消息
-func (p TaskStatusValidator) GetMessage() validate.ValidatorMessages {
-	return validate.ValidatorMessages{
-		"Id.required":        "ID不能为空",
-		"Status.required":    "状态不能为空",
-		"Reason.required_if": "禁用状态，理由不能为空",
-	}
-}
-
 type TaskItemsValidator struct {
 	Page int32 `form:"page" json:"page"`
 	Size int32 `form:"size" json:"size"`
@@ -78,14 +63,3 @@ type TaskAccountItemsValidator struct {
 func (p TaskAccountItemsValidator) GetMessage() validate.ValidatorMessages {
 	return validate.ValidatorMessages{}
 }
-
-type TaskInfoValidator struct {
-	Id int64 `form:"id" json:"id" validate:"required"`
-}
-
-// GetMessage 提示消息
-func (p TaskInfoValidator) GetMessage() validate.ValidatorMessages {
-	return validate.ValidatorMessages{
-		"Id.required": "ID不能为空",
-	}
-}