From 667b3c97242b04d99b4e4b6e3ca9a0ab462f8b8d Mon Sep 17 00:00:00 2001
From: hang666 <44329474+hang666@users.noreply.github.com>
Date: Tue, 8 Nov 2022 14:16:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=8E=B7=E5=8F=96=E8=AF=81?=
 =?UTF-8?q?=E4=B9=A6=E5=8F=8D=E5=90=91=E4=BB=A3=E7=90=86=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

之前判断PROXY-END在关闭反向代理时仍会检测到，必须删除规则。
修改后正常
---
 class/core/site_api.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/class/core/site_api.py b/class/core/site_api.py
index 07a25e781..a8dc1cd87 100755
--- a/class/core/site_api.py
+++ b/class/core/site_api.py
@@ -633,8 +633,19 @@ class site_api:
             if siteConf.find('301-END') != -1:
                 return mw.returnJson(False, '检测到您的站点做了301重定向设置，请先关闭重定向!')
 
-            if siteConf.find('PROXY-END') != -1:
-                return mw.returnJson(False, '检测到您的站点做了反向代理设置，请先关闭反向代理!')
+            #检测存在反向代理
+            data_path = self.getProxytDataPath(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, '检测到您的站点做了反向代理设置，请先关闭反向代理!')
 
         letpath = self.sslDir + siteName
         csrpath = letpath + "/fullchain.pem"  # 生成证书路径