fix: rescourses改名res
6
.gitignore
vendored
@@ -26,6 +26,6 @@ data/
|
||||
debug/
|
||||
history/
|
||||
script/
|
||||
resources/notice.json
|
||||
resources/theme_image.json
|
||||
resources/images/Home/BannerTheme.jpg
|
||||
res/notice.json
|
||||
res/theme_image.json
|
||||
res/images/Home/BannerTheme.jpg
|
||||
@@ -61,7 +61,7 @@ class Notification:
|
||||
title=title,
|
||||
message=message,
|
||||
app_name="AUTO_MAA",
|
||||
app_icon=(Path.cwd() / "resources/icons/AUTO_MAA.ico").as_posix(),
|
||||
app_icon=(Path.cwd() / "res/icons/AUTO_MAA.ico").as_posix(),
|
||||
timeout=t,
|
||||
ticker=ticker,
|
||||
toast=True,
|
||||
@@ -272,7 +272,7 @@ class Notification:
|
||||
Config.get("Notify", "CompanyWebHookBotUrl"),
|
||||
)
|
||||
Notify.CompanyWebHookBotPushImage(
|
||||
Path.cwd() / "resources/images/notification/test_notify.png",
|
||||
Path.cwd() / "res/images/notification/test_notify.png",
|
||||
Config.get("Notify", "CompanyWebHookBotUrl"),
|
||||
)
|
||||
|
||||
|
||||
@@ -1840,7 +1840,7 @@ class MaaManager:
|
||||
"""通过所有渠道推送通知"""
|
||||
logger.info(f"开始推送通知,模式:{mode},标题:{title}")
|
||||
|
||||
env = Environment(loader=FileSystemLoader(str(Path.cwd() / "resources/html")))
|
||||
env = Environment(loader=FileSystemLoader(str(Path.cwd() / "res/html")))
|
||||
|
||||
if mode == "代理结果" and (
|
||||
Config.get("Notify", "SendTaskResultTime") == "任何时刻"
|
||||
@@ -2017,7 +2017,7 @@ class MaaManager:
|
||||
Config.get("Notify", "CompanyWebHookBotUrl"),
|
||||
)
|
||||
Notify.CompanyWebHookBotPushImage(
|
||||
Path.cwd() / "resources/images/notification/six_star.png",
|
||||
Path.cwd() / "res/images/notification/six_star.png",
|
||||
Config.get("Notify", "CompanyWebHookBotUrl"),
|
||||
)
|
||||
|
||||
@@ -2061,7 +2061,7 @@ class MaaManager:
|
||||
self.cur_user_data.get("Notify", "CompanyWebHookBotUrl"),
|
||||
)
|
||||
Notify.CompanyWebHookBotPushImage(
|
||||
Path.cwd() / "resources/images/notification/six_star.png",
|
||||
Path.cwd() / "res/images/notification/six_star.png",
|
||||
self.cur_user_data.get("Notify", "CompanyWebHookBotUrl"),
|
||||
)
|
||||
else:
|
||||
|
||||
@@ -937,7 +937,7 @@ class GeneralManager:
|
||||
|
||||
logger.info(f"开始推送通知,模式:{mode},标题:{title}")
|
||||
|
||||
env = Environment(loader=FileSystemLoader(str(Path.cwd() / "resources/html")))
|
||||
env = Environment(loader=FileSystemLoader(str(Path.cwd() / "res/html")))
|
||||
|
||||
if mode == "代理结果" and (
|
||||
Config.get("Notify", "SendTaskResultTime") == "任何时刻"
|
||||
|
||||
|
Before Width: | Height: | Size: 51 KiB After Width: | Height: | Size: 51 KiB |
|
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 38 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 1.7 MiB After Width: | Height: | Size: 1.7 MiB |
|
Before Width: | Height: | Size: 309 KiB After Width: | Height: | Size: 309 KiB |
|
Before Width: | Height: | Size: 222 KiB After Width: | Height: | Size: 222 KiB |
|
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 32 KiB |