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

refactor: check_annotation.py重命名为validate_annotation.py

Browse Source
This commit is contained in:
insistence
2024-07-05 08:11:52 +08:00
parent cebbe90eac
commit d1cc297169
5 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ruoyi-fastapi-backend/module_admin/annotation/check_annotation.py → ruoyi-fastapi-backend/module_admin/annotation/validate_annotation.py
View File

@@ -70,9 +70,9 @@ class ValidateFields:
def __call__(self, func): def __call__(self, func):
@wraps(func) @wraps(func)
async def wrapper(*args, **kwargs): async def wrapper(*args, **kwargs):
check_model = kwargs.get(self.validate_model) validate_model = kwargs.get(self.validate_model)
if isinstance(check_model, BaseModel) and hasattr(check_model, self.validate_function): if isinstance(validate_model, BaseModel) and hasattr(validate_model, self.validate_function):
validate_function = getattr(check_model, self.validate_function, None) validate_function = getattr(validate_model, self.validate_function, None)
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)
@@ -106,9 +106,9 @@ class NetWork:
def __call__(self, func): def __call__(self, func):
@wraps(func) @wraps(func)
def wrapper(*args, **kwargs): def wrapper(*args, **kwargs):
check_model = args[0] validate_model = args[0]
if isinstance(check_model, BaseModel): if isinstance(validate_model, BaseModel):
field_value = getattr(check_model, self.field_name) field_value = getattr(validate_model, self.field_name)
try: try:
if self.field_type == 'AnyUrl': if self.field_type == 'AnyUrl':
NetWorkAnnotationModel(any_url=field_value) NetWorkAnnotationModel(any_url=field_value)
@@ -173,9 +173,9 @@ class NotBlank:
def __call__(self, func): def __call__(self, func):
@wraps(func) @wraps(func)
def wrapper(*args, **kwargs): def wrapper(*args, **kwargs):
check_model = args[0] validate_model = args[0]
if isinstance(check_model, BaseModel): if isinstance(validate_model, BaseModel):
field_value = getattr(check_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}不能为空')
return func(*args, **kwargs) return func(*args, **kwargs)
@@ -201,9 +201,9 @@ class Pattern:
def __call__(self, func): def __call__(self, func):
@wraps(func) @wraps(func)
def wrapper(*args, **kwargs): def wrapper(*args, **kwargs):
check_model = args[0] validate_model = args[0]
if isinstance(check_model, BaseModel): if isinstance(validate_model, BaseModel):
field_value = getattr(check_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}格式不正确')
return func(*args, **kwargs) return func(*args, **kwargs)
@@ -241,9 +241,9 @@ class Size:
def __call__(self, func): def __call__(self, func):
@wraps(func) @wraps(func)
def wrapper(*args, **kwargs): def wrapper(*args, **kwargs):
check_model = args[0] validate_model = args[0]
if isinstance(check_model, BaseModel): if isinstance(validate_model, BaseModel):
field_value = getattr(check_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:
raise FieldValidatorException(message=self.message if self.message else f'{self.field_name}必须大于{self.gt}') raise FieldValidatorException(message=self.message if self.message else f'{self.field_name}必须大于{self.gt}')
@@ -281,9 +281,9 @@ class Xss:
def __call__(self, func): def __call__(self, func):
@wraps(func) @wraps(func)
def wrapper(*args, **kwargs): def wrapper(*args, **kwargs):
check_model = args[0] validate_model = args[0]
if isinstance(check_model, BaseModel): if isinstance(validate_model, BaseModel):
field_value = getattr(check_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)
if pattern.search(field_value): if pattern.search(field_value):

2
ruoyi-fastapi-backend/module_admin/controller/post_controler.py
View File

@@ -5,8 +5,8 @@ from module_admin.service.login_service import LoginService, CurrentUserModel
from module_admin.service.post_service import * from module_admin.service.post_service import *
from module_admin.entity.vo.post_vo import * from module_admin.entity.vo.post_vo import *
from module_admin.aspect.interface_auth import CheckUserInterfaceAuth from module_admin.aspect.interface_auth import CheckUserInterfaceAuth
from module_admin.annotation.check_annotation import ValidateFields
from module_admin.annotation.log_annotation import log_decorator from module_admin.annotation.log_annotation import log_decorator
from module_admin.annotation.validate_annotation import ValidateFields
from config.enums import BusinessType from config.enums import BusinessType
from utils.response_util import * from utils.response_util import *
from utils.log_util import * from utils.log_util import *

2
ruoyi-fastapi-backend/module_admin/entity/vo/config_vo.py
View File

@@ -2,8 +2,8 @@ from pydantic import BaseModel, ConfigDict, Field
from pydantic.alias_generators import to_camel from pydantic.alias_generators import to_camel
from typing import Union, Optional, List from typing import Union, Optional, List
from datetime import datetime from datetime import datetime
from module_admin.annotation.check_annotation import NotBlank, Size
from module_admin.annotation.pydantic_annotation import as_query, as_form from module_admin.annotation.pydantic_annotation import as_query, as_form
from module_admin.annotation.validate_annotation import NotBlank, Size
class ConfigModel(BaseModel): class ConfigModel(BaseModel):

2
ruoyi-fastapi-backend/module_admin/entity/vo/dept_vo.py
View File

@@ -2,8 +2,8 @@ from pydantic import BaseModel, ConfigDict, Field
from pydantic.alias_generators import to_camel from pydantic.alias_generators import to_camel
from typing import Union, Optional, List, Literal from typing import Union, Optional, List, Literal
from datetime import datetime from datetime import datetime
from module_admin.annotation.check_annotation import NetWork, NotBlank, Size
from module_admin.annotation.pydantic_annotation import as_query from module_admin.annotation.pydantic_annotation import as_query
from module_admin.annotation.validate_annotation import NetWork, NotBlank, Size
class DeptModel(BaseModel): class DeptModel(BaseModel):

2
ruoyi-fastapi-backend/module_admin/entity/vo/post_vo.py
View File

@@ -2,8 +2,8 @@ from pydantic import BaseModel, ConfigDict, Field
from pydantic.alias_generators import to_camel from pydantic.alias_generators import to_camel
from typing import Union, Optional, List, Literal from typing import Union, Optional, List, Literal
from datetime import datetime from datetime import datetime
from module_admin.annotation.check_annotation import NotBlank, Size
from module_admin.annotation.pydantic_annotation import as_query, as_form from module_admin.annotation.pydantic_annotation import as_query, as_form
from module_admin.annotation.validate_annotation import NotBlank, Size
class PostModel(BaseModel): class PostModel(BaseModel):