From 74f774bc3b1182177d3965c503961677e7b2bc92 Mon Sep 17 00:00:00 2001 From: dami Date: Fri, 19 Dec 2025 15:42:20 +0800 Subject: [PATCH 1/4] Update push_notice_msg.py --- plugins/tgbot/startup/extend/push_notice_msg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/tgbot/startup/extend/push_notice_msg.py b/plugins/tgbot/startup/extend/push_notice_msg.py index 4f66b5cdd..0e2067577 100644 --- a/plugins/tgbot/startup/extend/push_notice_msg.py +++ b/plugins/tgbot/startup/extend/push_notice_msg.py @@ -55,7 +55,7 @@ def send_msg(bot, tag='ad', trigger_time=300): # 信号只在一个周期内执行一次|end # https://t.me/gjgzs2022 ｜ 22/m | @GJ_gzs - # 实名认证/过人脸🕵️‍♀️各种账号处理✅ | 30/m| next,12/30 | @nngzs + # 实名认证/过人脸🕵️‍♀️各种账号处理✅ | 30/m| next,6/30 | @nngzs # 18+资源采集| 4/m | next,1/14 | @liuxingyu123 keyboard = [ From 25f4a815fda30b458b72afbe7f45cacf5fbcbefb Mon Sep 17 00:00:00 2001 From: dami Date: Sat, 20 Dec 2025 20:46:58 +0800 Subject: [PATCH 2/4] =?UTF-8?q?acme=E8=AF=81=E4=B9=A6=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/admin/site/ssl_acme.py | 5 ++++- web/static/app/site.js | 27 ++++++++++++++++++++++++--- web/utils/site.py | 25 ++++++++++++++++++++----- 3 files changed, 48 insertions(+), 9 deletions(-) diff --git a/web/admin/site/ssl_acme.py b/web/admin/site/ssl_acme.py index afe378617..8d380fdb6 100644 --- a/web/admin/site/ssl_acme.py +++ b/web/admin/site/ssl_acme.py @@ -45,9 +45,12 @@ def create_acme(): email = request.form.get('email', '') wildcard_domain = request.form.get('wildcard_domain','') apply_type = request.form.get('apply_type', 'file') + apply_ca = request.form.get('apply_ca', 'default') + + dnspai = request.form.get('dnspai','') dns_alias = request.form.get('dns_alias','') - return MwSites.instance().createAcme(site_name, domains, force, renew, apply_type, dnspai, email, wildcard_domain,dns_alias) + return MwSites.instance().createAcme(site_name, domains, force, renew, apply_type, apply_ca, dnspai, email, wildcard_domain,dns_alias) diff --git a/web/static/app/site.js b/web/static/app/site.js index 18a86a0a1..b7cc338e9 100755 --- a/web/static/app/site.js +++ b/web/static/app/site.js @@ -2283,7 +2283,7 @@ function opSSLNow(type, id, siteName, callback){ function opSSLAcme(type, id, siteName, callback){ var acme = '
\
\ -
\ +
\ 验证方式\
\ \ @@ -2292,6 +2292,19 @@ function opSSLAcme(type, id, siteName, callback){ \
\
\ +
\ + 证书\ +
\ + \ + \ + \ + \ + zerossl\ + buypass\ +
\ +
\ \
\ -
\ +
\ \ \
\ @@ -2731,6 +2744,10 @@ function newAcmeHandApplyNotice(siteName, id, domains, data){ var apply_type = $('input[name="apply_type"]:checked').val(); pdata['apply_type'] = apply_type; + + var apply_ca = $('input[name="apply_ca"]:checked').val(); + pdata['apply_ca'] = apply_ca; + if (apply_type == 'dns'){ pdata['dnspai'] = $('#dnsapi_option option:selected').val(); } @@ -2767,9 +2784,13 @@ function newAcmeSSL(siteName, id, domains){ var apply_type = $('input[name="apply_type"]:checked').val(); pdata['apply_type'] = apply_type; + + var apply_ca = $('input[name="apply_ca"]:checked').val(); + pdata['apply_ca'] = apply_ca; + if (apply_type == 'dns'){ pdata['dnspai'] = $('#dnsapi_option option:selected').val(); - } + } pdata['dns_alias'] = $("input[name='dns_alias']").val(); $.post('/site/create_acme',pdata,function(rdata){ diff --git a/web/utils/site.py b/web/utils/site.py index 954c0e2b9..ad9b7a9fb 100644 --- a/web/utils/site.py +++ b/web/utils/site.py @@ -2153,7 +2153,7 @@ location ^~ {from} {\n\ mw.restartWeb() return mw.returnData(True, '删除成功') - def createAcmeFile(self, site_name, domains, email, force, renew): + def createAcmeFile(self, site_name, apply_ca, domains, email, force, renew): site_conf = self.getHostConf(site_name) if not os.path.exists(site_conf): return mw.returnData(False, '配置异常!') @@ -2204,6 +2204,13 @@ location ^~ {from} {\n\ self.writeAcmeLog('开始ACME申请...') log_file = self.acmeLogFile() + if apply_ca == "let": + cmd = cmd + " --server letsencrypt " + else if apply_ca == "let": + cmd = cmd + " --server zerossl " + else if apply_ca == "let": + cmd = cmd + " --server buypass " + cmd = 'export ACCOUNT_EMAIL=' + email + ' && ' + cmd + ' >> ' + log_file # print(cmd) result = mw.execShell(cmd) @@ -2362,7 +2369,7 @@ export PATH mw.restartWeb() return mw.returnData(True, '证书已更新!', result) - def createAcmeDns(self, site_name, domains, email, dnspai, wildcard_domain, force, renew, dns_alias): + def createAcmeDns(self, site_name, apply_ca, domains, email, dnspai, wildcard_domain, force, renew, dns_alias): dnsapi_option = thisdb.getOptionByJson('dnsapi', default={}) log_file = self.acmeLogFile() cmd = 'echo "..." > '+ log_file @@ -2399,6 +2406,14 @@ export PATH if dns_alias != '': cmd += ' --domain-alias '+str(dns_alias) + + + if apply_ca == "let": + cmd = cmd + " --server letsencrypt " + else if apply_ca == "let": + cmd = cmd + " --server zerossl " + else if apply_ca == "let": + cmd = cmd + " --server buypass " cmd += ' > ' + log_file # print(cmd) @@ -2448,7 +2463,7 @@ export PATH mw.restartWeb() return mw.returnData(True, '证书已更新!', result) - def createAcme(self, site_name, domains, force, renew, apply_type, dnspai, email, wildcard_domain, dns_alias): + def createAcme(self, site_name, domains, force, renew, apply_type, apply_ca, dnspai, email, wildcard_domain, dns_alias): domains = json.loads(domains) if len(domains) < 1: return mw.returnData(False, '请选择域名') @@ -2474,9 +2489,9 @@ export PATH return mw.returnData(False, '正在申请或更新SSL中...') if apply_type == 'file': - return self.createAcmeFile(site_name, domains, email,force,renew) + return self.createAcmeFile(site_name, apply_ca, domains, email,force,renew) elif apply_type == 'dns': - return self.createAcmeDns(site_name, domains, email, dnspai, wildcard_domain,force, renew, dns_alias) + return self.createAcmeDns(site_name, apply_ca,domains, email, dnspai, wildcard_domain,force, renew, dns_alias) return mw.returnData(False, '异常请求') def createLet(self, site_name, domains, force, renew, apply_type, dnspai, email, wildcard_domain): From efe92ba35638a7cc405c3be6215b450a7df9952d Mon Sep 17 00:00:00 2001 From: dami Date: Sat, 20 Dec 2025 20:49:25 +0800 Subject: [PATCH 3/4] Update site.py --- web/utils/site.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/utils/site.py b/web/utils/site.py index ad9b7a9fb..a8fa1fc9e 100644 --- a/web/utils/site.py +++ b/web/utils/site.py @@ -2206,9 +2206,9 @@ location ^~ {from} {\n\ if apply_ca == "let": cmd = cmd + " --server letsencrypt " - else if apply_ca == "let": + elif apply_ca == "zerossl": cmd = cmd + " --server zerossl " - else if apply_ca == "let": + elif apply_ca == "buypass": cmd = cmd + " --server buypass " cmd = 'export ACCOUNT_EMAIL=' + email + ' && ' + cmd + ' >> ' + log_file @@ -2410,9 +2410,9 @@ export PATH if apply_ca == "let": cmd = cmd + " --server letsencrypt " - else if apply_ca == "let": + elif apply_ca == "zerossl": cmd = cmd + " --server zerossl " - else if apply_ca == "let": + elif apply_ca == "buypass": cmd = cmd + " --server buypass " cmd += ' > ' + log_file From 484a6159810db5050b6a0d144a2a8e0af6b67c3e Mon Sep 17 00:00:00 2001 From: dami Date: Sat, 20 Dec 2025 20:56:40 +0800 Subject: [PATCH 4/4] Update ssl_acme.py --- web/admin/site/ssl_acme.py | 1 - 1 file changed, 1 deletion(-) diff --git a/web/admin/site/ssl_acme.py b/web/admin/site/ssl_acme.py index 8d380fdb6..b665d06db 100644 --- a/web/admin/site/ssl_acme.py +++ b/web/admin/site/ssl_acme.py @@ -46,7 +46,6 @@ def create_acme(): wildcard_domain = request.form.get('wildcard_domain','') apply_type = request.form.get('apply_type', 'file') apply_ca = request.form.get('apply_ca', 'default') - dnspai = request.form.get('dnspai','') dns_alias = request.form.get('dns_alias','')