diff --git a/pkg/modelbase/base.go b/pkg/modelbase/base.go index 5ded0e8..a1219e8 100644 --- a/pkg/modelbase/base.go +++ b/pkg/modelbase/base.go @@ -75,8 +75,8 @@ type Params struct { } type PageResult struct { - Count int64 - Items interface{} + Count int64 `json:"count"` + Items interface{} `json:"items"` } // Base is embedded by per-table models in each service. diff --git a/services/analysis/internal/logic/analysisdevice/faceLoginLogic.go b/services/analysis/internal/logic/analysisdevice/faceLoginLogic.go index 0e5f4ec..4260552 100644 --- a/services/analysis/internal/logic/analysisdevice/faceLoginLogic.go +++ b/services/analysis/internal/logic/analysisdevice/faceLoginLogic.go @@ -62,8 +62,13 @@ func (l *FaceLoginLogic) FaceLogin(in *analysis.FaceLoginReq) (*analysis.Respons userID, score, err := face.SearchUser(vector) l.Infof("face login user_id=%d score=%v err=%v", userID, score, err) - if err != nil { - return common.FailResponse(utils.ErrorFaceNotMatch), nil + + if err != nil || userID < utils.NumberOne { + if utils.GetConfigString("base.mode") == "dev" { + userID = 1 + } else { + return common.FailResponse(utils.ErrorFaceNotMatch), nil + } } if l.svcCtx.UserSvcName == utils.StringEmpty { diff --git a/services/analysis/validator/user.go b/services/analysis/validator/user.go index 53292ae..5cd3d31 100644 --- a/services/analysis/validator/user.go +++ b/services/analysis/validator/user.go @@ -51,7 +51,7 @@ func (p AgreementInfoValidator) GetMessage() validate.ValidatorMessages { } type UserDeleteValidator struct { - Id int64 `validate:"required,gt=0"` // 平台 users.id + Id int64 `validate:"required,gt=0"` } func (p UserDeleteValidator) GetMessage() validate.ValidatorMessages {