Merge branch 'master' of https://github.com/AstrBotDevs/AstrBot

Author: Rain-0x01-39

astrbot/core/platform/sources/weixin_oc/weixin_oc_adapter.py

@@ -593,10 +593,10 @@ async def _prepare_media_item(
             len(str(payload.get("upload_param", ""))),
         )
         upload_param = str(payload.get("upload_param", "")).strip()
-        if not upload_param:
-            raise RuntimeError("getuploadurl returned empty upload_param")
+        upload_full_url = str(payload.get("upload_full_url", "")).strip()
 
         encrypted_query_param = await self.client.upload_to_cdn(
+            upload_full_url,
             upload_param,
             file_key,
             aes_key_hex,

astrbot/core/platform/sources/weixin_oc/weixin_oc_client.py

@@ -108,11 +108,21 @@ def parse_media_aes_key(aes_key_value: str) -> bytes:
 
     async def upload_to_cdn(
         self,
+        upload_full_url: str,
         upload_param: str,
         file_key: str,
         aes_key_hex: str,
         media_path: Path,
     ) -> str:
+        if upload_full_url:
+            cdn_url = upload_full_url
+        elif upload_param:
+            cdn_url = self._build_cdn_upload_url(upload_param, file_key)
+        else:
+            raise ValueError(
+                "CDN upload URL missing (need upload_full_url or upload_param)"
+            )
+
         raw_data = media_path.read_bytes()
         logger.debug(
             "weixin_oc(%s): prepare CDN upload file=%s size=%s md5=%s filekey=%s",
@@ -135,7 +145,6 @@ async def upload_to_cdn(
         await self.ensure_http_session()
         assert self._http_session is not None
         timeout = aiohttp.ClientTimeout(total=self.api_timeout_ms / 1000)
-        cdn_url = self._build_cdn_upload_url(upload_param, file_key)
 
         async with self._http_session.post(
             cdn_url,

docs/zh/platform/weixin_oc.md

@@ -5,7 +5,7 @@
 AstrBot 支持通过 `个人微信` 适配器接入微信个人号。该适配器基于**腾讯微信官方** `openclaw-weixin` 接口实现，使用扫码登录和长轮询收发消息，不需要配置 Webhook 回调地址。
 
 > [!NOTE]
-> 需要升级到最新的手机微信版本：>= 8.0.70
+> 需要升级到最新的手机微信版本：iOS >= 8.0.70，Android >= 8.0.69，并确保微信中包含 ClawBot 插件
 
 ## 支持的消息类型