automas_admin/AUTO-MAS-test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(config): 重构通知配置项并优化Webhook获取逻辑

Browse Source
This commit is contained in:
AoXuan
2025-09-27 16:32:54 +08:00
parent d2066e9631
commit 2d6dae3fc9
4 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/core/config.py
View File

@@ -105,10 +105,7 @@ class GlobalConfig(ConfigBase):
Notify_ToAddress = ConfigItem("Notify", "ToAddress", "")
Notify_IfServerChan = ConfigItem("Notify", "IfServerChan", False, BoolValidator())
Notify_ServerChanKey = ConfigItem("Notify", "ServerChanKey", "")
Notify_IfCompanyWebHookBot = ConfigItem(
"Notify", "IfCompanyWebHookBot", False, BoolValidator()
)
Notify_CompanyWebHookBotUrl = ConfigItem("Notify", "CompanyWebHookBotUrl", "")
Notify_CustomWebhooks = ConfigItem("Notify", "CustomWebhooks", [])
Update_IfAutoUpdate = ConfigItem("Update", "IfAutoUpdate", False, BoolValidator())
Update_Source = ConfigItem(
@@ -348,12 +345,7 @@ class MaaUserConfig(ConfigBase):
"Notify", "IfServerChan", False, BoolValidator()
)
self.Notify_ServerChanKey = ConfigItem("Notify", "ServerChanKey", "")
self.Notify_IfCompanyWebHookBot = ConfigItem(
"Notify", "IfCompanyWebHookBot", False, BoolValidator()
)
self.Notify_CompanyWebHookBotUrl = ConfigItem(
"Notify", "CompanyWebHookBotUrl", ""
)
self.Notify_CustomWebhooks = ConfigItem("Notify", "CustomWebhooks", [])
def get_plan_info(self) -> Dict[str, Union[str, int]]:
"""获取当前的计划下信息"""
@@ -541,12 +533,7 @@ class GeneralUserConfig(ConfigBase):
"Notify", "IfServerChan", False, BoolValidator()
)
self.Notify_ServerChanKey = ConfigItem("Notify", "ServerChanKey", "")
self.Notify_IfCompanyWebHookBot = ConfigItem(
"Notify", "IfCompanyWebHookBot", False, BoolValidator()
)
self.Notify_CompanyWebHookBotUrl = ConfigItem(
"Notify", "CompanyWebHookBotUrl", ""
)
self.Notify_CustomWebhooks = ConfigItem("Notify", "CustomWebhooks", [])
class GeneralConfig(ConfigBase):

5
app/services/notification.py
View File

@@ -357,7 +357,10 @@ class Notification:
)
# 发送自定义Webhook通知
custom_webhooks = Config.get("Notify", "CustomWebhooks", [])
try:
custom_webhooks = Config.get("Notify", "CustomWebhooks")
except AttributeError:
custom_webhooks = []
if custom_webhooks:
for webhook in custom_webhooks:
if webhook.get("enabled", True):

15
app/task/MAA.py
View File

@@ -1907,7 +1907,10 @@ class MaaManager:
)
# 发送自定义Webhook通知
custom_webhooks = Config.get("Notify", "CustomWebhooks", [])
try:
custom_webhooks = Config.get("Notify", "CustomWebhooks")
except AttributeError:
custom_webhooks = []
if custom_webhooks:
for webhook in custom_webhooks:
if webhook.get("enabled", True):
@@ -1970,7 +1973,10 @@ class MaaManager:
)
# 发送自定义Webhook通知
custom_webhooks = Config.get("Notify", "CustomWebhooks", [])
try:
custom_webhooks = Config.get("Notify", "CustomWebhooks")
except AttributeError:
custom_webhooks = []
if custom_webhooks:
for webhook in custom_webhooks:
if webhook.get("enabled", True):
@@ -2055,7 +2061,10 @@ class MaaManager:
)
# 发送自定义Webhook通知（六星喜报）
custom_webhooks = Config.get("Notify", "CustomWebhooks", [])
try:
custom_webhooks = Config.get("Notify", "CustomWebhooks")
except AttributeError:
custom_webhooks = []
if custom_webhooks:
for webhook in custom_webhooks:
if webhook.get("enabled", True):

10
app/task/general.py
View File

@@ -983,7 +983,10 @@ class GeneralManager:
)
# 发送自定义Webhook通知
custom_webhooks = Config.get("Notify", "CustomWebhooks", [])
try:
custom_webhooks = Config.get("Notify", "CustomWebhooks")
except AttributeError:
custom_webhooks = []
if custom_webhooks:
for webhook in custom_webhooks:
if webhook.get("enabled", True):
@@ -1027,7 +1030,10 @@ class GeneralManager:
)
# 发送自定义Webhook通知
custom_webhooks = Config.get("Notify", "CustomWebhooks", [])
try:
custom_webhooks = Config.get("Notify", "CustomWebhooks")
except AttributeError:
custom_webhooks = []
if custom_webhooks:
for webhook in custom_webhooks:
if webhook.get("enabled", True):