rainycode 1.5.4__tar.gz → 1.5.5__tar.gz

{rainycode-1.5.4 → rainycode-1.5.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rainycode
-Version: 1.5.4
+Version: 1.5.5
 Summary: FastAPI base modules
 Requires-Python: >=3.10
 Requires-Dist: aerich==0.9.2

{rainycode-1.5.4 → rainycode-1.5.5}/common_base/exception.py

@@ -1,18 +1,19 @@
 from typing import cast
 
-from common_base.logging import logger
-from common_base.response import ErrorReturn
 from fastapi import HTTPException, Request, status
 from fastapi.exceptions import RequestValidationError, ResponseValidationError
 from starlette.responses import JSONResponse
 
+from common_base.logging import logger
+from common_base.response import ErrorReturn
+
 
 class CustomException(Exception):
     """自定义异常"""
     def __init__(
-        self, 
+        self,
         msg: str | None = None,
-        code: int = 0, 
+        code: int = -1,
         data: object | None = None,
         status_code: int = status.HTTP_500_INTERNAL_SERVER_ERROR
     ) -> None:
@@ -41,10 +42,11 @@ async def RequestValidationHandle(request: Request, exc: RequestValidationError)
     """请求参数验证异常处理器"""
     error_mapping = {
         "Field required": "请求失败，缺少必填项！",
-        "value is not a valid list": "类型错误，提交参数应该为列表！", 
+        "value is not a valid list": "类型错误，提交参数应该为列表！",
         "value is not a valid int": "类型错误，提交参数应该为整数！",
         "value could not be parsed to a boolean": "类型错误，提交参数应该为布尔值！",
-        "Input should be a valid list": "类型错误，输入应该是一个有效的列表！"
+        "Input should be a valid list": "类型错误，输入应该是一个有效的列表！",
+        "String should have at least 6 characters": "密码长度不能小于6位！"
     }
     msg = error_mapping.get(exc.errors()[0].get('msg'), exc.errors()[0].get('msg'))
     logger.error(f"请求地址: {request.url}, 错误信息: {msg}, 错误详情: {exc}")

{rainycode-1.5.4 → rainycode-1.5.5}/common_depends/auth_depend.py

@@ -1,5 +1,8 @@
 import json
 
+from fastapi import Depends, Request
+from fastapi.security import OAuth2PasswordBearer, SecurityScopes
+
 from common_base.consts import (
     REDIS_PREFIX_BLOCKLIST,
     REDIS_PREFIX_USER_INFO,
@@ -9,8 +12,6 @@ from common_models.user_model import User
 from common_utils.jwt_util import JwtUtil
 from core.databases.aioredis import AioRedis
 from core.start import base_config
-from fastapi import Depends, Request
-from fastapi.security import OAuth2PasswordBearer, SecurityScopes
 
 oauth2_scheme = OAuth2PasswordBearer(tokenUrl=f"/api/{base_config.app_name}/auth/login", auto_error=False)
 
@@ -20,15 +21,15 @@ async def get_current_user(request: Request, token: str, security_scopes: Securi
     """
     payload = JwtUtil.decode_token(token)
     if not payload:
-        raise CustomException(msg="无效的令牌")
+        raise CustomException(msg="无效的令牌", status_code=401)
 
     # 检查是否在黑名单中
     if await AioRedis.get(f"{REDIS_PREFIX_BLOCKLIST}{token}"):
-        raise CustomException(msg="令牌已失效")
+        raise CustomException(msg="令牌已失效", status_code=401)
 
     user_id = payload.get("sub")
     if not user_id:
-        raise CustomException(msg="无效的令牌")
+        raise CustomException(msg="无效的令牌", status_code=401)
 
     # 1. 尝试从缓存获取
     user = None
@@ -65,7 +66,7 @@ async def get_current_user(request: Request, token: str, security_scopes: Securi
 async def login_require(request: Request, security_scopes: SecurityScopes, token=Depends(oauth2_scheme)) -> User:
     """获取用户，获取不到报错"""
     if not token:
-        raise CustomException('请先登录')
+        raise CustomException('请先登录', status_code=401)
 
     return await get_current_user(request, token, security_scopes)
 

{rainycode-1.5.4 → rainycode-1.5.5}/common_servers/service/auth_svc.py

@@ -106,11 +106,11 @@ class AuthService:
         """
         user_id = await AioRedis.get(f"{REDIS_PREFIX_REFRESH_TOKEN}{refresh_token}")
         if not user_id:
-            raise CustomException(msg="无效或已过期的刷新令牌")
+            raise CustomException(msg="无效或已过期的刷新令牌", status_code=401)
         try:
             user_id = int(user_id)
         except (ValueError, TypeError):
-            raise CustomException(msg="无效的刷新令牌")
+            raise CustomException(msg="无效的刷新令牌", status_code=401) from None
 
         user = await User.get_or_none(id=user_id)
         if not user or not user.is_active:
@@ -209,8 +209,8 @@ class AuthService:
             cached_data = json.loads(cache_value)
             redirect_uri = cached_data.get("redirect_uri")
             app_pk = cached_data.get("app_pk")
-        except (json.JSONDecodeError, TypeError):
-            raise CustomException(msg="授权数据格式错误")
+        except (json.JSONDecodeError, TypeError) as e:
+            raise CustomException(msg="授权数据格式错误") from e
 
         if not redirect_uri or not app_pk:
             raise CustomException(msg="授权数据不完整")

{rainycode-1.5.4 → rainycode-1.5.5}/common_utils/snowflake_util.py

@@ -144,7 +144,7 @@ def get_machine_info() -> tuple[int, int]:
         
         return datacenter_id, machine_id
     except Exception as e:
-        raise RuntimeError(f"获取机器信息失败: {e}")
+        raise RuntimeError(f"获取机器信息失败: {e}") from e
 
 
 # 单例模式，默认实例

{rainycode-1.5.4 → rainycode-1.5.5}/common_utils/wechat_util.py

@@ -50,9 +50,9 @@ class WechatUtil:
             return data
         except Exception as e:
             if isinstance(e, CustomException):
-                raise e
+                raise e from e
             logger.error(f"Wechat API request error: {e}")
-            raise CustomException(msg="微信服务暂时不可用")
+            raise CustomException(msg="微信服务暂时不可用") from None
 
     @classmethod
     async def get_oauth_access_token(cls, appid: str, secret: str, code: str) -> dict:
@@ -116,4 +116,4 @@ class WechatUtil:
             return data
         except Exception as e:
             logger.error(f"Decrypt wechat data failed: {e}")
-            raise CustomException(msg="微信数据解密失败")
+            raise CustomException(msg="微信数据解密失败") from None

{rainycode-1.5.4 → rainycode-1.5.5}/core/base_config.py

@@ -28,7 +28,7 @@ class BaseConfig(BaseSettings):
     jwt_secret_key: str = "bgb0tnl9d58+6n-6h-ea&u^1#s0ccp!794=krylacjq75vzps$"
 
     # Access Token 有效期
-    access_token_expire_minutes: int = 30
+    access_token_expire_minutes: int = 1440
     # Refresh Token 有效期
     refresh_token_expire_days: int = 30
 

{rainycode-1.5.4 → rainycode-1.5.5}/core/start.py

@@ -59,7 +59,7 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[Any, Any]:
         logger.info(f'【{config.app_title}】服务成功启动...')
     except Exception as e:
         logger.error(f'【{config.app_title}】服务启动失败: {str(e)}')
-        raise e
+        raise e from e
 
     yield
 

{rainycode-1.5.4 → rainycode-1.5.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rainycode"
-version = "1.5.4"
+version = "1.5.5"
 description = "FastAPI base modules"
 requires-python = ">=3.10"
 

{rainycode-1.5.4 → rainycode-1.5.5}/rainycode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rainycode
-Version: 1.5.4
+Version: 1.5.5
 Summary: FastAPI base modules
 Requires-Python: >=3.10
 Requires-Dist: aerich==0.9.2