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

View File

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

View File

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