bugficx
This commit is contained in:
parent
1198597766
commit
c3ef98972f
@ -210,12 +210,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('/download') + env.quote(webpath)
|
url = env.entire_url('/idfile') + '?path=' + env.quote(webpath)
|
||||||
return url
|
return url
|
||||||
baseurl = get_baseurl()
|
baseurl = get_baseurl()
|
||||||
if baseurl:
|
if baseurl:
|
||||||
return f'{baseurl}/download{quote(webpath)}'
|
return f'{baseurl}/idfile?path={quote(webpath)}'
|
||||||
return f'/download{quote(webpath)}'
|
return f'/idfile?path={quote(webpath)}'
|
||||||
|
|
||||||
def get_baseurl():
|
def get_baseurl():
|
||||||
# 优先级:BASEURL(显式配置,多域名部署用) > _LAST_BASEURL(自动推导,单域名场景)
|
# 优先级:BASEURL(显式配置,多域名部署用) > _LAST_BASEURL(自动推导,单域名场景)
|
||||||
@ -248,10 +248,10 @@ 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('/download') + quote(webpath)
|
url = entire_url('/idfile?path=') + quote(webpath)
|
||||||
return url
|
return url
|
||||||
baseurl = get_baseurl()
|
baseurl = get_baseurl()
|
||||||
if baseurl:
|
if baseurl:
|
||||||
return f'{baseurl}/download{quote(mediafile)}'
|
return f'{baseurl}/idfile?path={quote(mediafile)}'
|
||||||
return f'/downlaod{quote(mediafile)}'
|
return f'/downlaod{quote(mediafile)}'
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user