Skip to content

Commit

Permalink
7.0.12-2
Browse files Browse the repository at this point in the history
  • Loading branch information
showpy committed Oct 16, 2019
1 parent 026712f commit fdba689
Show file tree
Hide file tree
Showing 21 changed files with 11 additions and 5,026 deletions.
2 changes: 1 addition & 1 deletion class/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def init(self):
if ua:
ua = ua.lower();
if ua.find('spider') != -1 or ua.find('bot') != -1: return redirect('https://www.baidu.com');
g.version = '7.0.12'
g.version = '7.0.1'
g.title = public.GetConfigValue('title')
g.uri = request.path
session['version'] = g.version;
Expand Down
4 changes: 4 additions & 0 deletions class/panelLets.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,10 @@ def get_error(self,error):
return "连接超时,CA服务器无法访问您的网站!"
elif error.find("DNS problem: SERVFAIL looking up CAA for") != -1:
return "域名%s当前被要求验证CAA记录,请手动解析CAA记录,或1小时后重新尝试申请!" % re.findall("looking up CAA for (.+)",error)
elif error.find("Read timed out.") != -1:
return "验证超时,请检查域名是否正确解析,若已正确解析,可能服务器与Let'sEncrypt连接异常,请稍候再重试!"
elif error.find("Error creating new order") != -1:
return "订单创建失败,请稍候重试!"
else:
return error;

Expand Down
7 changes: 6 additions & 1 deletion class/panelSite.py
Original file line number Diff line number Diff line change
Expand Up @@ -916,7 +916,12 @@ def CreateLet(self,get):
return public.returnMsg(False, '请先到软件商店安装【云解析】,并完成域名NS绑定.');

self.check_ssl_pack()
import panelLets
try:
import panelLets
except Exception as ex:
if str(ex).find('No module named requests') != -1:
os.system("pip install requests &")
return public.returnMsg(False,'缺少requests组件,请尝试修复面板!')
public.mod_reload(panelLets)
lets = panelLets.panelLets()
result = lets.apple_lest_cert(get)
Expand Down
131 changes: 0 additions & 131 deletions class/requests/__init__.py

This file was deleted.

14 changes: 0 additions & 14 deletions class/requests/__version__.py

This file was deleted.

42 changes: 0 additions & 42 deletions class/requests/_internal_utils.py

This file was deleted.

Loading

0 comments on commit fdba689

Please sign in to comment.