1

jd_taskop.py

@@ -7,7 +7,7 @@ new Env('重复任务优化');
 import json
 import logging
 import os
-import sys
+import sys,re
 import time
 import traceback
 
@@ -157,20 +157,29 @@ def disable_duplicate_tasks(ids: list) -> None:
 
 
 def get_token() -> str or None:
-    path = '/ql/config/auth.json'  # 设置青龙 auth文件地址
-    global flag1
-    flag1 = True
-    if not os.path.isfile(path):
-        path = '/ql/data/config/auth.json'  # 尝试设置青龙 auth 新版文件地址
-        flag1 = False
+    if os.path.exists("/ql/data/db/keyv.sqlite"):
+        path="/ql/data/db/keyv.sqlite"   
+    elif os.path.exists("/ql/config/auth.json"):
+        path="/ql/config/auth.json"
+    elif os.path.exists("/ql/data/config/auth.json"):
+        path="/ql/data/config/auth.json"
+  
     try:
-        with open(path, "r", encoding="utf-8") as f:
-            data = json.load(f)
+        if 'keyv' in path:
+            with open(path, "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:
+                auth = file.read()     
+            auth = json.loads(auth) 
+            token = auth["token"]              
     except Exception:
         logger.info(f"❌无法获取 token!!!\n{traceback.format_exc()}")
         send("禁用重复任务失败", "无法获取 token!!!")
         exit(1)
-    return data.get("token")
+    return token
 
 
 if __name__ == "__main__":

jd_wsck.py

@@ -441,7 +441,9 @@ def main():
     if os.path.exists("/ql/config/auth.json"):
         config="/ql/config/auth.json"
         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"):
         config="/ql/data/config/auth.json"
         envtype="ql"
@@ -499,9 +501,21 @@ def main():
         url = 'http://127.0.0.1:5678/openApi/count'
         headers = {'Content-Type': 'application/json', 'Authorization': 'Bearer ', 'api-token': f'{token}'} 
         datas = get(url, headers=headers).json()["data"]["accountCount"]
-    
-    # printf(f"token：{token}")
-    # printf(f"datas：{datas}")
+    elif envtype == "ql_latest":
+        with open(config, "r", encoding="latin1") as f1:
+            content = f1.read()
+            matches = re.search(r'token":"([^"]+)"', content)
+            try:
+                token = matches.group(1)
+            except Exception as e:
+                sys.exit(0)
+        url = 'http://127.0.0.1:5600/api/envs'
+        headers = {'Authorization': f'Bearer {token}'}
+        body = {
+            'searchValue': 'JD_WSCK',
+            'Authorization': f'Bearer {token}'
+        }
+        datas = get(url, params=body, headers=headers).json()['data']
         
 
     if datas > 0 if isinstance(datas, int) else len(datas) > 0:
@@ -510,7 +524,7 @@ def main():
         printf("\n错误:没有需要转换的JD_WSCK，退出脚本!")
         return
 
-    if envtype == "ql":
+    if envtype in ('ql','ql_latest'):
         for data in datas:
             randomuserAgent()
             if data['status']!=0:
@@ -527,7 +541,7 @@ def main():
             else:
                 newpin=getRemark(pin,token)
                 if "fake_" in cookie:
-                    message = f"pin为{newpin}的wskey过期了！"
+                    message = f"{newpin}的wskey过期了！"
                     printf(message)
                     url = 'http://127.0.0.1:5600/api/envs/disable'
                     try:

jd_wskey.py

@@ -236,7 +236,11 @@ def ql_login() -> str:  # 方法 青龙登录(获取Token 功能同上)
     path = '/ql/config/auth.json'  # 设置青龙 auth文件地址
     if not os.path.isfile(path):
         path = '/ql/data/config/auth.json'  # 尝试设置青龙 auth 新版文件地址
-    if os.path.isfile(path):  # 进行文件真值判断
+    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):
             with open(path, "r") as file:  # 上下文管理
                 auth = file.read()  # 读取文件
                 file.close()  # 关闭文件            
@@ -244,6 +248,12 @@ def ql_login() -> str:  # 方法 青龙登录(获取Token 功能同上)
             username = auth["username"]  # 提取 username
             password = auth["password"]  # 提取 password
             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:
             twoFactorSecret = auth["twoFactorSecret"]
         except Exception as err: