From ea5af1ac5bf9159d91ed6c6d4c9e6f839c9abc1d Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Thu, 3 Oct 2024 02:01:53 +0800 Subject: [PATCH] update --- class/core/cert_api.py | 3 +-- class/core/site_api.py | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/class/core/cert_api.py b/class/core/cert_api.py index 8d1eaee25..7f430584c 100644 --- a/class/core/cert_api.py +++ b/class/core/cert_api.py @@ -1454,8 +1454,7 @@ fullchain.pem 粘贴到证书输入框 if not self.checkDomainIsExsits(domain): auth_to = None - msg = "|-跳过被删除的域名: {}!".format( - self.__config['orders'][i]['domains']) + msg = "|-跳过被删除的域名: {}!".format(self.__config['orders'][i]['domains']) writeLog(msg) continue diff --git a/class/core/site_api.py b/class/core/site_api.py index 7f80bda3c..afbd47710 100755 --- a/class/core/site_api.py +++ b/class/core/site_api.py @@ -874,16 +874,16 @@ class site_api: # 检测存在反向代理 data_path = self.getProxyDataPath(siteName) data_content = mw.readFile(data_path) - if data_content != False: - try: - data = json.loads(data_content) - except: - pass - for proxy in data: - proxy_dir = "{}/{}".format(self.proxyPath, siteName) - proxy_dir_file = proxy_dir + '/' + proxy['id'] + '.conf' - if os.path.exists(proxy_dir_file): - return mw.returnJson(False, '检测到您的站点做了反向代理设置,请先关闭反向代理!') + # if data_content != False: + # try: + # data = json.loads(data_content) + # except: + # pass + # for proxy in data: + # proxy_dir = "{}/{}".format(self.proxyPath, siteName) + # proxy_dir_file = proxy_dir + '/' + proxy['id'] + '.conf' + # if os.path.exists(proxy_dir_file): + # return mw.returnJson(False, '检测到您的站点做了反向代理设置,请先关闭反向代理!') # fix binddir domain ssl apply question mw.backFile(host_conf_file)