gateway/validator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化数据验证 #1

Merged
zhangdeman merged 2 commits from feature/upgrade into master 2024-09-25 17:17:44 +08:00
Conversation 0 Commits 2 Files Changed 3 +20 -17
3 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1fd13e1ce7 - Show all commits

29
run.go
View File

@ -23,9 +23,9 @@ import (
// Author : go_developer@163.com<白茶清欢> // Author : go_developer@163.com<白茶清欢>
// //
// Date : 14:18 2024/4/29 // Date : 14:18 2024/4/29
func RunForStruct(sourceData any, ruleList []*define.FieldRule) (map[string]any, error) { func RunForStruct(sourceData any, ruleList []*define.FieldRule, receiver any) error {
if nil == sourceData { if nil == sourceData {
return map[string]any{}, nil return nil
} }
byteData, _ := json.Marshal(sourceData) byteData, _ := json.Marshal(sourceData)
var ( var (
@ -36,12 +36,9 @@ func RunForStruct(sourceData any, ruleList []*define.FieldRule) (map[string]any,
d := json.NewDecoder(bytes.NewReader(byteData)) d := json.NewDecoder(bytes.NewReader(byteData))
d.UseNumber() d.UseNumber()
if err = d.Decode(&sourceMapData); nil != err { if err = d.Decode(&sourceMapData); nil != err {
return nil, err return err
} }
if err = Run(sourceMapData, ruleList); nil != err { return Run(sourceMapData, ruleList, receiver)
return nil, err
}
return sourceMapData, nil
} }
// Run 运行参数验证 // Run 运行参数验证
@ -49,7 +46,7 @@ func RunForStruct(sourceData any, ruleList []*define.FieldRule) (map[string]any,
// Author : go_developer@163.com<白茶清欢> // Author : go_developer@163.com<白茶清欢>
// //
// Date : 14:13 2024/4/29 // Date : 14:13 2024/4/29
func Run(sourceData map[string]any, ruleList []*define.FieldRule) error { func Run(sourceData map[string]any, ruleList []*define.FieldRule, receiver any) error {
for _, itemRule := range ruleList { for _, itemRule := range ruleList {
itemRule.DefaultValue = nil itemRule.DefaultValue = nil
} }
@ -57,11 +54,12 @@ func Run(sourceData map[string]any, ruleList []*define.FieldRule) error {
if nil != err { if nil != err {
return err return err
} }
sourceData = make(map[string]any) if nil != receiver {
d := json.NewDecoder(bytes.NewReader(byteData)) d := json.NewDecoder(bytes.NewReader(byteData))
d.UseNumber() d.UseNumber()
if err := d.Decode(&sourceData); nil != err { if err := d.Decode(&receiver); nil != err {
return err return err
}
} }
return nil return nil
} }
@ -76,6 +74,7 @@ func RunWithResult(sourceData map[string]any, ruleList []*define.FieldRule) ([]b
sourceData = make(map[string]any) sourceData = make(map[string]any)
} }
byteData, _ := json.Marshal(sourceData) byteData, _ := json.Marshal(sourceData)
resultByteData, _ := json.Marshal(sourceData)
for _, itemRule := range ruleList { for _, itemRule := range ruleList {
if len(itemRule.Path) == 0 { if len(itemRule.Path) == 0 {
// 未指定验证数据位置 // 未指定验证数据位置
@ -89,11 +88,11 @@ func RunWithResult(sourceData map[string]any, ruleList []*define.FieldRule) ([]b
} else { } else {
if !itemRule.DisableRewrite { if !itemRule.DisableRewrite {
// 更新数据 // 更新数据
byteData, _ = sjson.SetBytes(byteData, itemRule.Path, formatValue) resultByteData, _ = sjson.SetBytes(resultByteData, itemRule.Path, formatValue)
} }
} }
} }
return byteData, nil return resultByteData, nil
} }
// checkRuleConditionRequiredRule 校验有条件必传 // checkRuleConditionRequiredRule 校验有条件必传