From bd7f6d2cfd99f53142a9cc84a4c9d1497b62b220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E8=8C=B6=E6=B8=85=E6=AC=A2?= Date: Wed, 19 Feb 2025 22:25:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=80=E5=A4=A7=E5=80=BC?= =?UTF-8?q?=E3=80=81=E6=9C=80=E5=B0=8F=E5=80=BC=E5=A4=84=E7=90=86=E7=BF=BB?= =?UTF-8?q?=E4=BA=86=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- generate.go | 8 ++++---- validate_rule.go | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/generate.go b/generate.go index d29622a..0799cca 100644 --- a/generate.go +++ b/generate.go @@ -554,8 +554,8 @@ func (g *Generate) AddComponentsSchema(rootSchemaName string, pkgPath string, in } else { // 当做默认基础类型, 默认不会出现 *map *[] convertBaseType, _ := g.realBaseType2SwaggerType(inputType.Field(i).Type.String()) - minVal := ValidateRule.Maximum(inputType.Field(i)) - maxVal := ValidateRule.Minimum(inputType.Field(i)) + maxVal := ValidateRule.Maximum(inputType.Field(i)) + minVal := ValidateRule.Minimum(inputType.Field(i)) g.docData.Components.Schemas[schemaName].Properties[propertyName] = &define.Property{ Type: convertBaseType, Format: inputType.Field(i).Type.String(), @@ -613,8 +613,8 @@ func (g *Generate) AddComponentsSchema(rootSchemaName string, pkgPath string, in g.docData.Components.Schemas[schemaName].Properties[propertyName] = g.anyTypeConfig(inputType.Field(i)) } else { convertBaseType, _ := g.realBaseType2SwaggerType(inputType.Field(i).Type.String()) - minVal := ValidateRule.Maximum(inputType.Field(i)) - maxVal := ValidateRule.Minimum(inputType.Field(i)) + maxVal := ValidateRule.Maximum(inputType.Field(i)) + minVal := ValidateRule.Minimum(inputType.Field(i)) g.docData.Components.Schemas[schemaName].Properties[propertyName] = &define.Property{ Type: convertBaseType, Format: inputType.Field(i).Type.String(), diff --git a/validate_rule.go b/validate_rule.go index b55fba5..9b2443e 100644 --- a/validate_rule.go +++ b/validate_rule.go @@ -126,8 +126,8 @@ func (r validateRule) Maximum(structField reflect.StructField) *int64 { ruleTable := r.getValidateRuleTable(structField) var ( err error - maxVal, gleVal int64 - maxStr, gleStr string + maxVal, lteVal int64 + maxStr, lteStr string maxStrExist, gleStrExist bool ) if maxStr, maxStrExist = ruleTable[consts.ValidatorRuleCommonMax.String()]; maxStrExist && len(maxStr) > 0 { @@ -135,9 +135,9 @@ func (r validateRule) Maximum(structField reflect.StructField) *int64 { panic("validate rule min val = " + maxStr + " : " + err.Error()) } } - if gleStr, gleStrExist = ruleTable[consts.ValidateRuleLte.String()]; gleStrExist && len(gleStr) > 0 { - if gleVal, err = strconv.ParseInt(gleStr, 10, 64); nil != err { - panic("validate rule gte val = " + gleStr + " : " + err.Error()) + if lteStr, gleStrExist = ruleTable[consts.ValidateRuleLte.String()]; gleStrExist && len(lteStr) > 0 { + if lteVal, err = strconv.ParseInt(lteStr, 10, 64); nil != err { + panic("validate rule gte val = " + lteStr + " : " + err.Error()) } } if !maxStrExist && !gleStrExist { @@ -145,15 +145,15 @@ func (r validateRule) Maximum(structField reflect.StructField) *int64 { return nil } if len(maxStr) > 0 { - if len(gleStr) > 0 { - if gleVal > maxVal { - return &gleVal + if len(lteStr) > 0 { + if lteVal > maxVal { + return <eVal } return &maxVal } return &maxVal } - return &gleVal + return <eVal } // getValidateRuleTable 解析验证规则表