diff --git a/requirements.txt b/requirements.txt index c1a3efeca..72573b84e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -36,6 +36,7 @@ pillow Jinja2>=2.11.2 PyMySQL>=1.0.2 whitenoise==5.3.0 +tldextract pyotp pytz supervisor diff --git a/web/utils/site.py b/web/utils/site.py index cb08e9384..7275dca7b 100644 --- a/web/utils/site.py +++ b/web/utils/site.py @@ -2263,6 +2263,12 @@ location ^~ {from} {\n\ return def_var def getDomainRootName(self, domain): + import tldextract + extracted = tldextract.extract(domain) + # 组合注册域名和顶级域名 + return "{extracted.domain}.{extracted.suffix}" + + def getDomainRootName_Old(self, domain): s = domain.split('.') count = len(s) last_index = count - 1