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 解析验证规则表