From f3b07bda650c1e930bc0e199743569a80a9cc938 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 22 Dec 2024 01:03:56 +0800
Subject: [PATCH 1/4] Update site.py

---
 web/utils/site.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/utils/site.py b/web/utils/site.py
index fb122e447a..d18a1f4dd6 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -2391,6 +2391,9 @@ def createAcmeDns(self, site_name, domains, email, dnspai, wildcard_domain, forc
             src_path = mw.getAcmeDomainDir(d)
             src_cert = src_path + '/fullchain.cer'
             src_key = src_path + '/' + d + '.key'
+            if not os.path.exists(src_cert):
+                src_cert = src_path + '/'+d+'.cer'
+
             # src_cert.replace("\\*", "*")
             msg = '签发失败,您尝试申请证书的失败次数已达上限!\
                 <p>1、检查域名是否正确解析到本服务器,或解析还未完全生效</p>\

From e2e27765ee653d290201418bfe35ebc47303ef09 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 22 Dec 2024 01:33:08 +0800
Subject: [PATCH 2/4] Update site.py

---
 web/utils/site.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index d18a1f4dd6..784ee42b21 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -2391,8 +2391,6 @@ def createAcmeDns(self, site_name, domains, email, dnspai, wildcard_domain, forc
             src_path = mw.getAcmeDomainDir(d)
             src_cert = src_path + '/fullchain.cer'
             src_key = src_path + '/' + d + '.key'
-            if not os.path.exists(src_cert):
-                src_cert = src_path + '/'+d+'.cer'
 
             # src_cert.replace("\\*", "*")
             msg = '签发失败,您尝试申请证书的失败次数已达上限!\

From bcf6808e49b0cf38a4a4c5a5ac75aece387f85d3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 22 Dec 2024 01:33:19 +0800
Subject: [PATCH 3/4] Update site.py

---
 web/utils/site.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/utils/site.py b/web/utils/site.py
index 784ee42b21..d3da43e9b9 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -2391,8 +2391,7 @@ def createAcmeDns(self, site_name, domains, email, dnspai, wildcard_domain, forc
             src_path = mw.getAcmeDomainDir(d)
             src_cert = src_path + '/fullchain.cer'
             src_key = src_path + '/' + d + '.key'
-
-            # src_cert.replace("\\*", "*")
+            
             msg = '签发失败,您尝试申请证书的失败次数已达上限!\
                 <p>1、检查域名是否正确解析到本服务器,或解析还未完全生效</p>\
                 <p>2、如果以上检查都确认没有问题，请尝试更换DNS服务商</p>'

From 0e0cc248fa06f2c8072b44c6f7ddd4ff1e34131e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 22 Dec 2024 18:50:58 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E7=AB=99=E7=82=B9=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=92=8C=E8=AE=A1=E5=88=92=E9=A1=B5=E9=9D=A2=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/admin/crontab/__init__.py | 1 +
 web/admin/site/site.py        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/web/admin/crontab/__init__.py b/web/admin/crontab/__init__.py
index 64adb51cf1..6ba8b5e702 100644
--- a/web/admin/crontab/__init__.py
+++ b/web/admin/crontab/__init__.py
@@ -20,6 +20,7 @@
 
 blueprint = Blueprint('crontab', __name__, url_prefix='/crontab', template_folder='../../templates')
 @blueprint.route('/index', endpoint='index')
+@panel_login_required
 def index():
     name = thisdb.getOption('template', default='default')
     return render_template('%s/crontab.html' % name)
diff --git a/web/admin/site/site.py b/web/admin/site/site.py
index 84720f5e1d..0768e41119 100644
--- a/web/admin/site/site.py
+++ b/web/admin/site/site.py
@@ -22,6 +22,7 @@
 
 blueprint = Blueprint('site', __name__, url_prefix='/site', template_folder='../../templates/default')
 @blueprint.route('/index', endpoint='index')
+@panel_login_required
 def index():
     return render_template('site.html')