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

ruoyi-fastapi-backend/module_admin/annotation/validate_annotation.py

@@ -72,7 +72,7 @@ class ValidateFields:
         async def wrapper(*args, **kwargs):
             validate_model = kwargs.get(self.validate_model)
             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):
                     validate_function()
             return await func(*args, **kwargs)
@@ -107,8 +107,9 @@ class NetWork:
         @wraps(func)
         def wrapper(*args, **kwargs):
             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)
+                if field_value:
                     try:
                         if self.field_type == 'AnyUrl':
                             NetWorkAnnotationModel(any_url=field_value)
@@ -174,7 +175,7 @@ class NotBlank:
         @wraps(func)
         def wrapper(*args, **kwargs):
             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)
                 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}不能为空')
@@ -202,7 +203,7 @@ class Pattern:
         @wraps(func)
         def wrapper(*args, **kwargs):
             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)
                 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}格式不正确')
@@ -242,7 +243,7 @@ class Size:
         @wraps(func)
         def wrapper(*args, **kwargs):
             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)
                 if isinstance(field_value, float):
                     if self.gt is not None and field_value <= self.gt:
@@ -282,7 +283,7 @@ class Xss:
         @wraps(func)
         def wrapper(*args, **kwargs):
             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)
                 if not StringUtil.is_blank(field_value):
                     pattern = re.compile(self.HTML_PATTERN)