rainycode 1.1.2__tar.gz → 1.1.4__tar.gz

{rainycode-1.1.2 → rainycode-1.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rainycode
-Version: 1.1.2
+Version: 1.1.4
 Summary: FastAPI base modules
 Requires-Python: >=3.8
 Requires-Dist: build==1.4.0

{rainycode-1.1.2 → rainycode-1.1.4}/common_servers/api/auth_api.py

@@ -58,7 +58,7 @@ async def login_mini(wechat_in: WechatLogin):
 
 @router.get("/wechat/oauth", summary="获取微信网页授权链接 - 回调(/oauth/callback)")
 async def get_wechat_oauth_url(
-    app_id: str = Query(..., description="微信 AppID"),
+    app_pk: int = Query(..., description="微信应用主键ID"),
     redirect_uri: str = Query(..., description="授权成功后跳转地址"),
     state: str | None = Query(default=None, description="自定义状态参数"),
 ):
@@ -69,5 +69,5 @@ async def get_wechat_oauth_url(
     - 如果用户已注册，回调后直接返回 token
     - 如果用户未注册，自动重定向到 snsapi_userinfo 授权
     """
-    authorize_url = await AuthService.get_wechat_oauth_url(app_id, redirect_uri, state)
+    authorize_url = await AuthService.get_wechat_oauth_url(app_pk, redirect_uri, state)
     return SuccessReturn(data={"authorize_url": authorize_url})

{rainycode-1.1.2 → rainycode-1.1.4}/common_servers/service/auth_svc.py

@@ -146,17 +146,17 @@ class AuthService:
             logger.info(f"用户登出: user_id={user_id}, username={username}")
 
     @classmethod
-    async def get_wechat_oauth_url(cls, app_id: str, redirect_uri: str, state: str | None = None) -> str:
+    async def get_wechat_oauth_url(cls, app_pk: int, redirect_uri: str, state: str | None = None) -> str:
         """
         生成微信网页授权链接（snsapi_base）
 
-        :param app_id: 微信 AppID
+        :param app_pk: 微信应用主键ID
         :param redirect_uri: 授权成功后跳转的前端地址
         :param state: 自定义状态参数
         :return: 微信授权链接
         """
         # 验证公众号配置
-        app_config = await WechatApp.get_or_none(app_id=app_id, app_type=AppTypeEnum.OFFICIAL_ACCOUNT)
+        app_config = await WechatApp.get_or_none(id=app_pk, app_type=AppTypeEnum.OFFICIAL_ACCOUNT)
         if not app_config:
             raise CustomException(msg="无效的公众号配置")
 
@@ -168,12 +168,13 @@ class AuthService:
         # 生成内部 state
         internal_state = state or str(uuid.uuid4())
 
-        # 缓存 state -> (redirect_uri, app_id) 映射，有效期 5 分钟
-        cache_value = json.dumps({"redirect_uri": redirect_uri, "app_id": app_id})
+        # 缓存 state -> (redirect_uri, app_pk) 映射，有效期 5 分钟
+        cache_value = json.dumps({"redirect_uri": redirect_uri, "app_pk": app_pk})
         await AioRedis.set(f"{REDIS_PREFIX_OAUTH_STATE}{internal_state}", cache_value, ex=300)
 
         # 构建回调地址
-        callback_url = f"{base_config.base_url}/wechat/oauth/callback"
+        api_prefix = f"/api/{base_config.app_name}" if base_config.app_name else ""
+        callback_url = f"{base_config.base_url}{api_prefix}/wechat/oauth/callback"
 
         return WechatUtil.build_oauth_url(
             appid=app_config.app_id,
@@ -202,11 +203,11 @@ class AuthService:
         try:
             cached_data = json.loads(cache_value)
             redirect_uri = cached_data.get("redirect_uri")
-            app_id = cached_data.get("app_id")
+            app_pk = cached_data.get("app_pk")
         except (json.JSONDecodeError, TypeError):
             raise CustomException(msg="授权数据格式错误")
 
-        if not redirect_uri or not app_id:
+        if not redirect_uri or not app_pk:
             raise CustomException(msg="授权数据不完整")
 
         # 删除已使用的 state
@@ -218,7 +219,7 @@ class AuthService:
             raise CustomException(msg="授权码已失效，请重新授权")
 
         # 获取公众号配置
-        app_config = await WechatApp.get_or_none(app_id=app_id, app_type=AppTypeEnum.OFFICIAL_ACCOUNT)
+        app_config = await WechatApp.get_or_none(id=app_pk, app_type=AppTypeEnum.OFFICIAL_ACCOUNT)
         if not app_config:
             raise CustomException(msg="公众号配置不存在")
 
@@ -271,7 +272,8 @@ class AuthService:
         await AioRedis.set(f"{REDIS_PREFIX_OAUTH_STATE}{new_state}", cache_value, ex=300)
 
         # 构建 snsapi_userinfo 授权链接
-        callback_url = f"{base_config.base_url}/wechat/oauth/callback"
+        api_prefix = f"/api/{base_config.app_name}" if base_config.app_name else ""
+        callback_url = f"{base_config.base_url}{api_prefix}/wechat/oauth/callback"
         userinfo_auth_url = WechatUtil.build_oauth_url(
             appid=app_config.app_id,
             redirect_uri=callback_url,

{rainycode-1.1.2 → rainycode-1.1.4}/pyproject.toml

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

{rainycode-1.1.2 → rainycode-1.1.4}/rainycode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rainycode
-Version: 1.1.2
+Version: 1.1.4
 Summary: FastAPI base modules
 Requires-Python: >=3.8
 Requires-Dist: build==1.4.0