Skip to content

Commit 3579902

Browse files
committed
fix: enhance base fork URL construction to include path
--bug=1065870@tapd-62980211 --user=刘瑞斌 【github#4719】web知识库根地址格式为 域名/xxx?aaa 时,日志打印内容缺少 xxx 部分 https://www.tapd.cn/62980211/s/1841722
1 parent e3787d4 commit 3579902

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

apps/common/utils/fork.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,18 @@ def error(message: str):
7171

7272
def __init__(self, base_fork_url: str, selector_list: List[str]):
7373
base_fork_url = remove_fragment(base_fork_url)
74-
self.base_fork_url = urljoin(base_fork_url if base_fork_url.endswith("/") else base_fork_url + '/', '.')
74+
parsed = urlparse(base_fork_url)
75+
path = parsed.path.rstrip('/')
76+
self.base_fork_url = urlunparse((
77+
parsed.scheme,
78+
parsed.netloc,
79+
path,
80+
None,
81+
None,
82+
None # fragment
83+
))
7584
parsed = urlsplit(base_fork_url)
7685
query = parsed.query
77-
self.base_fork_url = self.base_fork_url[:-1]
7886
if query is not None and len(query) > 0:
7987
self.base_fork_url = self.base_fork_url + '?' + query
8088
self.selector_list = [selector for selector in selector_list if selector is not None and len(selector) > 0]

0 commit comments

Comments
 (0)