diff --git a/class/core/site_api.py b/class/core/site_api.py index 736876bee..703789a22 100755 --- a/class/core/site_api.py +++ b/class/core/site_api.py @@ -479,11 +479,13 @@ class site_api: csr_lets_path = ssl_lets_dir + '/fullchain.pem' # 生成证书路径 if mw.md5(mw.readFile(csr_lets_path)) == mw.md5(mw.readFile(csr_path)): return mw.returnJson(False, '使用中,先关闭再删除') + mw.execShell('rm -rf ' + ssl_lets_dir) elif ssl_type == 'acme': ssl_acme_dir = mw.getAcmeDir() + '/' + site_name csr_acme_path = ssl_acme_dir + '/fullchain.cer' # 生成证书路径 if mw.md5(mw.readFile(csr_acme_path)) == mw.md5(mw.readFile(csr_path)): return mw.returnJson(False, '使用中,先关闭再删除') + mw.execShell('rm -rf ' + ssl_acme_dir) # mw.restartWeb() return mw.returnJson(True, '删除成功') diff --git a/route/static/app/site.js b/route/static/app/site.js index 5aee223b6..6d6a6fee0 100755 --- a/route/static/app/site.js +++ b/route/static/app/site.js @@ -2121,7 +2121,7 @@ function opSSL(type, id, siteName, callback){ if(rdata.status){ $('.warning_info').css('display','none'); - $(".ssl-btn").append(""); + $(".ssl-btn").append(""); $('#now_ssl').html('当前证书 - [已部署SSL]'); } else{ $('.warning_info').css('display','block'); @@ -2131,7 +2131,7 @@ function opSSL(type, id, siteName, callback){ if(rdata.key == false){ rdata.key = ''; } else { - $(".ssl-btn").append(''); + $(".ssl-btn").append(''); } if(rdata.csr == false){