mirror of
https://github.com/aaPanel/aaPanel.git
synced 2026-09-11 20:17:49 +02:00
Update to 7.25.0
1. Added Mail Marketing Automation trigger tasks 2. Added Mail Marketing Groups Import, Export, Merge 3. Added Mail Marketing Subscribers to support paste import 4. Added Mail Marketing Template Import Export Duplicate 5. Added Mail server add timed automatic reply 6. Added HTTPS Protection function for Website (disables automatic HTTP to HTTPS redirection when enabled) 7. Optimize Website Interface Button Integration 8. Optimize the response speed of WP Toolkit interface
This commit is contained in:
@@ -89,7 +89,7 @@ class feishu_msg:
|
||||
@user
|
||||
"""
|
||||
if not hasattr(get, 'url'):
|
||||
return public.returnMsg(False, 'Please fill in the complete information')
|
||||
return public.returnMsg(False, public.lang("Please fill in the complete information"))
|
||||
|
||||
isAtAll = True
|
||||
if hasattr(get, "atall"):
|
||||
@@ -100,7 +100,7 @@ class feishu_msg:
|
||||
if hasattr(get, 'title'):
|
||||
title = get.title
|
||||
if len(title) > 7:
|
||||
return public.returnMsg(False, 'Note name cannot exceed 7 characters')
|
||||
return public.returnMsg(False, public.lang("Note name cannot exceed 7 characters"))
|
||||
|
||||
self.__feishu_info = {"feishu_url": get.url.strip(), "isAtAll": isAtAll, "user":1,"title":title}
|
||||
ret = self.send_msg('aaPanel alarm test')
|
||||
@@ -109,12 +109,12 @@ class feishu_msg:
|
||||
public.writeFile(self.__default_pl, self.__module_name)
|
||||
|
||||
if ret['success'] <= 0:
|
||||
return public.returnMsg(False, 'Failed to add, please check whether the URL is correct')
|
||||
return public.returnMsg(False, public.lang("Failed to add, please check whether the URL is correct"))
|
||||
|
||||
public.writeFile(self.conf_path, json.dumps(self.__feishu_info))
|
||||
return public.returnMsg(True, 'successfully set')
|
||||
return public.returnMsg(True, public.lang("successfully set"))
|
||||
else:
|
||||
return public.returnMsg(False, 'Failed to add, please check whether the URL is correct')
|
||||
return public.returnMsg(False, public.lang("Failed to add, please check whether the URL is correct"))
|
||||
|
||||
|
||||
def get_send_msg(self,msg):
|
||||
@@ -152,7 +152,7 @@ class feishu_msg:
|
||||
@msg 消息正文
|
||||
"""
|
||||
if not self.__feishu_info :
|
||||
return public.returnMsg(False,'Feishu information is not configured correctly.')
|
||||
return public.returnMsg(False, public.lang("Feishu information is not configured correctly."))
|
||||
|
||||
msg,title = self.get_send_msg(msg)
|
||||
if self.__feishu_info["isAtAll"]:
|
||||
|
||||
Reference in New Issue
Block a user