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

fix: 修复MAA运行时错误获取user_id

Browse Source
This commit is contained in:
DLmaster361
2025-09-14 22:34:06 +08:00
parent 8ea6c9565e
commit 3b9d27383b
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/ConfigBase.py
View File

@@ -308,6 +308,8 @@ class ConfigItem:
要设置的值, 可以是任何合法类型
"""
print(self.group, self.name, value, self.value)
if (
dpapi_decrypt(self.value)
if isinstance(self.validator, EncryptValidator)

8
app/task/MAA.py
View File

@@ -1357,12 +1357,12 @@ class MaaManager:
elif self.user_id is not None:
if (
Path.cwd()
/ f"data/{self.script_id}/{self.user_id}/ConfigFile/gui.json"
/ f"data/{self.script_id}/{self.user_list[self.index]['user_id']}/ConfigFile/gui.json"
).exists():
shutil.copy(
(
Path.cwd()
/ f"data/{self.script_id}/{self.user_id}/ConfigFile/gui.json"
/ f"data/{self.script_id}/{self.user_list[self.index]['user_id']}/ConfigFile/gui.json"
),
self.maa_set_path,
)
@@ -1597,7 +1597,7 @@ class MaaManager:
if (
Path.cwd()
/ f"data/{self.script_id}/{self.user_id}/Infrastructure/infrastructure.json"
/ f"data/{self.script_id}/{self.user_list[self.index]['user_id']}/Infrastructure/infrastructure.json"
).exists():
data["Configurations"]["Default"][
@@ -1618,7 +1618,7 @@ class MaaManager:
"Infrast.CustomInfrastFile"
] = str(
Path.cwd()
/ f"data/{self.script_id}/{self.user_id}/Infrastructure/infrastructure.json"
/ f"data/{self.script_id}/{self.user_list[self.index]['user_id']}/Infrastructure/infrastructure.json"
) # 自定义基建配置文件地址
else:
logger.warning(