yumoqing/ahserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
yumoqing 2026-09-05 14:57:10 +08:00
parent 8cd821c1eb
commit fe683745e3
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ahserver/filestorage.py
View File

@ -212,12 +212,12 @@ async def downloadfile2url(request, url, headers=None, params=None, data={}, met
webpath = fs.webpath(fpath) webpath = fs.webpath(fpath)
if request: if request:
env = request._run_ns env = request._run_ns
url = env.entire_url('/idfile') + '?path=' + env.quote(webpath) url = env.entire_url('/idfile') + env.quote(webpath)
return url return url
baseurl = get_baseurl() baseurl = get_baseurl()
if baseurl: if baseurl:
return f'{baseurl}/idfile?path={quote(webpath)}' return f'{baseurl}/idfile{quote(webpath)}'
return f'/idfile?path={quote(webpath)}' return f'/idfile{quote(webpath)}'
def get_baseurl(): def get_baseurl():
# 优先级：BASEURL（显式配置，多域名部署用） > _LAST_BASEURL（自动推导，单域名场景） # 优先级：BASEURL（显式配置，多域名部署用） > _LAST_BASEURL（自动推导，单域名场景）
@ -264,12 +264,12 @@ async def b64media2url(request, mediafile):
return '' return ''
if request: if request:
entire_url = request._run_ns.entire_url entire_url = request._run_ns.entire_url
url = entire_url('/idfile?path=') + quote(webpath) url = entire_url('/idfile') + quote(webpath)
return url return url
baseurl = get_baseurl() baseurl = get_baseurl()
if baseurl: if baseurl:
return f'{baseurl}/idfile?path={quote(mediafile)}' return f'{baseurl}/idfile{quote(mediafile)}'
return f'/downlaod{quote(mediafile)}' return f'/idfile{quote(mediafile)}'
async def data2qrpath(data, logo=None): async def data2qrpath(data, logo=None):
fs = FileStorage() fs = FileStorage()

2
ahserver/globalEnv.py
View File

@ -43,6 +43,7 @@ from openpyxl import Workbook
from tempfile import mktemp from tempfile import mktemp
from appPublic.qr import gen_qr, gen_qr_withlogo from appPublic.qr import gen_qr, gen_qr_withlogo
import base64
from appPublic.base64_to_file import hex2base64 from appPublic.base64_to_file import hex2base64
from appPublic.jsonConfig import getConfig from appPublic.jsonConfig import getConfig
from appPublic.dictObject import DictObject from appPublic.dictObject import DictObject
@ -350,6 +351,7 @@ def initEnv():
g.return_error = return_error g.return_error = return_error
g.openai_401 = openai_401 g.openai_401 = openai_401
g.get_baseurl = get_baseurl g.get_baseurl = get_baseurl
g.base64 = base64
g.hex2base64 = hex2base64 g.hex2base64 = hex2base64
g.b64media2url = b64media2url g.b64media2url = b64media2url
g.openai_403 = openai_403 g.openai_403 = openai_403