1
0
mirror of https://github.com/6dylan6/jdpro.git synced 2025-07-13 16:13:07 +08:00
This commit is contained in:
2024
2025-01-26 23:23:01 +08:00
parent a99f5f3372
commit 976c65976e
3 changed files with 20 additions and 16 deletions

7
jd_health_draw.js Normal file

File diff suppressed because one or more lines are too long

View File

@ -441,17 +441,15 @@ def main():
if os.path.exists("/ql/config/auth.json"): if os.path.exists("/ql/config/auth.json"):
config="/ql/config/auth.json" config="/ql/config/auth.json"
envtype="ql" envtype="ql"
if os.path.exists("/ql/data/db/keyv.sqlite"):
config="/ql/data/db/keyv.sqlite"
envtype="ql_latest"
if os.path.exists("/ql/data/config/auth.json"): if os.path.exists("/ql/data/config/auth.json"):
config="/ql/data/config/auth.json" config="/ql/data/config/auth.json"
envtype="ql" envtype="ql"
if os.path.exists("/jd/config/auth.json"): if os.path.exists("/jd/config/auth.json"):
config="/jd/config/auth.json" config="/jd/config/auth.json"
envtype="arcadia" envtype="arcadia"
if os.path.exists("/ql/data/db/keyv.sqlite"):
config="/ql/data/db/keyv.sqlite"
envtype="ql_latest"
if os.path.exists("/arcadia/config/auth.json"): if os.path.exists("/arcadia/config/auth.json"):
config="/arcadia/config/auth.json" config="/arcadia/config/auth.json"

View File

@ -233,14 +233,18 @@ def get_qltoken(username, password, twoFactorSecret): # 方法 用于获取青
# 返回值 Token # 返回值 Token
def ql_login() -> str: # 方法 青龙登录(获取Token 功能同上) def ql_login() -> str: # 方法 青龙登录(获取Token 功能同上)
path = '/ql/config/auth.json' # 设置青龙 auth文件地址 path_latest = '/ql/data/db/keyv.sqlite' # 设置青龙 auth文件地址
path = '/ql/data/config/auth.json'
if not os.path.isfile(path): if not os.path.isfile(path):
path = '/ql/data/config/auth.json' # 尝试设置青龙 auth 新版文件地址 path = '/ql/config/auth.json' # 尝试设置青龙 auth 新版文件地址
if not os.path.isfile(path):
path_latest = '/ql/data/db/keyv.sqlite' # 尝试设置青龙 auth 新版文件地址
if os.path.isfile(path) or os.path.isfile(path_latest): # 进行文件真值判断 if os.path.isfile(path) or os.path.isfile(path_latest): # 进行文件真值判断
if os.path.isfile(path): if os.path.isfile(path_latest):
with open(path_latest, "r", encoding="latin1") as file:
auth = file.read() # 读取文件
matches = re.search(r'token":"([^"]+)"', auth)
token = matches.group(1)
else:
with open(path, "r") as file: # 上下文管理 with open(path, "r") as file: # 上下文管理
auth = file.read() # 读取文件 auth = file.read() # 读取文件
file.close() # 关闭文件 file.close() # 关闭文件
@ -248,11 +252,6 @@ def ql_login() -> str: # 方法 青龙登录(获取Token 功能同上)
username = auth["username"] # 提取 username username = auth["username"] # 提取 username
password = auth["password"] # 提取 password password = auth["password"] # 提取 password
token = auth["token"] # 提取 authkey token = auth["token"] # 提取 authkey
else:
with open(path_latest, "r", encoding="latin1") as file:
auth = file.read() # 读取文件
matches = re.search(r'token":"([^"]+)"', auth)
token = matches.group(1)
try: try:
twoFactorSecret = auth["twoFactorSecret"] twoFactorSecret = auth["twoFactorSecret"]