PowLu/RuoYi-Vue3-FastAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf: 优化validate_annotation中各装饰器逻辑

Browse Source
This commit is contained in:
insistence
2024-07-05 12:50:36 +08:00
parent 9f09d37936
commit ffc932951b
1 changed files with 50 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ruoyi-fastapi-backend/module_admin/annotation/validate_annotation.py
View File

@@ -72,7 +72,7 @@ class ValidateFields:
async def wrapper(*args, **kwargs): async def wrapper(*args, **kwargs):
validate_model = kwargs.get(self.validate_model) validate_model = kwargs.get(self.validate_model)
if isinstance(validate_model, BaseModel) and hasattr(validate_model, self.validate_function): if isinstance(validate_model, BaseModel) and hasattr(validate_model, self.validate_function):
validate_function = getattr(validate_model, self.validate_function, None) validate_function = getattr(validate_model, self.validate_function)
if validate_function is not None and callable(validate_function): if validate_function is not None and callable(validate_function):
validate_function() validate_function()
return await func(*args, **kwargs) return await func(*args, **kwargs)
@@ -107,8 +107,9 @@ class NetWork:
@wraps(func) @wraps(func)
def wrapper(*args, **kwargs): def wrapper(*args, **kwargs):
validate_model = args[0] validate_model = args[0]
if isinstance(validate_model, BaseModel): if isinstance(validate_model, BaseModel) and hasattr(validate_model, self.field_name):
field_value = getattr(validate_model, self.field_name) field_value = getattr(validate_model, self.field_name)
if field_value:
try: try:
if self.field_type == 'AnyUrl': if self.field_type == 'AnyUrl':
NetWorkAnnotationModel(any_url=field_value) NetWorkAnnotationModel(any_url=field_value)
@@ -174,7 +175,7 @@ class NotBlank:
@wraps(func) @wraps(func)
def wrapper(*args, **kwargs): def wrapper(*args, **kwargs):
validate_model = args[0] validate_model = args[0]
if isinstance(validate_model, BaseModel): if isinstance(validate_model, BaseModel) and hasattr(validate_model, self.field_name):
field_value = getattr(validate_model, self.field_name) field_value = getattr(validate_model, self.field_name)
if field_value is None or field_value == '' or field_value == [] or field_value == () or field_value == {}: if field_value is None or field_value == '' or field_value == [] or field_value == () or field_value == {}:
raise FieldValidatorException(message=self.message if self.message else f'{self.field_name}不能为空') raise FieldValidatorException(message=self.message if self.message else f'{self.field_name}不能为空')
@@ -202,7 +203,7 @@ class Pattern:
@wraps(func) @wraps(func)
def wrapper(*args, **kwargs): def wrapper(*args, **kwargs):
validate_model = args[0] validate_model = args[0]
if isinstance(validate_model, BaseModel): if isinstance(validate_model, BaseModel) and hasattr(validate_model, self.field_name):
field_value = getattr(validate_model, self.field_name) field_value = getattr(validate_model, self.field_name)
if isinstance(field_value, str) and not re.match(self.regexp, field_value): if isinstance(field_value, str) and not re.match(self.regexp, field_value):
raise FieldValidatorException(message=self.message if self.message else f'{self.field_name}格式不正确') raise FieldValidatorException(message=self.message if self.message else f'{self.field_name}格式不正确')
@@ -242,7 +243,7 @@ class Size:
@wraps(func) @wraps(func)
def wrapper(*args, **kwargs): def wrapper(*args, **kwargs):
validate_model = args[0] validate_model = args[0]
if isinstance(validate_model, BaseModel): if isinstance(validate_model, BaseModel) and hasattr(validate_model, self.field_name):
field_value = getattr(validate_model, self.field_name) field_value = getattr(validate_model, self.field_name)
if isinstance(field_value, float): if isinstance(field_value, float):
if self.gt is not None and field_value <= self.gt: if self.gt is not None and field_value <= self.gt:
@@ -282,7 +283,7 @@ class Xss:
@wraps(func) @wraps(func)
def wrapper(*args, **kwargs): def wrapper(*args, **kwargs):
validate_model = args[0] validate_model = args[0]
if isinstance(validate_model, BaseModel): if isinstance(validate_model, BaseModel) and hasattr(validate_model, self.field_name):
field_value = getattr(validate_model, self.field_name) field_value = getattr(validate_model, self.field_name)
if not StringUtil.is_blank(field_value): if not StringUtil.is_blank(field_value):
pattern = re.compile(self.HTML_PATTERN) pattern = re.compile(self.HTML_PATTERN)