liyunjia/chuanyue-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化校验流程

Browse Source
This commit is contained in:
李运家 2024-10-30 20:25:58 +08:00
parent 200e9e0e88
commit baccd91c50
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
library/src/model/validator.rs
View File

@ -1,7 +1,7 @@
use std::str::FromStr; use std::str::FromStr;
use i18n::{message, message_ids::MessageId}; use i18n::{message, message_ids::MessageId};
use validator::Validate; use validator::{Validate, ValidationErrors};
use crate::model::response::{ResData, ResErr, ResResult}; use crate::model::response::{ResData, ResErr, ResResult};
@ -15,21 +15,11 @@ pub fn validate_params(params: &impl Validate, local: &str) -> ResResult<ResData
for (_, err) in err.errors() { for (_, err) in err.errors() {
match err { match err {
validator::ValidationErrorsKind::Struct(err) => { validator::ValidationErrorsKind::Struct(err) => {
for (_field, errs) in err.field_errors() { pack_error_msg(&mut errors, err, local);
for e in errs {
let msg = e.message.clone().unwrap_or_default();
errors.push(message!(local, MessageId::from_str(msg.trim()).unwrap()));
}
}
}, },
validator::ValidationErrorsKind::List(err) => { validator::ValidationErrorsKind::List(err) => {
for (_, err) in err.iter() { for (_, err) in err.iter() {
for (_field, errs) in err.field_errors() { pack_error_msg(&mut errors, err, local);
for e in errs {
let msg = e.message.clone().unwrap_or_default();
errors.push(message!(local, MessageId::from_str(msg.trim()).unwrap()));
}
}
} }
}, },
validator::ValidationErrorsKind::Field(err) => { validator::ValidationErrorsKind::Field(err) => {
@ -43,4 +33,13 @@ pub fn validate_params(params: &impl Validate, local: &str) -> ResResult<ResData
Err(ResErr::params(errors.join(";"))) Err(ResErr::params(errors.join(";")))
}, },
} }
}
fn pack_error_msg(errors: & mut Vec<&str>, raw_errors: &Box<ValidationErrors>, local: &str) {
for (_field, errs) in raw_errors.field_errors() {
for e in errs {
let msg = e.message.clone().unwrap_or_default();
errors.push(message!(local, MessageId::from_str(msg.trim()).unwrap()));
}
}
} }