From 52a55dcbee10688280831bfe57a0a693fc40b332 Mon Sep 17 00:00:00 2001 From: Hermes Agent Date: Tue, 23 Jun 2026 17:58:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=9A=E5=9F=9F=E5=90=8D=E9=83=A8?= =?UTF-8?q?=E7=BD=B2BASEURL=E9=97=AE=E9=A2=98=20-=20=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=BC=98=E5=85=88+=E8=87=AA=E5=8A=A8=E5=85=9C=E5=BA=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - processorResource: 改用 _LAST_BASEURL 记录最近请求域名（每次更新） - filestorage.get_baseurl: BASEURL（显式配置）优先于 _LAST_BASEURL（自动推导） - 多域名部署时运维设 BASEURL=主域名，单域名场景自动生效无需配置 --- ahserver/filestorage.py | 3 ++- ahserver/processorResource.py | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ahserver/filestorage.py b/ahserver/filestorage.py index af6c85f..1ae4704 100644 --- a/ahserver/filestorage.py +++ b/ahserver/filestorage.py @@ -218,7 +218,8 @@ async def downloadfile2url(request, url, headers=None, params=None, data={}, met return f'/idfile?path={quote(webpath)}' def get_baseurl(): - baseurl = os.environ.get('BASEURL') + # 优先级：BASEURL（显式配置，多域名部署用） > _LAST_BASEURL（自动推导，单域名场景） + baseurl = os.environ.get('BASEURL') or os.environ.get('_LAST_BASEURL') return baseurl async def base642file(b64str): diff --git a/ahserver/processorResource.py b/ahserver/processorResource.py index 584daf6..8b600b0 100644 --- a/ahserver/processorResource.py +++ b/ahserver/processorResource.py @@ -198,7 +198,9 @@ class ProcessorResource(StaticResource,Url2File): portp = '' self._preurl = f'{self._scheme}://{self._host}{portp}{self._prepath}' request['base_url'] = self._preurl - os.environ.setdefault('BASEURL', self._preurl) + # 记录最近一次请求的 base URL，供无 request 上下文的代码兜底使用 + # 多域名部署时应通过 BASEURL 环境变量显式指定主域名 + os.environ['_LAST_BASEURL'] = self._preurl # print(f'{request.path=}, {self._preurl=}')