diff --git a/jd_bean_change.js b/jd_bean_change.js
index 43a1d81..de8e824 100644
--- a/jd_bean_change.js
+++ b/jd_bean_change.js
@@ -1187,7 +1187,7 @@ async function Monthbean() {
 
 async function jdCash() {
 	let functionId = "cash_homePage";
-	let body = {};	  
+	/* let body = {};	  
 	console.log(`正在获取领现金任务签名...`);
 	isSignError = false;
 	let sign = await getSign(functionId, body);
@@ -1209,7 +1209,8 @@ async function jdCash() {
 			console.log(`领现金任务签名获取失败...`)
 			$.jdCash = 0;
 			return
-		}
+		} */
+		let sign = `body=%7B%7D&build=167968&client=apple&clientVersion=10.4.0&d_brand=apple&d_model=iPhone13%2C3&ef=1&eid=eidI25488122a6s9Uqq6qodtQx6rgQhFlHkaE1KqvCRbzRnPZgP/93P%2BzfeY8nyrCw1FMzlQ1pE4X9JdmFEYKWdd1VxutadX0iJ6xedL%2BVBrSHCeDGV1&ep=%7B%22ciphertype%22%3A5%2C%22cipher%22%3A%7B%22screen%22%3A%22CJO3CMeyDJCy%22%2C%22osVersion%22%3A%22CJUkDK%3D%3D%22%2C%22openudid%22%3A%22CJSmCWU0DNYnYtS0DtGmCJY0YJcmDwCmYJC0DNHwZNc5ZQU2DJc3Zq%3D%3D%22%2C%22area%22%3A%22CJZpCJCmC180ENcnCv80ENc1EK%3D%3D%22%2C%22uuid%22%3A%22aQf1ZRdxb2r4ovZ1EJZhcxYlVNZSZz09%22%7D%2C%22ts%22%3A1648428189%2C%22hdid%22%3A%22JM9F1ywUPwflvMIpYPok0tt5k9kW4ArJEU3lfLhxBqw%3D%22%2C%22version%22%3A%221.0.3%22%2C%22appname%22%3A%22com.360buy.jdmobile%22%2C%22ridx%22%3A-1%7D&ext=%7B%22prstate%22%3A%220%22%2C%22pvcStu%22%3A%221%22%7D&isBackground=N&joycious=104&lang=zh_CN&networkType=3g&networklibtype=JDNetworkBaseAF&partner=apple&rfs=0000&scope=11&sign=98c0ea91318ef1313786d86d832f1d4d&st=1648428208392&sv=101&uemps=0-0&uts=0f31TVRjBSv7E8yLFU2g86XnPdLdKKyuazYDek9RnAdkKCbH50GbhlCSab3I2jwM04d75h5qDPiLMTl0I3dvlb3OFGnqX9NrfHUwDOpTEaxACTwWl6n//EOFSpqtKDhg%2BvlR1wAh0RSZ3J87iAf36Ce6nonmQvQAva7GoJM9Nbtdah0dgzXboUL2m5YqrJ1hWoxhCecLcrUWWbHTyAY3Rw%3D%3D`
 		return new Promise((resolve) => {
 			$.post(apptaskUrl(functionId, sign), async (err, resp, data) => {
 				try {
diff --git a/jd_cash.js b/jd_cash_Mod.js
similarity index 71%
rename from jd_cash.js
rename to jd_cash_Mod.js
index 1e90980..ae22f32 100644
--- a/jd_cash.js
+++ b/jd_cash_Mod.js
@@ -20,7 +20,7 @@ cron "2 0-23/4 * * *" script-path=jd_cash.js,tag=签到领现金
 ============小火箭=========
 签到领现金 = type=cron,script-path=jd_cash.js, cronexpr="2 0-23/4 * * *", timeout=3600, enable=true
  */
-const $ = new Env('签到领现金');
+const $ = new Env('签到领现金潘达接口版');
 const notify = $.isNode() ? require('./sendNotify') : '';
 //Node.js用户请在jdCookie.js处填写京东ck;
 const jdCookieNode = $.isNode() ? require('./jdCookie.js') : '';
@@ -30,10 +30,7 @@ let cookiesArr = [], cookie = '', message;
 let helpAuthor = true;
 const randomCount = $.isNode() ? 5 : 5;
 let cash_exchange = false;//是否消耗2元红包兑换200京豆，默认否
-const inviteCodes = [
-  `eU9Yau3kZ_4g-DiByHEQ0A@ZnQya-i1Y_UmpGzUnnEX@fkFwauq3ZA@f0JyJuW7bvQ@IhM0bu-0b_kv8W6E@eU9YKpnxOLhYtQSygTJQ@-oaWtXEHOrT_bNMMVso@eU9YG7XaD4lXsR2krgpG@KxMzZOW7YvQ@eU9Ya7jnZP5w822BmntC0g@eU9YPa34F5lnpBWRjyp3@eU9YarnmYfRwpTzUziAV1Q`,
-  `eU9Yau3kZ_4g-DiByHEQ0A@ZnQya-i1Y_UmpGzUnnEX@fkFwauq3ZA@f0JyJuW7bvQ@IhM0bu-0b_kv8W6E@eU9YKpnxOLhYtQSygTJQ@-oaWtXEHOrT_bNMMVso@eU9YG7XaD4lXsR2krgpG@KxMzZOW7YvQ@eU9Ya7jnZP5w822BmntC0g@eU9YPa34F5lnpBWRjyp3@eU9YarnmYfRwpTzUziAV1Q`,
-]
+const inviteCodes = []
 if ($.isNode()) {
   Object.keys(jdCookieNode).forEach((item) => {
     cookiesArr.push(jdCookieNode[item])
@@ -49,13 +46,8 @@ let allMessage = '';
     $.msg($.name, '【提示】请先获取京东账号一cookie\n直接使用NobyDa的京东签到获取', 'https://bean.m.jd.com/bean/signIndex.action', {"open-url": "https://bean.m.jd.com/bean/signIndex.action"});
     return;
   }
-  await requireConfig()
-  $.authorCode = await getAuthorShareCode('https://raw.githubusercontent.com/Aaron-lv/updateTeam/master/shareCodes/jd_updateCash.json')
-  if (!$.authorCode) {
-    $.http.get({url: 'https://purge.jsdelivr.net/gh/Aaron-lv/updateTeam@master/shareCodes/jd_updateCash.json'}).then((resp) => {}).catch((e) => $.log('刷新CDN异常', e));
-    await $.wait(1000)
-    $.authorCode = await getAuthorShareCode('https://cdn.jsdelivr.net/gh/Aaron-lv/updateTeam@master/shareCodes/jd_updateCash.json') || []
-  }
+ // await requireConfig()
+  
   for (let i = 0; i < cookiesArr.length; i++) {
     if (cookiesArr[i]) {
       cookie = cookiesArr[i];
@@ -94,48 +86,21 @@ async function jdCash() {
   await appindex()
   await index()
 
-  await shareCodesFormat()
-  // await helpFriends()
-  // await getReward()
-  // await getReward('2');
   $.exchangeBeanNum = 0;
   cash_exchange = $.isNode() ? (process.env.CASH_EXCHANGE ? process.env.CASH_EXCHANGE : `${cash_exchange}`) : ($.getdata('cash_exchange') ? $.getdata('cash_exchange') : `${cash_exchange}`);
-  // if (cash_exchange === 'true') {
-  //   if(Number($.signMoney) >= 2){
-  //     console.log(`\n\n开始花费2元红包兑换200京豆，一周可换五次`)
-  //     for (let item of ["-1", "0", "1", "2", "3"]) {
-  //       $.canLoop = true;
-  //       if ($.canLoop) {
-  //         for (let i = 0; i < 5; i++) {
-  //           await exchange2(item);//兑换200京豆(2元红包换200京豆，一周5次。)
-  //         }
-  //         if (!$.canLoop) {
-  //           console.log(`已找到符合的兑换条件，跳出\n`);
-  //           break
-  //         }
-  //       }
-  //     }
-  //     if ($.exchangeBeanNum) {
-  //       message += `兑换京豆成功，获得${$.exchangeBeanNum * 100}京豆\n`;
-  //     }
-  //   }else{
-  //     console.log(`\n\n现金不够2元，不进行兑换200京豆，`)
-  //   }
-  // }
+
   await appindex(true)
-  // await showMsg()
 }
 
 async function appindex(info=false) {
   let functionId = "cash_homePage"
-  let body = {}
-  let sign = await getSign(functionId, body)
+  let sign = `body=%7B%7D&build=167968&client=apple&clientVersion=10.4.0&d_brand=apple&d_model=iPhone13%2C3&ef=1&eid=eidI25488122a6s9Uqq6qodtQx6rgQhFlHkaE1KqvCRbzRnPZgP/93P%2BzfeY8nyrCw1FMzlQ1pE4X9JdmFEYKWdd1VxutadX0iJ6xedL%2BVBrSHCeDGV1&ep=%7B%22ciphertype%22%3A5%2C%22cipher%22%3A%7B%22screen%22%3A%22CJO3CMeyDJCy%22%2C%22osVersion%22%3A%22CJUkDK%3D%3D%22%2C%22openudid%22%3A%22CJSmCWU0DNYnYtS0DtGmCJY0YJcmDwCmYJC0DNHwZNc5ZQU2DJc3Zq%3D%3D%22%2C%22area%22%3A%22CJZpCJCmC180ENcnCv80ENc1EK%3D%3D%22%2C%22uuid%22%3A%22aQf1ZRdxb2r4ovZ1EJZhcxYlVNZSZz09%22%7D%2C%22ts%22%3A1648428189%2C%22hdid%22%3A%22JM9F1ywUPwflvMIpYPok0tt5k9kW4ArJEU3lfLhxBqw%3D%22%2C%22version%22%3A%221.0.3%22%2C%22appname%22%3A%22com.360buy.jdmobile%22%2C%22ridx%22%3A-1%7D&ext=%7B%22prstate%22%3A%220%22%2C%22pvcStu%22%3A%221%22%7D&isBackground=N&joycious=104&lang=zh_CN&networkType=3g&networklibtype=JDNetworkBaseAF&partner=apple&rfs=0000&scope=11&sign=98c0ea91318ef1313786d86d832f1d4d&st=1648428208392&sv=101&uemps=0-0&uts=0f31TVRjBSv7E8yLFU2g86XnPdLdKKyuazYDek9RnAdkKCbH50GbhlCSab3I2jwM04d75h5qDPiLMTl0I3dvlb3OFGnqX9NrfHUwDOpTEaxACTwWl6n//EOFSpqtKDhg%2BvlR1wAh0RSZ3J87iAf36Ce6nonmQvQAva7GoJM9Nbtdah0dgzXboUL2m5YqrJ1hWoxhCecLcrUWWbHTyAY3Rw%3D%3D`
   return new Promise((resolve) => {
     $.post(apptaskUrl(functionId, sign), async (err, resp, data) => {
       try {
         if (err) {
           console.log(`${JSON.stringify(err)}`)
-          console.log(`${$.name} API请求失败，请检查网路重试`)
+          console.log(`appindex API请求失败，请检查网路重试`)
         } else {
           if (safeGet(data)) {
             data = JSON.parse(data);
@@ -202,7 +167,7 @@ function index() {
       try {
         if (err) {
           console.log(`${JSON.stringify(err)}`)
-          console.log(`${$.name} API请求失败，请检查网路重试`)
+          console.log(`index API请求失败，请检查网路重试`)
         } else {
           if (safeGet(data)) {
             data = JSON.parse(data);
@@ -245,63 +210,18 @@ function index() {
     })
   })
 }
-async function helpFriends() {
-  $.canHelp = true
-  for (let code of $.newShareCodes) {
-    console.log(`去帮助好友${code['inviteCode']}`)
-    await helpFriend(code)
-    if(!$.canHelp) break
-    await $.wait(1000)
-  }
-  // if (helpAuthor && $.authorCode) {
-  //   for(let helpInfo of $.authorCode){
-  //     console.log(`去帮助好友${helpInfo['inviteCode']}`)
-  //     await helpFriend(helpInfo)
-  //     if(!$.canHelp) break
-  //     await $.wait(1000)
-  //   }
-  // }
-}
-function helpFriend(helpInfo) {
-  return new Promise((resolve) => {
-    $.get(taskUrl("cash_mob_assist", {...helpInfo,"source":1}), (err, resp, data) => {
-      try {
-        if (err) {
-          console.log(`${JSON.stringify(err)}`)
-          console.log(`${$.name} API请求失败，请检查网路重试`)
-        } else {
-          if (safeGet(data)) {
-            data = JSON.parse(data);
-            if( data.code === 0 && data.data.bizCode === 0){
-              console.log(`助力成功，获得${data.data.result.cashStr}`)
-              // console.log(data.data.result.taskInfos)
-            } else if (data.data.bizCode===207){
-              console.log(data.data.bizMsg)
-              $.canHelp = false
-            } else{
-              console.log(data.data.bizMsg)
-            }
-          }
-        }
-      } catch (e) {
-        $.logErr(e, resp)
-      } finally {
-        resolve(data);
-      }
-    })
-  })
-}
 
 async function appdoTask(type,taskInfo) {
   let functionId = 'cash_doTask'
   let body = {"type":type,"taskInfo":taskInfo}
-  let sign = await getSign(functionId, body)
+  let sign = await getSignfromPanda(functionId, body)  
+
   return new Promise((resolve) => {
     $.post(apptaskUrl(functionId, sign), (err, resp, data) => {
       try {
         if (err) {
           console.log(`${JSON.stringify(err)}`)
-          console.log(`${$.name} API请求失败，请检查网路重试`)
+          console.log(`appdoTask API请求失败，请检查网路重试`)
         } else {
           if (safeGet(data)) {
             data = JSON.parse(data);
@@ -327,7 +247,7 @@ function doTask(type,taskInfo) {
       try {
         if (err) {
           console.log(`${JSON.stringify(err)}`)
-          console.log(`${$.name} API请求失败，请检查网路重试`)
+          console.log(`doTask API请求失败，请检查网路重试`)
         } else {
           if (safeGet(data)) {
             data = JSON.parse(data);
@@ -347,127 +267,39 @@ function doTask(type,taskInfo) {
     })
   })
 }
-function getReward(source = 1) {
-  return new Promise((resolve) => {
-    $.get(taskUrl("cash_mob_reward",{"source": Number(source),"rewardNode":""}), (err, resp, data) => {
-      try {
-        if (err) {
-          console.log(`${JSON.stringify(err)}`)
-          console.log(`${$.name} API请求失败，请检查网路重试`)
-        } else {
-          if (safeGet(data)) {
-            data = JSON.parse(data);
-            if (data.code === 0 && data.data.bizCode === 0) {
-              console.log(`领奖成功，${data.data.result.shareRewardTip}【${data.data.result.shareRewardAmount}】`)
-              message += `领奖成功，${data.data.result.shareRewardTip}【${data.data.result.shareRewardAmount}元】\n`;
-              // console.log(data.data.result.taskInfos)
-            } else {
-              // console.log(`领奖失败，${data.data.bizMsg}`)
-            }
-          }
+function getSignfromPanda(functionId, body) {	
+    var strsign = '';
+	let data = {
+      "fn":functionId,
+      "body": body
+    }
+    return new Promise((resolve) => {
+        let url = {
+            url: "https://api.jds.codes/jd/sign",
+            body: JSON.stringify(data),
+		    followRedirect: false,
+		    headers: {
+		        'Accept': '*/*',
+		        "accept-encoding": "gzip, deflate, br",
+		        'Content-Type': 'application/json',
+		    },
+		    timeout: 30000
         }
-      } catch (e) {
-        $.logErr(e, resp)
-      } finally {
-        resolve(data);
-      }
+        $.post(url, async(err, resp, data) => {
+            try {				
+                data = JSON.parse(data);				
+				strsign=data.data.sign;
+				
+            }catch (e) {
+                $.logErr(e, resp);
+            }finally {
+				resolve(strsign);
+			}
+        })
     })
-  })
 }
-function exchange2(node) {
-  let body = '';
-  const data = {node,"configVersion":"1.0"}
-  if (data['node'] === '-1') {
-    body = `body=${encodeURIComponent(JSON.stringify(data))}&uuid=8888888&client=apple&clientVersion=9.4.1&st=1619595890027&sign=92a8abba7b6846f274ac9803aa5a283d&sv=102`;
-  } else if (data['node'] === '0') {
-    body = `body=${encodeURIComponent(JSON.stringify(data))}&uuid=8888888&client=apple&clientVersion=9.4.1&st=1619597882090&sign=e00bd6c3af2a53820825b94f7a648551&sv=100`;
-  } else if (data['node'] === '1') {
-    body = `body=${encodeURIComponent(JSON.stringify(data))}&uuid=8888888&client=apple&clientVersion=9.4.1&st=1619595655007&sign=2e72bbd21e5f5775fe920eac129f89a2&sv=111`;
-  } else if (data['node'] === '2') {
-    body = `body=${encodeURIComponent(JSON.stringify(data))}&uuid=8888888&client=apple&clientVersion=9.4.1&st=1619597924095&sign=c04c70370ff68d71890de08a18cac981&sv=112`;
-  } else if (data['node'] === '3') {
-    body = `body=${encodeURIComponent(JSON.stringify(data))}&uuid=8888888&client=apple&clientVersion=9.4.1&st=1619597953001&sign=4c36b3d816d4f0646b5c34e7596502f8&sv=122`;
-  }
-  return new Promise((resolve) => {
-    const options = {
-      url: `${JD_API_HOST}?functionId=cash_exchangeBeans&t=${Date.now()}&${body}`,
-      body: `body=${escape(JSON.stringify(data))}`,
-      headers: {
-        'Cookie': cookie,
-        'Host': 'api.m.jd.com',
-        'Connection': 'keep-alive',
-        'Content-Type': 'application/x-www-form-urlencoded',
-        'User-Agent': $.isNode() ? (process.env.JD_USER_AGENT ? process.env.JD_USER_AGENT : (require('./USER_AGENTS').USER_AGENT)) : ($.getdata('JDUA') ? $.getdata('JDUA') : "jdapp;iPhone;9.2.2;14.2;%E4%BA%AC%E4%B8%9C/9.2.2 CFNetwork/1206 Darwin/20.1.0"),
-        'Accept-Language': 'zh-cn',
-        'Accept-Encoding': 'gzip, deflate, br',
-      }
-    }
-    $.post(options, async (err, resp, data) => {
-      try {
-        if (err) {
-          console.log(`${JSON.stringify(err)}`)
-          console.log(`${$.name} API请求失败，请检查网路重试`)
-        } else {
-          if (safeGet(data)) {
-            data = JSON.parse(data);
-            if (data['code'] === 0) {
-              if (data.data.bizCode === 0) {
-                console.log(`花费${data.data.result.needMoney}元红包兑换成功！获得${data.data.result.beanName}\n`)
-                $.exchangeBeanNum += parseInt(data.data.result.needMoney);
-                $.canLoop = false;
-              } else {
-                console.log('花费2元红包兑换200京豆失败：' + data.data.bizMsg)
-                if (data.data.bizCode === 504) $.canLoop = true;
-                if (data.data.bizCode === 120) $.canLoop = false;
-              }
-            } else {
-              console.log(`兑换京豆失败：${JSON.stringify(data)}\n`);
-            }
-          }
-        }
-      } catch (e) {
-        $.logErr(e, resp)
-      } finally {
-        resolve(data);
-      }
-    })
-  })
-}
-function getSign(functionId, body) {
-  return new Promise(async resolve => {
-    let data = {
-      functionId,
-      body: JSON.stringify(body),
-      "client":"apple",
-      "clientVersion":"10.3.0"
-    }
-    let HostArr = ['jdsign.cf', 'signer.nz.lu']
-    let Host = HostArr[Math.floor((Math.random() * HostArr.length))]
-    let options = {
-      url: `https://cdn.nz.lu/ddo`,
-      body: JSON.stringify(data),
-      headers: {
-        Host,
-        "User-Agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.3 Mobile/15E148 Safari/604.1 Edg/87.0.4280.88"
-      },
-      timeout: 30 * 1000
-    }
-    $.post(options, (err, resp, data) => {
-      try {
-        if (err) {
-          console.log(JSON.stringify(err))
-          console.log(`${$.name} getSign API请求失败，请检查网路重试`)
-        } else {
 
-        }
-      } catch (e) {
-        $.logErr(e, resp)
-      } finally {
-        resolve(data);
-      }
-    })
-  })
-}
+
 function randomString(e) {
   e = e || 32;
   let t = "abcdefghijklmnopqrstuvwxyz0123456789", a = t.length, n = "";
@@ -509,30 +341,6 @@ function readShareCode() {
     resolve()
   })
 }
-//格式化助力码
-function shareCodesFormat() {
-  return new Promise(async resolve => {
-    // console.log(`第${$.index}个京东账号的助力码:::${$.shareCodesArr[$.index - 1]}`)
-    $.newShareCodes = [];
-    if ($.shareCodesArr[$.index - 1]) {
-      $.newShareCodes = $.shareCodesArr[$.index - 1].split('@');
-    } else {
-      console.log(`由于您第${$.index}个京东账号未提供shareCode,将采纳本脚本自带的助力码\n`)
-      const tempIndex = $.index > inviteCodes.length ? (inviteCodes.length - 1) : ($.index - 1);
-      $.newShareCodes = inviteCodes[tempIndex].split('@');
-      let authorCode = deepCopy($.authorCode)
-      $.newShareCodes = [...(authorCode.map((item, index) => authorCode[index] = item['inviteCode'])), ...$.newShareCodes];
-    }
-    // const readShareCodeRes = await readShareCode();
-    // if (readShareCodeRes && readShareCodeRes.code === 200) {
-    //   $.newShareCodes = [...new Set([...$.newShareCodes, ...(readShareCodeRes.data || [])])];
-    // }
-    $.newShareCodes.map((item, index) => $.newShareCodes[index] = { "inviteCode": item, "shareDate": $.shareDate })
-    console.log(`第${$.index}个京东账号将要助力的好友${JSON.stringify($.newShareCodes)}`)
-    resolve();
-  })
-}
-
 function requireConfig() {
   return new Promise(resolve => {
     console.log(`开始获取${$.name}配置文件\n`);
diff --git a/jd_wskey.py b/jd_wskey.py
index 2479647..e1a7bce 100644
--- a/jd_wskey.py
+++ b/jd_wskey.py
@@ -2,521 +2,522 @@
 '''
 new Env('wskey转换');
 '''
-import socket
-import base64
-import json
-import os
-import sys
-import logging
-import time
-import re
+import socket  # 用于端口检测
+import base64  # 用于编解码
+import json  # 用于Json解析
+import os  # 用于导入系统变量
+import sys  # 实现 sys.exit
+import logging  # 用于日志输出
+import time  # 时间
+import re  # 正则过率
 
-if "WSKEY_DEBUG" in os.environ:
-    logging.basicConfig(level=logging.DEBUG, format='%(message)s')
-    logger = logging.getLogger(__name__)
-    logger.debug("\nDEBUG模式开启!\n")
-else:
-    logging.basicConfig(level=logging.INFO, format='%(message)s')
-    logger = logging.getLogger(__name__)
+if "WSKEY_DEBUG" in os.environ:  # 判断调试模式变量
+    logging.basicConfig(level=logging.DEBUG, format='%(message)s')  # 设置日志为 Debug等级输出
+    logger = logging.getLogger(__name__)  # 主模块
+    logger.debug("\nDEBUG模式开启!\n")  # 消息输出
+else:  # 判断分支
+    logging.basicConfig(level=logging.INFO, format='%(message)s')  # Info级日志
+    logger = logging.getLogger(__name__)  # 主模块
 
-try:
-    import requests
-except Exception as e:
-    logger.info(str(e) + "\n缺少requests模块, 请执行命令：pip3 install requests\n")
-    sys.exit(1)
-os.environ['no_proxy'] = '*'
-requests.packages.urllib3.disable_warnings()
-try:
-    from notify import send
-except Exception as err:
-    logger.debug(str(err))
-    logger.info("无推送文件")
+try:  # 异常捕捉
+    import requests  # 导入HTTP模块
+except Exception as e:  # 异常捕捉
+    logger.info(str(e) + "\n缺少requests模块, 请执行命令：pip3 install requests\n")  # 日志输出
+    sys.exit(1)  # 退出脚本
+os.environ['no_proxy'] = '*'  # 禁用代理
+requests.packages.urllib3.disable_warnings()  # 抑制错误
+try:  # 异常捕捉
+    from notify import send  # 导入青龙消息通知模块
+except Exception as err:  # 异常捕捉
+    logger.debug(str(err))  # 调试日志输出
+    logger.info("无推送文件")  # 标准日志输出
 
-ver = 20218
+ver = 20318  # 版本号
 
 
 # 登录青龙 返回值 token
-def get_qltoken(username, password):
-    logger.info("Token失效, 新登陆\n")
-    url = "http://127.0.0.1:{0}/api/user/login".format(port)
+def get_qltoken(username, password):  # 方法 用于获取青龙 Token
+    logger.info("Token失效, 新登陆\n")  # 日志输出
+    url = "http://127.0.0.1:{0}/api/user/login".format(port)  # 设置青龙地址 使用 format格式化自定义端口
     payload = {
         'username': username,
         'password': password
-    }
-    payload = json.dumps(payload)
+    }  # HTTP请求载荷
+    payload = json.dumps(payload)  # json格式化载荷
     headers = {
         'Accept': 'application/json',
         'Content-Type': 'application/json'
-    }
-    try:
-        res = requests.post(url=url, headers=headers, data=payload)
-        token = json.loads(res.text)["data"]['token']
-    except Exception as err:
-        logger.debug(str(err))
-        logger.info("青龙登录失败, 请检查面板状态!")
-        text = '青龙面板WSKEY转换登陆面板失败, 请检查面板状态.'
-        try:
-            send('WSKEY转换', text)
-        except Exception as err:
-            logger.debug(str(err))
-            logger.info("通知发送失败")
-        sys.exit(1)
-    else:
-        return token
+    }  # HTTP请求头 设置为 Json格式
+    try:  # 异常捕捉
+        res = requests.post(url=url, headers=headers, data=payload)  # 使用 requests模块进行 HTTP POST请求
+        token = json.loads(res.text)["data"]['token']  # 从 res.text 返回值中 取出 Token值
+    except Exception as err:  # 异常捕捉
+        logger.debug(str(err))  # Debug日志输出
+        logger.info("青龙登录失败, 请检查面板状态!")  # 标准日志输出
+        text = '青龙面板WSKEY转换登陆面板失败, 请检查面板状态.'  # 设置推送内容
+        try:  # 异常捕捉
+            send('WSKEY转换', text)  # 消息发送
+        except Exception as err:  # 异常捕捉
+            logger.debug(str(err))  # Debug日志输出
+            logger.info("通知发送失败")  # 标准日志输出
+        sys.exit(1)  # 脚本退出
+    else:  # 无异常执行分支
+        return token  # 返回 token值
 
 
 # 返回值 Token
-def ql_login():
-    path = '/ql/config/auth.json'
-    if os.path.isfile(path):
-        with open(path, "r") as file:
-            auth = file.read()
-            file.close()
-        auth = json.loads(auth)
-        username = auth["username"]
-        password = auth["password"]
-        token = auth["token"]
-        if token == '':
-            return get_qltoken(username, password)
-        else:
-            url = "http://127.0.0.1:{0}/api/user".format(port)
+def ql_login():  # 方法 青龙登录(获取Token 功能同上)
+    path = '/ql/config/auth.json'  # 设置青龙 auth文件地址
+    if os.path.isfile(path):  # 进行文件真值判断
+        with open(path, "r") as file:  # 上下文管理
+            auth = file.read()  # 读取文件
+            file.close()  # 关闭文件
+        auth = json.loads(auth)  # 使用 json模块读取
+        username = auth["username"]  # 提取 username
+        password = auth["password"]  # 提取 password
+        token = auth["token"]  # 提取 authkey
+        if token == '':  # 判断 Token是否为空
+            return get_qltoken(username, password)  # 调用方法 get_qltoken 传递 username & password
+        else:  # 判断分支
+            url = "http://127.0.0.1:{0}/api/user".format(port)  # 设置URL请求地址 使用 Format格式化端口
             headers = {
                 'Authorization': 'Bearer {0}'.format(token),
                 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.71 Safari/537.36 Edg/94.0.992.38'
-            }
-            res = requests.get(url=url, headers=headers)
-            if res.status_code == 200:
-                return token
-            else:
-                return get_qltoken(username, password)
-    else:
-        logger.info("没有发现auth文件, 你这是青龙吗???")
-        sys.exit(0)
+            }  # 设置用于 HTTP头
+            res = requests.get(url=url, headers=headers)  # 调用 request模块发送 get请求
+            if res.status_code == 200:  # 判断 HTTP返回状态码
+                return token  # 有效 返回 token
+            else:  # 判断分支
+                return get_qltoken(username, password)  # 调用方法 get_qltoken 传递 username & password
+    else:  # 判断分支
+        logger.info("没有发现auth文件, 你这是青龙吗???")  # 输出标准日志
+        sys.exit(0)  # 脚本退出
 
 
 # 返回值 list[wskey]
-def get_wskey():
-    if "JD_WSCK" in os.environ:
-        wskey_list = os.environ['JD_WSCK'].split('&')
-        if len(wskey_list) > 0:
-            return wskey_list
-        else:
-            logger.info("JD_WSCK变量未启用")
-            sys.exit(1)
-    else:
-        logger.info("未添加JD_WSCK变量")
-        sys.exit(0)
+def get_wskey():  # 方法 获取 wskey值 [系统变量传递]
+    if "JD_WSCK" in os.environ:  # 判断 JD_WSCK是否存在于环境变量
+        wskey_list = os.environ['JD_WSCK'].split('&')  # 读取系统变量 以 & 分割变量
+        if len(wskey_list) > 0:  # 判断 WSKEY 数量 大于 0 个
+            return wskey_list  # 返回 WSKEY [LIST]
+        else:  # 判断分支
+            logger.info("JD_WSCK变量未启用")  # 标准日志输出
+            sys.exit(1)  # 脚本退出
+    else:  # 判断分支
+        logger.info("未添加JD_WSCK变量")  # 标准日志输出
+        sys.exit(0)  # 脚本退出
 
 
 # 返回值 list[jd_cookie]
-def get_ck():
-    if "JD_COOKIE" in os.environ:
-        ck_list = os.environ['JD_COOKIE'].split('&')
-        if len(ck_list) > 0:
-            return ck_list
-        else:
-            logger.info("JD_COOKIE变量未启用")
-            sys.exit(1)
-    else:
-        logger.info("未添加JD_COOKIE变量")
-        sys.exit(0)
+def get_ck():  # 方法 获取 JD_COOKIE值 [系统变量传递] <! 此方法未使用 !>
+    if "JD_COOKIE" in os.environ:  # 判断 JD_COOKIE是否存在于环境变量
+        ck_list = os.environ['JD_COOKIE'].split('&')  # 读取系统变量 以 & 分割变量
+        if len(ck_list) > 0:  # 判断 WSKEY 数量 大于 0 个
+            return ck_list  # 返回 JD_COOKIE [LIST]
+        else:  # 判断分支
+            logger.info("JD_COOKIE变量未启用")  # 标准日志输出
+            sys.exit(1)  # 脚本退出
+    else:   # 判断分支
+        logger.info("未添加JD_COOKIE变量")  # 标准日志输出
+        sys.exit(0)  # 脚本退出
 
 
 # 返回值 bool
-def check_ck(ck):
-    searchObj = re.search(r'pt_pin=([^;\s]+)', ck, re.M | re.I)
-    if searchObj:
-        pin = searchObj.group(1)
-    else:
-        pin = ck.split(";")[1]
-    if "WSKEY_UPDATE_HOUR" in os.environ:
-        updateHour = 23
-        if os.environ["WSKEY_UPDATE_HOUR"].isdigit():
-            updateHour = int(os.environ["WSKEY_UPDATE_HOUR"])
-        nowTime = time.time()
-        updatedAt = 0.0
-        searchObj = re.search(r'__time=([^;\s]+)', ck, re.M | re.I)
-        if searchObj:
-            updatedAt = float(searchObj.group(1))
-        if nowTime - updatedAt >= (updateHour * 60 * 60) - (10 * 60):
-            logger.info(str(pin) + ";即将到期或已过期\n")
-            return False
-        else:
-            remainingTime = (updateHour * 60 * 60) - (nowTime - updatedAt)
-            hour = int(remainingTime / 60 / 60)
-            minute = int((remainingTime % 3600) / 60)
-            logger.info(str(pin) + ";未到期，{0}时{1}分后更新\n".format(hour, minute))
-            return True
-    elif "WSKEY_DISCHECK" in os.environ:
-        logger.info("不检查账号有效性\n--------------------\n")
-        return False
-    else:
-        url = 'https://me-api.jd.com/user_new/info/GetJDUserInfoUnion'
+def check_ck(ck):  # 方法 检查 Cookie有效性 使用变量传递 单次调用
+    searchObj = re.search(r'pt_pin=([^;\s]+)', ck, re.M | re.I)  # 正则检索 pt_pin
+    if searchObj:  # 真值判断
+        pin = searchObj.group(1)  # 取值
+    else:  # 判断分支
+        pin = ck.split(";")[1]  # 取值 使用 ; 分割
+    if "WSKEY_UPDATE_HOUR" in os.environ:  # 判断 WSKEY_UPDATE_HOUR是否存在于环境变量
+        updateHour = 23  # 更新间隔23小时
+        if os.environ["WSKEY_UPDATE_HOUR"].isdigit():  # 检查是否为 DEC值
+            updateHour = int(os.environ["WSKEY_UPDATE_HOUR"])  # 使用 int化数字
+        nowTime = time.time()  # 获取时间戳 赋值
+        updatedAt = 0.0  # 赋值
+        searchObj = re.search(r'__time=([^;\s]+)', ck, re.M | re.I)  # 正则检索 [__time=]
+        if searchObj:   # 真值判断
+            updatedAt = float(searchObj.group(1))  # 取值 [float]类型
+        if nowTime - updatedAt >= (updateHour * 60 * 60) - (10 * 60):  # 判断时间操作
+            logger.info(str(pin) + ";即将到期或已过期\n")  # 标准日志输出
+            return False  # 返回 Bool类型 False
+        else:  # 判断分支
+            remainingTime = (updateHour * 60 * 60) - (nowTime - updatedAt)  # 时间运算操作
+            hour = int(remainingTime / 60 / 60)  # 时间运算操作 [int]
+            minute = int((remainingTime % 3600) / 60)  # 时间运算操作 [int]
+            logger.info(str(pin) + ";未到期，{0}时{1}分后更新\n".format(hour, minute))  # 标准日志输出
+            return True  # 返回 Bool类型 True
+    elif "WSKEY_DISCHECK" in os.environ:  # 判断分支 WSKEY_DISCHECK 是否存在于系统变量
+        logger.info("不检查账号有效性\n--------------------\n")  # 标准日志输出
+        return False  # 返回 Bool类型 False
+    else:  # 判断分支
+        url = 'https://me-api.jd.com/user_new/info/GetJDUserInfoUnion'  # 设置JD_API接口地址
         headers = {
             'Cookie': ck,
             'Referer': 'https://home.m.jd.com/myJd/home.action',
             'user-agent': ua
-        }
-        try:
-            res = requests.get(url=url, headers=headers, verify=False, timeout=10)
-        except Exception as err:
-            logger.debug(str(err))
-            logger.info("JD接口错误 请重试或者更换IP")
-            return False
-        else:
-            if res.status_code == 200:
-                code = int(json.loads(res.text)['retcode'])
-                if code == 0:
-                    logger.info(str(pin) + ";状态正常\n")
-                    return True
-                else:
+        }  # 设置 HTTP头
+        try:  # 异常捕捉
+            res = requests.get(url=url, headers=headers, verify=False, timeout=10)  # 进行 HTTP请求[GET] 超时 10秒
+        except Exception as err:  # 异常捕捉
+            logger.debug(str(err))  # 调试日志输出
+            logger.info("JD接口错误 请重试或者更换IP")  # 标准日志输出
+            return False   # 返回 Bool类型 False
+        else:  # 判断分支
+            if res.status_code == 200:  # 判断 JD_API 接口是否为 200 [HTTP_OK]
+                code = int(json.loads(res.text)['retcode'])  # 使用 Json模块对返回数据取值 int([retcode])
+                if code == 0:  # 判断 code值
+                    logger.info(str(pin) + ";状态正常\n")  # 标准日志输出
+                    return True  # 返回 Bool类型 True
+                else:  # 判断分支
                     logger.info(str(pin) + ";状态失效\n")
-                    return False
-            else:
-                logger.info("JD接口错误码: " + str(res.status_code))
-                return False
+                    return False  # 返回 Bool类型 False
+            else:  # 判断分支
+                logger.info("JD接口错误码: " + str(res.status_code))  # 标注日志输出
+                return False  # 返回 Bool类型 False
 
 
 # 返回值 bool jd_ck
-def getToken(wskey):
-    try:
-        url = str(base64.b64decode(url_t).decode()) + 'genToken'
-        header = {"User-Agent": ua}
-        params = requests.get(url=url, headers=header, verify=False, timeout=20).json()
-    except Exception as err:
-        logger.info("Params参数获取失败")
-        logger.debug(str(err))
-        return False, wskey
+def getToken(wskey):  # 方法 获取 Wskey转换使用的 Token 由 JD_API 返回 这里传递 wskey
+    try:  # 异常捕捉
+        url = str(base64.b64decode(url_t).decode()) + 'genToken'  # 设置云端服务器地址 路由为 genToken
+        header = {"User-Agent": ua}  # 设置 HTTP头
+        params = requests.get(url=url, headers=header, verify=False, timeout=20).json()  # 设置 HTTP请求参数 超时 20秒 Json解析
+    except Exception as err:  # 异常捕捉
+        logger.info("Params参数获取失败")  # 标准日志输出
+        logger.debug(str(err))  # 调试日志输出
+        return False, wskey  # 返回 -> False[Bool], Wskey
     headers = {
         'cookie': wskey,
         'content-type': 'application/x-www-form-urlencoded; charset=UTF-8',
         'charset': 'UTF-8',
         'accept-encoding': 'br,gzip,deflate',
         'user-agent': ua
-    }
-    url = 'https://api.m.jd.com/client.action'
-    data = 'body=%7B%22to%22%3A%22https%253a%252f%252fplogin.m.jd.com%252fjd-mlogin%252fstatic%252fhtml%252fappjmp_blank.html%22%7D&'
-    try:
-        res = requests.post(url=url, params=params, headers=headers, data=data, verify=False, timeout=10)
-        res_json = json.loads(res.text)
-        tokenKey = res_json['tokenKey']
-    except Exception as err:
-        logger.info("JD_WSKEY接口抛出错误 尝试重试 更换IP")
-        logger.info(str(err))
-        return False, wskey
-    else:
-        return appjmp(wskey, tokenKey)
+    }  # 设置 HTTP头
+    url = 'https://api.m.jd.com/client.action'  # 设置 URL地址
+    data = 'body=%7B%22to%22%3A%22https%253a%252f%252fplogin.m.jd.com%252fjd-mlogin%252fstatic%252fhtml%252fappjmp_blank.html%22%7D&'  # 设置 POST 载荷
+    try:  # 异常捕捉
+        res = requests.post(url=url, params=params, headers=headers, data=data, verify=False, timeout=10)  # HTTP请求 [POST] 超时 10秒
+        res_json = json.loads(res.text)  # Json模块 取值
+        tokenKey = res_json['tokenKey']  # 取出TokenKey
+    except Exception as err:  # 异常捕捉
+        logger.info("JD_WSKEY接口抛出错误 尝试重试 更换IP")  # 标准日志输出
+        logger.info(str(err))  # 标注日志输出
+        return False, wskey   # 返回 -> False[Bool], Wskey
+    else:  # 判断分支
+        return appjmp(wskey, tokenKey)  # 传递 wskey, Tokenkey 执行方法 [appjmp]
 
 
 # 返回值 bool jd_ck
-def appjmp(wskey, tokenKey):
-    wskey = "pt_" + str(wskey.split(";")[0])
-    if tokenKey == 'xxx':
-        logger.info(str(wskey) + ";疑似IP风控等问题 默认为失效\n--------------------\n")
-        return False, wskey
+def appjmp(wskey, tokenKey):  # 方法 传递 wskey & tokenKey
+    wskey = "pt_" + str(wskey.split(";")[0])  # 变量组合 使用 ; 分割变量 拼接 pt_
+    if tokenKey == 'xxx':  # 判断 tokenKey返回值
+        logger.info(str(wskey) + ";疑似IP风控等问题 默认为失效\n--------------------\n")  # 标准日志输出
+        return False, wskey  # 返回 -> False[Bool], Wskey
     headers = {
         'User-Agent': ua,
         'accept': 'accept:text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9',
         'x-requested-with': 'com.jingdong.app.mall'
-    }
+    }  # 设置 HTTP头
     params = {
         'tokenKey': tokenKey,
-        'to': 'https://plogin.m.jd.com/jd-mlogin/static/html/appjmp_blank.html',
-    }
-    url = 'https://un.m.jd.com/cgi-bin/app/appjmp'
-    try:
-        res = requests.get(url=url, headers=headers, params=params, verify=False, allow_redirects=False, timeout=20)
-    except Exception as err:
-        logger.info("JD_appjmp 接口错误 请重试或者更换IP\n")
-        logger.info(str(err))
-        return False, wskey
-    else:
-        try:
-            res_set = res.cookies.get_dict()
-            pt_key = 'pt_key=' + res_set['pt_key']
-            pt_pin = 'pt_pin=' + res_set['pt_pin']
-            if "WSKEY_UPDATE_HOUR" in os.environ:
-                jd_ck = str(pt_key) + ';' + str(pt_pin) + ';__time=' + str(time.time()) + ';'
-            else:
-                jd_ck = str(pt_key) + ';' + str(pt_pin) + ';'
-        except Exception as err:
-            logger.info("JD_appjmp提取Cookie错误 请重试或者更换IP\n")
-            logger.info(str(err))
-            return False, wskey
-        else:
-            if 'fake' in pt_key:
-                logger.info(str(wskey) + ";WsKey状态失效\n")
-                return False, wskey
-            else:
-                logger.info(str(wskey) + ";WsKey状态正常\n")
-                return True, jd_ck
+        'to': 'https://plogin.m.jd.com/jd-mlogin/static/html/appjmp_blank.html'
+    }  # 设置 HTTP_URL 参数
+    url = 'https://un.m.jd.com/cgi-bin/app/appjmp'  # 设置 URL地址
+    try:  # 异常捕捉
+        res = requests.get(url=url, headers=headers, params=params, verify=False, allow_redirects=False, timeout=20)  # HTTP请求 [GET] 阻止跳转 超时 20秒
+    except Exception as err:  # 异常捕捉
+        logger.info("JD_appjmp 接口错误 请重试或者更换IP\n")  # 标准日志输出
+        logger.info(str(err))  # 标准日志输出
+        return False, wskey  # 返回 -> False[Bool], Wskey
+    else:  # 判断分支
+        try:  # 异常捕捉
+            res_set = res.cookies.get_dict()  # 从res cookie取出
+            pt_key = 'pt_key=' + res_set['pt_key']  # 取值 [pt_key]
+            pt_pin = 'pt_pin=' + res_set['pt_pin']  # 取值 [pt_pin]
+            if "WSKEY_UPDATE_HOUR" in os.environ:  # 判断是否在系统变量中启用 WSKEY_UPDATE_HOUR
+                jd_ck = str(pt_key) + ';' + str(pt_pin) + ';__time=' + str(time.time()) + ';'  # 拼接变量
+            else:  # 判断分支
+                jd_ck = str(pt_key) + ';' + str(pt_pin) + ';'  # 拼接变量
+        except Exception as err:  # 异常捕捉
+            logger.info("JD_appjmp提取Cookie错误 请重试或者更换IP\n")  # 标准日志输出
+            logger.info(str(err))  # 标准日志输出
+            return False, wskey  # 返回 -> False[Bool], Wskey
+        else:  # 判断分支
+            if 'fake' in pt_key:  # 判断 pt_key中 是否存在fake
+                logger.info(str(wskey) + ";WsKey状态失效\n")  # 标准日志输出
+                return False, wskey  # 返回 -> False[Bool], Wskey
+            else:  # 判断分支
+                logger.info(str(wskey) + ";WsKey状态正常\n")  # 标准日志输出
+                return True, jd_ck  # 返回 -> True[Bool], jd_ck
 
 
-def update():
-    up_ver = int(cloud_arg['update'])
-    if ver >= up_ver:
-        logger.info("当前脚本版本: " + str(ver))
-        logger.info("--------------------\n")
-    else:
-        logger.info("当前脚本版本: " + str(ver) + "新版本: " + str(up_ver))
-        logger.info("存在新版本, 请更新脚本后执行")
-        logger.info("--------------------\n")
-        text = '当前脚本版本: {0}新版本: {1}, 请更新脚本~!'.format(ver, up_ver)
-        try:
-            send('WSKEY转换', text)
-        except Exception as err:
-            logger.debug(str(err))
-            logger.info("通知发送失败")
-        # sys.exit(0)
+def update():  # 方法 脚本更新模块
+    up_ver = int(cloud_arg['update'])   # 云端参数取值 [int]
+    if ver >= up_ver:  # 判断版本号大小
+        logger.info("当前脚本版本: " + str(ver))  # 标准日志输出
+        logger.info("--------------------\n")  # 标准日志输出
+    else:  # 判断分支
+        logger.info("当前脚本版本: " + str(ver) + "新版本: " + str(up_ver))   # 标准日志输出
+        logger.info("存在新版本, 请更新脚本后执行")  # 标准日志输出
+        logger.info("--------------------\n")  # 标准日志输出
+        text = '当前脚本版本: {0}新版本: {1}, 请更新脚本~!'.format(ver, up_ver)  # 设置发送内容
+        try:  # 异常捕捉
+            send('WSKEY转换', text)  # 推送消息
+        except Exception as err:  # 异常捕捉
+            logger.debug(str(err))  # 调试日志输出
+            logger.info("通知发送失败")  # 标准日志输出
+        # sys.exit(0)  # 退出脚本 [未启用]
 
 
-def ql_check(port):
-    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-    sock.settimeout(2)
-    try:
-        sock.connect(('127.0.0.1', port))
-    except Exception as err:
-        logger.debug(str(err))
-        sock.close()
-        return False
-    else:
-        sock.close()
-        return True
+def ql_check(port):  # 方法 检查青龙端口
+    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)  # Socket模块初始化
+    sock.settimeout(2)  # 设置端口超时
+    try:  # 异常捕捉
+        sock.connect(('127.0.0.1', port))  # 请求端口
+    except Exception as err:  # 捕捉异常
+        logger.debug(str(err))  # 调试日志输出
+        sock.close()  # 端口关闭
+        return False  # 返回 -> False[Bool]
+    else:  # 分支判断
+        sock.close()  # 关闭端口
+        return True  # 返回 -> True[Bool]
 
 
-def serch_ck(pin):
-    for i in range(len(envlist)):
-        if "name" not in envlist[i] or envlist[i]["name"] != "JD_COOKIE":
-            continue
-        if pin in envlist[i]['value']:
-            value = envlist[i]['value']
-            id = envlist[i][ql_id]
-            logger.info(str(pin) + "检索成功\n")
-            return True, value, id
-        else:
-            continue
-    logger.info(str(pin) + "检索失败\n")
-    return False, 1
+def serch_ck(pin):  # 方法 搜索 Pin
+    for i in range(len(envlist)):  # For循环 变量[envlist]的数量
+        if "name" not in envlist[i] or envlist[i]["name"] != "JD_COOKIE":  # 判断 envlist内容
+            continue  # 继续循环
+        if pin in envlist[i]['value']:  # 判断envlist取值['value']
+            value = envlist[i]['value']  # 取值['value']
+            id = envlist[i][ql_id]  # 取值 [ql_id](变量)
+            logger.info(str(pin) + "检索成功\n")  # 标准日志输出
+            return True, value, id  # 返回 -> True[Bool], value, id
+        else:  # 判断分支
+            continue  # 继续循环
+    logger.info(str(pin) + "检索失败\n")  # 标准日志输出
+    return False, 1  # 返回 -> False[Bool], 1
 
 
-def get_env():
-    url = 'http://127.0.0.1:{0}/api/envs'.format(port)
-    try:
-        res = s.get(url)
-    except Exception as err:
-        logger.debug(str(err))
-        logger.info("\n青龙环境接口错误")
-        sys.exit(1)
-    else:
-        data = json.loads(res.text)['data']
-        return data
+def get_env():  # 方法 读取变量
+    url = 'http://127.0.0.1:{0}/api/envs'.format(port)  # 设置 URL地址
+    try:  # 异常捕捉
+        res = s.get(url)  # HTTP请求 [GET] 使用 session
+    except Exception as err:  # 异常捕捉
+        logger.debug(str(err))  # 调试日志输出
+        logger.info("\n青龙环境接口错误")  # 标准日志输出
+        sys.exit(1)  # 脚本退出
+    else:  # 判断分支
+        data = json.loads(res.text)['data']  # 使用Json模块提取值[data]
+        return data  # 返回 -> data
 
 
-def check_id():
-    url = 'http://127.0.0.1:{0}/api/envs'.format(port)
-    try:
-        res = s.get(url).json()
-    except Exception as err:
-        logger.debug(str(err))
-        logger.info("\n青龙环境接口错误")
-        sys.exit(1)
-    else:
-        if '_id' in res['data'][0]:
-            logger.info("使用 _id 键值")
-            return '_id'
-        else:
-            logger.info("使用 id 键值")
-            return 'id'
+def check_id():  # 方法 兼容青龙老版本与新版本 id & _id的问题
+    url = 'http://127.0.0.1:{0}/api/envs'.format(port)  # 设置 URL地址
+    try:  # 异常捕捉
+        res = s.get(url).json()  # HTTP[GET] 请求 使用 session
+    except Exception as err:  # 异常捕捉
+        logger.debug(str(err))  # 调试日志输出
+        logger.info("\n青龙环境接口错误")  # 标准日志输出
+        sys.exit(1)  # 脚本退出
+    else:  # 判断分支
+        if '_id' in res['data'][0]:  # 判断 [_id]
+            logger.info("使用 _id 键值")  # 标准日志输出
+            return '_id'  # 返回 -> '_id'
+        else:  # 判断分支
+            logger.info("使用 id 键值")  # 标准日志输出
+            return 'id'  # 返回 -> 'id'
 
 
-def ql_update(e_id, n_ck):
-    url = 'http://127.0.0.1:{0}/api/envs'.format(port)
+def ql_update(e_id, n_ck):  # 方法 青龙更新变量 传递 id cookie
+    url = 'http://127.0.0.1:{0}/api/envs'.format(port)  # 设置 URL地址
     data = {
         "name": "JD_COOKIE",
         "value": n_ck,
         ql_id: e_id
-    }
-    data = json.dumps(data)
-    s.put(url=url, data=data)
-    ql_enable(eid)
+    }  # 设置 HTTP POST 载荷
+    data = json.dumps(data)  # json模块格式化
+    s.put(url=url, data=data)  # HTTP [PUT] 请求 使用 session
+    ql_enable(eid)  # 调用方法 ql_enable 传递 eid
 
 
-def ql_enable(e_id):
-    url = 'http://127.0.0.1:{0}/api/envs/enable'.format(port)
-    data = '["{0}"]'.format(e_id)
-    res = json.loads(s.put(url=url, data=data).text)
-    if res['code'] == 200:
-        logger.info("\n账号启用\n--------------------\n")
-        return True
-    else:
-        logger.info("\n账号启用失败\n--------------------\n")
-        return False
+def ql_enable(e_id):  # 方法 青龙变量启用 传递值 eid
+    url = 'http://127.0.0.1:{0}/api/envs/enable'.format(port)  # 设置 URL地址
+    data = '["{0}"]'.format(e_id)  # 格式化 POST 载荷
+    res = json.loads(s.put(url=url, data=data).text)  # json模块读取 HTTP[PUT] 的返回值
+    if res['code'] == 200:  # 判断返回值为 200
+        logger.info("\n账号启用\n--------------------\n")  # 标准日志输出
+        return True  # 返回 ->True
+    else:  # 判断分支
+        logger.info("\n账号启用失败\n--------------------\n")  # 标准日志输出
+        return False  # 返回 -> Fasle
 
 
-def ql_disable(e_id):
-    url = 'http://127.0.0.1:{0}/api/envs/disable'.format(port)
-    data = '["{0}"]'.format(e_id)
-    res = json.loads(s.put(url=url, data=data).text)
-    if res['code'] == 200:
-        logger.info("\n账号禁用成功\n--------------------\n")
-        return True
-    else:
-        logger.info("\n账号禁用失败\n--------------------\n")
-        return False
+def ql_disable(e_id):  # 方法 青龙变量禁用 传递 eid
+    url = 'http://127.0.0.1:{0}/api/envs/disable'.format(port)  # 设置 URL地址
+    data = '["{0}"]'.format(e_id)  # 格式化 POST 载荷
+    res = json.loads(s.put(url=url, data=data).text)  # json模块读取 HTTP[PUT] 的返回值
+    if res['code'] == 200:  # 判断返回值为 200
+        logger.info("\n账号禁用成功\n--------------------\n")  # 标准日志输出
+        return True  # 返回 ->True
+    else:  # 判断分支
+        logger.info("\n账号禁用失败\n--------------------\n")  # 标准日志输出
+        return False  # 返回 -> Fasle
 
 
-def ql_insert(i_ck):
-    data = [{"value": i_ck, "name": "JD_COOKIE"}]
-    data = json.dumps(data)
-    url = 'http://127.0.0.1:{0}/api/envs'.format(port)
-    s.post(url=url, data=data)
-    logger.info("\n账号添加完成\n--------------------\n")
+def ql_insert(i_ck):  # 方法 插入新变量
+    data = [{"value": i_ck, "name": "JD_COOKIE"}]    # POST数据载荷组合
+    data = json.dumps(data)  # Json格式化数据
+    url = 'http://127.0.0.1:{0}/api/envs'.format(port)  # 设置 URL地址
+    s.post(url=url, data=data)  # HTTP[POST]请求 使用session
+    logger.info("\n账号添加完成\n--------------------\n")  # 标准日志输出
 
 
-def cloud_info():
-    url = str(base64.b64decode(url_t).decode()) + 'check_api'
-    for i in range(3):
-        try:
-            headers = {"authorization": "Bearer Shizuku"}
-            res = requests.get(url=url, verify=False, headers=headers, timeout=20).text
-        except requests.exceptions.ConnectTimeout:
-            logger.info("\n获取云端参数超时, 正在重试!" + str(i))
-            time.sleep(1)
-            continue
-        except requests.exceptions.ReadTimeout:
-            logger.info("\n获取云端参数超时, 正在重试!" + str(i))
-            time.sleep(1)
-            continue
-        except Exception as err:
-            logger.info("\n未知错误云端, 退出脚本!")
-            logger.debug(str(err))
-            sys.exit(1)
-        else:
-            try:
-                c_info = json.loads(res)
-            except Exception as err:
-                logger.info("云端参数解析失败")
-                logger.debug(str(err))
-                sys.exit(1)
-            else:
-                return c_info
+def cloud_info():  # 方法 云端信息
+    url = str(base64.b64decode(url_t).decode()) + 'check_api'  # 设置 URL地址 路由 [check_api]
+    for i in range(3):  # For循环 3次
+        try:  # 异常捕捉
+            headers = {"authorization": "Bearer Shizuku"}  # 设置 HTTP头
+            res = requests.get(url=url, verify=False, headers=headers, timeout=20).text  # HTTP[GET] 请求 超时 20秒
+        except requests.exceptions.ConnectTimeout:  # 异常捕捉
+            logger.info("\n获取云端参数超时, 正在重试!" + str(i))  # 标准日志输出
+            time.sleep(1)  # 休眠 1秒
+            continue  # 循环继续
+        except requests.exceptions.ReadTimeout:  # 异常捕捉
+            logger.info("\n获取云端参数超时, 正在重试!" + str(i))   # 标准日志输出
+            time.sleep(1)  # 休眠 1秒
+            continue  # 循环继续
+        except Exception as err:  # 异常捕捉
+            logger.info("\n未知错误云端, 退出脚本!")  # 标准日志输出
+            logger.debug(str(err))  # 调试日志输出
+            sys.exit(1)  # 脚本退出
+        else:  # 分支判断
+            try:  # 异常捕捉
+                c_info = json.loads(res)  # json读取参数
+            except Exception as err:  # 异常捕捉
+                logger.info("云端参数解析失败")  # 标准日志输出
+                logger.debug(str(err))  # 调试日志输出
+                sys.exit(1)  # 脚本退出
+            else:  # 分支判断
+                return c_info  # 返回 -> c_info
 
 
-def check_cloud():
-    url_list = ['aHR0cDovLzQzLjEzNS45MC4yMy8=', 'aHR0cHM6Ly9zaGl6dWt1Lm1sLw==', 'aHR0cHM6Ly9jZi5zaGl6dWt1Lm1sLw==']
-    for i in url_list:
-        url = str(base64.b64decode(i).decode())
-        try:
-            requests.get(url=url, verify=False, timeout=10)
-        except Exception as err:
-            logger.debug(str(err))
-            continue
-        else:
-            info = ['Default', 'HTTPS', 'CloudFlare']
-            logger.info(str(info[url_list.index(i)]) + " Server Check OK\n--------------------\n")
-            return i
-    logger.info("\n云端地址全部失效, 请检查网络!")
-    try:
-        send('WSKEY转换', '云端地址失效. 请联系作者或者检查网络.')
-    except Exception as err:
-        logger.debug(str(err))
-        logger.info("通知发送失败")
-    sys.exit(1)
+def check_cloud():  # 方法 云端地址检查
+    url_list = ['aHR0cDovLzQzLjEzNS45MC4yMy8=', 'aHR0cHM6Ly9zaGl6dWt1Lm1sLw==', 'aHR0cHM6Ly9jZi5zaGl6dWt1Lm1sLw==']  # URL list Encode
+    for i in url_list:  # for循环 url_list
+        url = str(base64.b64decode(i).decode())  # 设置 url地址 [str]
+        try:  # 异常捕捉
+            requests.get(url=url, verify=False, timeout=10)  # HTTP[GET]请求 超时 10秒
+        except Exception as err:  # 异常捕捉
+            logger.debug(str(err))  # 调试日志输出
+            continue  # 循环继续
+        else:  # 分支判断
+            info = ['Default', 'HTTPS', 'CloudFlare']  # 输出信息[List]
+            logger.info(str(info[url_list.index(i)]) + " Server Check OK\n--------------------\n")  # 标准日志输出
+            return i  # 返回 ->i
+    logger.info("\n云端地址全部失效, 请检查网络!")  # 标准日志输出
+    try:  # 异常捕捉
+        send('WSKEY转换', '云端地址失效. 请联系作者或者检查网络.')  # 推送消息
+    except Exception as err:  # 异常捕捉
+        logger.debug(str(err))  # 调试日志输出
+        logger.info("通知发送失败")  # 标准日志输出
+    sys.exit(1)  # 脚本退出
 
 
-def check_port():
-    logger.info("\n--------------------\n")
-    if "QL_PORT" in os.environ:
-        try:
-            port = int(os.environ['QL_PORT'])
-        except Exception as err:
-            logger.debug(str(err))
-            logger.info("变量格式有问题...\n格式: export QL_PORT=\"端口号\"")
-            logger.info("使用默认端口5700")
-            return 5700
-    else:
-        port = 5700
-    if not ql_check(port):
-        logger.info(str(port) + "端口检查失败, 如果改过端口, 请在变量中声明端口 \n在config.sh中加入 export QL_PORT=\"端口号\"")
-        logger.info("\n如果你很确定端口没错, 还是无法执行, 在GitHub给我发issus\n--------------------\n")
-        sys.exit(1)
-    else:
-        logger.info(str(port) + "端口检查通过")
-        return port
+def check_port():  # 方法 检查变量传递端口
+    logger.info("\n--------------------\n")  # 标准日志输出
+    if "QL_PORT" in os.environ:  # 判断 系统变量是否存在[QL_PORT]
+        try:  # 异常捕捉
+            port = int(os.environ['QL_PORT'])  # 取值 [int]
+        except Exception as err:  # 异常捕捉
+            logger.debug(str(err))  # 调试日志输出
+            logger.info("变量格式有问题...\n格式: export QL_PORT=\"端口号\"")  # 标准日志输出
+            logger.info("使用默认端口5700")  # 标准日志输出
+            return 5700  # 返回端口 5700
+    else:  # 判断分支
+        port = 5700  # 默认5700端口
+    if not ql_check(port):  # 调用方法 [ql_check] 传递 [port]
+        logger.info(str(port) + "端口检查失败, 如果改过端口, 请在变量中声明端口 \n在config.sh中加入 export QL_PORT=\"端口号\"")  # 标准日志输出
+        logger.info("\n如果你很确定端口没错, 还是无法执行, 在GitHub给我发issus\n--------------------\n")  # 标准日志输出
+        sys.exit(1)  # 脚本退出
+    else:  # 判断分支
+        logger.info(str(port) + "端口检查通过")  # 标准日志输出
+        return port  # 返回->port
 
 
-if __name__ == '__main__':
-    port = check_port()
-    token = ql_login()  # 获取青龙 token
-    s = requests.session()
-    s.headers.update({"authorization": "Bearer " + str(token)})
-    s.headers.update({"Content-Type": "application/json;charset=UTF-8"})
-    ql_id = check_id()
-    url_t = check_cloud()
-    cloud_arg = cloud_info()
-    update()
-    ua = cloud_arg['User-Agent']
-    wslist = get_wskey()
-    envlist = get_env()
-    if "WSKEY_SLEEP" in os.environ and str(os.environ["WSKEY_SLEEP"]).isdigit():
-        sleepTime = int(os.environ["WSKEY_SLEEP"])
-    else:
-        sleepTime = 10
-    for ws in wslist:
-        wspin = ws.split(";")[0]
-        if "pin" in wspin:
+if __name__ == '__main__':   # Python主函数执行入口
+    port = check_port()  # 调用方法 [check_port]  并赋值 [port]
+    token = ql_login()  # 调用方法 [ql_login]  并赋值 [token]
+    s = requests.session()  # 设置 request session方法
+    s.headers.update({"authorization": "Bearer " + str(token)})  # 增加 HTTP头认证
+    s.headers.update({"Content-Type": "application/json;charset=UTF-8"})  # 增加 HTTP头 json 类型
+    ql_id = check_id()  # 调用方法 [check_id] 并赋值 [ql_id]
+    url_t = check_cloud()  # 调用方法 [check_cloud] 并赋值 [url_t]
+    cloud_arg = cloud_info()  # 调用方法 [cloud_info] 并赋值 [cloud_arg]
+    update()  # 调用方法 [update]
+    ua = cloud_arg['User-Agent']  # 设置全局变量 UA
+    wslist = get_wskey()  # 调用方法 [get_wskey] 并赋值 [wslist]
+    envlist = get_env()  # 调用方法 [get_env] 并赋值 [envlist]
+    if "WSKEY_SLEEP" in os.environ and str(os.environ["WSKEY_SLEEP"]).isdigit():  # 判断变量[WSKEY_SLEEP]是否为数字类型
+        sleepTime = int(os.environ["WSKEY_SLEEP"])  # 获取变量 [int]
+    else:  # 判断分支
+        sleepTime = 10  # 默认休眠时间 10秒
+    for ws in wslist:  # wslist变量 for循环  [wslist -> ws]
+        wspin = ws.split(";")[0]  # 变量分割 ;
+        if "pin" in wspin:  # 判断 pin 是否存在于 [wspin]
             wspin = "pt_" + wspin + ";"  # 封闭变量
             return_serch = serch_ck(wspin)  # 变量 pt_pin 搜索获取 key eid
             if return_serch[0]:  # bool: True 搜索到账号
                 jck = str(return_serch[1])  # 拿到 JD_COOKIE
                 if not check_ck(jck):  # bool: False 判定 JD_COOKIE 有效性
-                    tryCount = 1
-                    if "WSKEY_TRY_COUNT" in os.environ:
-                        if os.environ["WSKEY_TRY_COUNT"].isdigit():
-                            tryCount = int(os.environ["WSKEY_TRY_COUNT"])
-                    for count in range(tryCount):
-                        count += 1
+                    tryCount = 1  # 重试次数 1次
+                    if "WSKEY_TRY_COUNT" in os.environ:  # 判断 [WSKEY_TRY_COUNT] 是否存在于系统变量
+                        if os.environ["WSKEY_TRY_COUNT"].isdigit():  # 判断 [WSKEY_TRY_COUNT] 是否为数字
+                            tryCount = int(os.environ["WSKEY_TRY_COUNT"])  # 设置 [tryCount] int
+                    for count in range(tryCount):  # for循环 [tryCount]
+                        count += 1  # 自增
                         return_ws = getToken(ws)  # 使用 WSKEY 请求获取 JD_COOKIE bool jd_ck
-                        if return_ws[0]:
-                            break
-                        if count < tryCount:
-                            logger.info("{0} 秒后重试，剩余次数：{1}\n".format(sleepTime, tryCount - count))
-                            time.sleep(sleepTime)
-                    if return_ws[0]:  # bool: True
-                        nt_key = str(return_ws[1])
-                        # logger.info("wskey转pt_key成功", nt_key)
-                        logger.info("wskey转换成功")
+                        if return_ws[0]:  # 判断 [return_ws]返回值 Bool类型
+                            break  # 中断循环
+                        if count < tryCount:  # 判断循环次
+                            logger.info("{0} 秒后重试，剩余次数：{1}\n".format(sleepTime, tryCount - count))  # 标准日志输出
+                            time.sleep(sleepTime)  # 脚本休眠 使用变量 [sleepTime]
+                    if return_ws[0]:  # 判断 [return_ws]返回值 Bool类型
+                        nt_key = str(return_ws[1])  # 从 return_ws[1] 取出 -> nt_key
+                        # logger.info("wskey转pt_key成功", nt_key)  # 标准日志输出 [未启用]
+                        logger.info("wskey转换成功")   # 标准日志输出
                         eid = return_serch[2]  # 从 return_serch 拿到 eid
                         ql_update(eid, nt_key)  # 函数 ql_update 参数 eid JD_COOKIE
-                    else:
+                    else:  # 判断分支
                         if "WSKEY_AUTO_DISABLE" in os.environ:  # 从系统变量中获取 WSKEY_AUTO_DISABLE
-                            logger.info(str(wspin) + "账号失效")
-                            text = "账号: {0} WsKey疑似失效".format(wspin)
-                        else:
-                            eid = return_serch[2]
-                            logger.info(str(wspin) + "账号禁用")
-                            ql_disable(eid)
-                            text = "账号: {0} WsKey疑似失效, 已禁用Cookie".format(wspin)
-                        try:
-                            send('WsKey转换脚本', text)
-                        except Exception as err:
-                            logger.debug(str(err))
-                            logger.info("通知发送失败")
-                else:
-                    logger.info(str(wspin) + "账号有效")
-                    eid = return_serch[2]
-                    ql_enable(eid)
-                    logger.info("--------------------\n")
-            else:
-                logger.info("\n新wskey\n")
+                            logger.info(str(wspin) + "账号失效")  # 标准日志输出
+                            text = "账号: {0} WsKey疑似失效".format(wspin)  # 设置推送内容
+                        else:  # 判断分支
+                            eid = return_serch[2]  # 读取 return_serch[2] -> eid
+                            logger.info(str(wspin) + "账号禁用")  # 标准日志输出
+                            ql_disable(eid)  # 执行方法[ql_disable] 传递 eid
+                            text = "账号: {0} WsKey疑似失效, 已禁用Cookie".format(wspin)  # 设置推送内容
+                        try:  # 异常捕捉
+                            send('WsKey转换脚本', text)  # 推送消息
+                        except Exception as err:  # 异常捕捉
+                            logger.debug(str(err))  # 调试日志输出
+                            logger.info("通知发送失败")  # 标准日志输出
+                else:  # 判断分支
+                    logger.info(str(wspin) + "账号有效")  # 标准日志输出
+                    eid = return_serch[2]  # 读取 return_serch[2] -> eid
+                    ql_enable(eid)  # 执行方法[ql_enable] 传递 eid
+                    logger.info("--------------------\n")  # 标准日志输出
+            else:  # 判断分支
+                logger.info("\n新wskey\n")  # 标准日志分支
                 return_ws = getToken(ws)  # 使用 WSKEY 请求获取 JD_COOKIE bool jd_ck
-                if return_ws[0]:
-                    nt_key = str(return_ws[1])
-                    logger.info("wskey转换成功\n")
-                    ql_insert(nt_key)
-            logger.info("暂停{0}秒\n".format(sleepTime))
-            time.sleep(sleepTime)
-        else:
-            logger.info("WSKEY格式错误\n--------------------\n")
-    logger.info("执行完成\n--------------------")
-    sys.exit(0)
+                if return_ws[0]:  # 判断 (return_ws[0]) 类型: [Bool]
+                    nt_key = str(return_ws[1])  # return_ws[1] -> nt_key
+                    logger.info("wskey转换成功\n")  # 标准日志输出
+                    ql_insert(nt_key)  # 调用方法 [ql_insert]
+            logger.info("暂停{0}秒\n".format(sleepTime))  # 标准日志输出
+            time.sleep(sleepTime)  # 脚本休眠
+        else:  # 判断分支
+            logger.info("WSKEY格式错误\n--------------------\n")  # 标准日志输出
+    logger.info("执行完成\n--------------------")  # 标准日志输出
+    sys.exit(0)  # 脚本退出
+    # Enjoy
diff --git a/ql.js b/ql.js
index 802d1a6..31e4883 100644
--- a/ql.js
+++ b/ql.js
@@ -6,7 +6,14 @@ const { readFile } = require('fs/promises');
 const path = require('path');
 
 const qlDir = '/ql';
-const authFile = path.join(qlDir, 'config/auth.json');
+const fs = require('fs');
+let Fileexists = fs.existsSync('/ql/data/config/auth.json');
+let authFile="";
+if (Fileexists) 
+	authFile="/ql/data/config/auth.json"
+else
+	authFile="/ql/config/auth.json"
+//const authFile = path.join(qlDir, 'config/auth.json');
 
 const api = got.extend({
   prefixUrl: 'http://127.0.0.1:5600',
@@ -18,7 +25,7 @@ async function getToken() {
   return authConfig.token;
 }
 
-module.exports.getEnvs = async () => {
+module.exports.getEnvs = async () => {  
   const token = await getToken();
   const body = await api({
     url: 'api/envs',
diff --git a/sendNotify.js b/sendNotify.js
index b188a73..7bd13bd 100644
--- a/sendNotify.js
+++ b/sendNotify.js
@@ -14,7 +14,7 @@ const querystring = require('querystring');
 const exec = require('child_process').exec;
 const $ = new Env();
 const timeout = 15000; //超时时间(单位毫秒)
-console.log("加载sendNotify，当前版本: 20220306");
+console.log("加载sendNotify，当前版本: 20220327");
 // =======================================go-cqhttp通知设置区域===========================================
 //gobot_url 填写请求地址http://127.0.0.1/send_private_msg
 //gobot_token 填写在go-cqhttp文件设置的访问密钥
@@ -132,7 +132,18 @@ const {
     getEnvByPtPin
 } = require('./ql');
 const fs = require('fs');
-let strCKFile = '/ql/scripts/CKName_cache.json';
+let isnewql = fs.existsSync('/ql/data/config/auth.json');
+let strCKFile="";
+let strUidFile ="";
+if(isnewql){
+	strCKFile = '/ql/data/scripts/CKName_cache.json';
+	strUidFile = '/ql/data/scripts/CK_WxPusherUid.json';
+}else{
+	strCKFile = '/ql/scripts/CKName_cache.json';
+	strUidFile = '/ql/scripts/CK_WxPusherUid.json';
+}
+	
+
 let Fileexists = fs.existsSync(strCKFile);
 let TempCK = [];
 if (Fileexists) {
@@ -143,7 +154,7 @@ if (Fileexists) {
         TempCK = JSON.parse(TempCK);
     }
 }
-let strUidFile = '/ql/scripts/CK_WxPusherUid.json';
+
 let UidFileexists = fs.existsSync(strUidFile);
 let TempCKUid = [];
 if (UidFileexists) {
@@ -1442,7 +1453,11 @@ async function sendNotify(text, desp, params = {}, author = '\n\n本通知 By cc
                             $.nickName = $.nickName.replace(new RegExp(`[*]`, 'gm'), "[*]");
                             text = text.replace(new RegExp(`${$.UserName}|${$.nickName}`, 'gm'), $.Remark);
                             if (text == "京东资产变动" || text == "京东资产变动#2" || text == "京东资产变动#3" || text == "京东资产变动#4") {
-                                var Tempinfo = getQLinfo(cookie, envs[i].created, envs[i].timestamp, envs[i].remarks);
+                                var Tempinfo = "";
+								if(envs[i].created)
+									Tempinfo=getQLinfo(cookie, envs[i].created, envs[i].timestamp, envs[i].remarks);
+								else
+									Tempinfo=getQLinfo(cookie, envs[i].createdAt, envs[i].timestamp, envs[i].remarks);
                                 if (Tempinfo) {
                                     $.Remark += Tempinfo;
                                 }
@@ -1696,7 +1711,12 @@ async function sendNotifybyWxPucher(text, desp, PtPin, author = '\n\n本通知 B
                             //额外处理1，nickName包含星号
                             $.nickName = $.nickName.replace(new RegExp(`[*]`, 'gm'), "[*]");
 
-                            var Tempinfo = getQLinfo(cookie, tempEnv.created, tempEnv.timestamp, tempEnv.remarks);
+                            var Tempinfo = "";
+							if(tempEnv.created)
+								Tempinfo=getQLinfo(cookie, tempEnv.created, tempEnv.timestamp, tempEnv.remarks);
+							else
+								Tempinfo=getQLinfo(cookie, tempEnv.createdAt, tempEnv.timestamp, tempEnv.remarks);
+							
                             if (Tempinfo) {
                                 Tempinfo = $.nickName + Tempinfo;
                                 desp = desp.replace(new RegExp(`${$.UserName}|${$.nickName}`, 'gm'), Tempinfo);
diff --git a/utils/JD_DailyBonus.js b/utils/JD_DailyBonus.js
index 0563f85..19db850 100644
--- a/utils/JD_DailyBonus.js
+++ b/utils/JD_DailyBonus.js
@@ -53,50 +53,50 @@ async function all(cookie, jrBody) {
       await Promise.all([
         JingDongBean(stop), //京东京豆
         JingDongStore(stop), //京东超市
-        //JingRongSteel(stop, jrBody), //金融钢镚
-        //JingDongTurn(stop), //京东转盘
-        // JDFlashSale(stop), //京东闪购
-        // JingDongCash(stop), //京东现金红包
-        // JDMagicCube(stop, 2), //京东小魔方
-        //JingDongSubsidy(stop), //京东金贴
+        JingRongSteel(stop, jrBody), //金融钢镚
+        JingDongTurn(stop), //京东转盘
+        JDFlashSale(stop), //京东闪购
+        JingDongCash(stop), //京东现金红包
+        JDMagicCube(stop, 2), //京东小魔方
+        JingDongSubsidy(stop), //京东金贴
         JingDongGetCash(stop), //京东领现金
-        //JingDongShake(stop), //京东摇一摇
-        //JDSecKilling(stop), //京东秒杀
+        JingDongShake(stop), //京东摇一摇
+        JDSecKilling(stop), //京东秒杀
         // JingRongDoll(stop, 'JRDoll', '京东金融-签壹', '4D25A6F482'),
         // JingRongDoll(stop, 'JRThreeDoll', '京东金融-签叁', '69F5EC743C'),
         // JingRongDoll(stop, 'JRFourDoll', '京东金融-签肆', '30C4F86264'),
         // JingRongDoll(stop, 'JRFiveDoll', '京东金融-签伍', '1D06AA3B0F')
       ]);
       await Promise.all([
-        //JDUserSignPre(stop, 'JDUndies', '京东商城-内衣', '4PgpL1xqPSW1sVXCJ3xopDbB1f69'), //京东内衣馆
-        //JDUserSignPre(stop, 'JDCard', '京东商城-卡包', '7e5fRnma6RBATV9wNrGXJwihzcD'), //京东卡包
+        JDUserSignPre(stop, 'JDUndies', '京东商城-内衣', '4PgpL1xqPSW1sVXCJ3xopDbB1f69'), //京东内衣馆
+        JDUserSignPre(stop, 'JDCard', '京东商城-卡包', '7e5fRnma6RBATV9wNrGXJwihzcD'), //京东卡包
         // JDUserSignPre(stop, 'JDCustomized', '京东商城-定制', '2BJK5RBdvc3hdddZDS1Svd5Esj3R'), //京东定制
-        //JDUserSignPre(stop, 'JDaccompany', '京东商城-陪伴', 'kPM3Xedz1PBiGQjY4ZYGmeVvrts'), //京东陪伴
-        //JDUserSignPre(stop, 'JDShoes', '京东商城-鞋靴', '4RXyb1W4Y986LJW8ToqMK14BdTD'), //京东鞋靴
-        //JDUserSignPre(stop, 'JDChild', '京东商城-童装', '3Af6mZNcf5m795T8dtDVfDwWVNhJ'), //京东童装馆
-        //JDUserSignPre(stop, 'JDBaby', '京东商城-母婴', '3BbAVGQPDd6vTyHYjmAutXrKAos6'), //京东母婴馆
-        //JDUserSignPre(stop, 'JD3C', '京东商城-数码', '4SWjnZSCTHPYjE5T7j35rxxuMTb6'), //京东数码电器馆
-        //JDUserSignPre(stop, 'JDWomen', '京东商城-女装', 'DpSh7ma8JV7QAxSE2gJNro8Q2h9'), //京东女装馆
-        //JDUserSignPre(stop, 'JDBook', '京东商城-图书', '3SC6rw5iBg66qrXPGmZMqFDwcyXi'), //京东图书
+        JDUserSignPre(stop, 'JDaccompany', '京东商城-陪伴', 'kPM3Xedz1PBiGQjY4ZYGmeVvrts'), //京东陪伴
+        JDUserSignPre(stop, 'JDShoes', '京东商城-鞋靴', '4RXyb1W4Y986LJW8ToqMK14BdTD'), //京东鞋靴
+        JDUserSignPre(stop, 'JDChild', '京东商城-童装', '3Af6mZNcf5m795T8dtDVfDwWVNhJ'), //京东童装馆
+        JDUserSignPre(stop, 'JDBaby', '京东商城-母婴', '3BbAVGQPDd6vTyHYjmAutXrKAos6'), //京东母婴馆
+        JDUserSignPre(stop, 'JD3C', '京东商城-数码', '4SWjnZSCTHPYjE5T7j35rxxuMTb6'), //京东数码电器馆
+        JDUserSignPre(stop, 'JDWomen', '京东商城-女装', 'DpSh7ma8JV7QAxSE2gJNro8Q2h9'), //京东女装馆
+        JDUserSignPre(stop, 'JDBook', '京东商城-图书', '3SC6rw5iBg66qrXPGmZMqFDwcyXi'), //京东图书
         // JDUserSignPre(stop, 'ReceiveJD', '京东商城-领豆', 'Ni5PUSK7fzZc4EKangHhqPuprn2'), //京东-领京豆
-        //JingRongDoll(stop, 'JTDouble', '京东金贴-双签', '1DF13833F7'), //京东金融 金贴双签
+        JingRongDoll(stop, 'JTDouble', '京东金贴-双签', '1DF13833F7'), //京东金融 金贴双签
         // JingRongDoll(stop, 'XJDouble', '金融现金-双签', 'F68B2C3E71', '', '', '', 'xianjin') //京东金融 现金双签
       ]);
       await Promise.all([
-        //JDUserSignPre(stop, 'JDStory', '京东失眠-补贴', 'UcyW9Znv3xeyixW1gofhW2DAoz4'), //失眠补贴
-        //JDUserSignPre(stop, 'JDPhone', '京东手机-小时', '4Vh5ybVr98nfJgros5GwvXbmTUpg'), //手机小时达
-        //JDUserSignPre(stop, 'JDEsports', '京东商城-电竞', 'CHdHQhA5AYDXXQN9FLt3QUAPRsB'), //京东电竞
-        //JDUserSignPre(stop, 'JDClothing', '京东商城-服饰', '4RBT3H9jmgYg1k2kBnHF8NAHm7m8'), //京东服饰
-       // JDUserSignPre(stop, 'JDSuitcase', '京东商城-箱包', 'ZrH7gGAcEkY2gH8wXqyAPoQgk6t'), //京东箱包馆
-        //JDUserSignPre(stop, 'JDSchool', '京东商城-校园', '2QUxWHx5BSCNtnBDjtt5gZTq7zdZ'), //京东校园
-        //JDUserSignPre(stop, 'JDHealth', '京东商城-健康', 'w2oeK5yLdHqHvwef7SMMy4PL8LF'), //京东健康
-        //JDUserSignPre(stop, 'JDShand', '京东拍拍-二手', '3S28janPLYmtFxypu37AYAGgivfp'), //京东拍拍二手
-       // JDUserSignPre(stop, 'JDClean', '京东商城-清洁', '2Tjm6ay1ZbZ3v7UbriTj6kHy9dn6'), //京东清洁馆
-       // JDUserSignPre(stop, 'JDCare', '京东商城-个护', '2tZssTgnQsiUqhmg5ooLSHY9XSeN'), //京东个人护理馆
-       // JDUserSignPre(stop, 'JDJiaDian', '京东商城-家电', '3uvPyw1pwHARGgndatCXddLNUxHw'), // 京东小家电
+        JDUserSignPre(stop, 'JDStory', '京东失眠-补贴', 'UcyW9Znv3xeyixW1gofhW2DAoz4'), //失眠补贴
+        JDUserSignPre(stop, 'JDPhone', '京东手机-小时', '4Vh5ybVr98nfJgros5GwvXbmTUpg'), //手机小时达
+        JDUserSignPre(stop, 'JDEsports', '京东商城-电竞', 'CHdHQhA5AYDXXQN9FLt3QUAPRsB'), //京东电竞
+        JDUserSignPre(stop, 'JDClothing', '京东商城-服饰', '4RBT3H9jmgYg1k2kBnHF8NAHm7m8'), //京东服饰
+        JDUserSignPre(stop, 'JDSuitcase', '京东商城-箱包', 'ZrH7gGAcEkY2gH8wXqyAPoQgk6t'), //京东箱包馆
+        JDUserSignPre(stop, 'JDSchool', '京东商城-校园', '2QUxWHx5BSCNtnBDjtt5gZTq7zdZ'), //京东校园
+        JDUserSignPre(stop, 'JDHealth', '京东商城-健康', 'w2oeK5yLdHqHvwef7SMMy4PL8LF'), //京东健康
+        JDUserSignPre(stop, 'JDShand', '京东拍拍-二手', '3S28janPLYmtFxypu37AYAGgivfp'), //京东拍拍二手
+        JDUserSignPre(stop, 'JDClean', '京东商城-清洁', '2Tjm6ay1ZbZ3v7UbriTj6kHy9dn6'), //京东清洁馆
+        JDUserSignPre(stop, 'JDCare', '京东商城-个护', '2tZssTgnQsiUqhmg5ooLSHY9XSeN'), //京东个人护理馆
+        JDUserSignPre(stop, 'JDJiaDian', '京东商城-家电', '3uvPyw1pwHARGgndatCXddLNUxHw'), // 京东小家电
         // JDUserSignPre(stop, 'JDJewels', '京东商城-珠宝', 'zHUHpTHNTaztSRfNBFNVZscyFZU'), //京东珠宝馆
         // JDUserSignPre(stop, 'JDMakeup', '京东商城-美妆', '2smCxzLNuam5L14zNJHYu43ovbAP'), //京东美妆馆
-       // JDUserSignPre(stop, 'JDVege', '京东商城-菜场', 'Wcu2LVCFMkBP3HraRvb7pgSpt64'), //京东菜场
+        JDUserSignPre(stop, 'JDVege', '京东商城-菜场', 'Wcu2LVCFMkBP3HraRvb7pgSpt64'), //京东菜场
         // JDUserSignPre(stop, 'JDLive', '京东智能-生活', 'KcfFqWvhb5hHtaQkS4SD1UU6RcQ') //京东智能生活
         JDUserSignPre(stop, 'JDPlus', '京东商城-PLUS', '3bhgbFe5HZcFCjEZf2jzp3umx4ZR'), //京东PLUS
         JDUserSignPre(stop, 'JDStore', '京东超市', 'QPwDgLSops2bcsYqQ57hENGrjgj') //京东超市
@@ -120,36 +120,36 @@ async function all(cookie, jrBody) {
       // await JingRongDoll(Wait(stop), 'JRFiveDoll', '京东金融-签伍', '1D06AA3B0F');
       // await JingRongDoll(Wait(stop), 'JRDoll', '京东金融-签壹', '4D25A6F482');
       // await JingRongDoll(Wait(stop), 'XJDouble', '金融现金-双签', 'F68B2C3E71', '', '', '', 'xianjin'); //京东金融 现金双签
-     // await JingRongDoll(Wait(stop), 'JTDouble', '京东金贴-双签', '1DF13833F7'); //京东金融 金贴双签
-     // await JDUserSignPre(Wait(stop), 'JDStory', '京东失眠-补贴', 'UcyW9Znv3xeyixW1gofhW2DAoz4'); //失眠补贴
-     // await JDUserSignPre(Wait(stop), 'JDPhone', '京东手机-小时', '4Vh5ybVr98nfJgros5GwvXbmTUpg'); //手机小时达
-     // await JDUserSignPre(Wait(stop), 'JDCard', '京东商城-卡包', '7e5fRnma6RBATV9wNrGXJwihzcD'); //京东卡包
-     // await JDUserSignPre(Wait(stop), 'JDUndies', '京东商城-内衣', '4PgpL1xqPSW1sVXCJ3xopDbB1f69'); //京东内衣馆
-     // await JDUserSignPre(Wait(stop), 'JDEsports', '京东商城-电竞', 'CHdHQhA5AYDXXQN9FLt3QUAPRsB'); //京东电竞
+      await JingRongDoll(Wait(stop), 'JTDouble', '京东金贴-双签', '1DF13833F7'); //京东金融 金贴双签
+      await JDUserSignPre(Wait(stop), 'JDStory', '京东失眠-补贴', 'UcyW9Znv3xeyixW1gofhW2DAoz4'); //失眠补贴
+      await JDUserSignPre(Wait(stop), 'JDPhone', '京东手机-小时', '4Vh5ybVr98nfJgros5GwvXbmTUpg'); //手机小时达
+      await JDUserSignPre(Wait(stop), 'JDCard', '京东商城-卡包', '7e5fRnma6RBATV9wNrGXJwihzcD'); //京东卡包
+      await JDUserSignPre(Wait(stop), 'JDUndies', '京东商城-内衣', '4PgpL1xqPSW1sVXCJ3xopDbB1f69'); //京东内衣馆
+      await JDUserSignPre(Wait(stop), 'JDEsports', '京东商城-电竞', 'CHdHQhA5AYDXXQN9FLt3QUAPRsB'); //京东电竞
       // await JDUserSignPre(Wait(stop), 'JDCustomized', '京东商城-定制', '2BJK5RBdvc3hdddZDS1Svd5Esj3R'); //京东定制
-    //  await JDUserSignPre(Wait(stop), 'JDSuitcase', '京东商城-箱包', 'ZrH7gGAcEkY2gH8wXqyAPoQgk6t'); //京东箱包馆
-    //  await JDUserSignPre(Wait(stop), 'JDClothing', '京东商城-服饰', '4RBT3H9jmgYg1k2kBnHF8NAHm7m8'); //京东服饰
-    //  await JDUserSignPre(Wait(stop), 'JDSchool', '京东商城-校园', '2QUxWHx5BSCNtnBDjtt5gZTq7zdZ'); //京东校园 
+      await JDUserSignPre(Wait(stop), 'JDSuitcase', '京东商城-箱包', 'ZrH7gGAcEkY2gH8wXqyAPoQgk6t'); //京东箱包馆
+      await JDUserSignPre(Wait(stop), 'JDClothing', '京东商城-服饰', '4RBT3H9jmgYg1k2kBnHF8NAHm7m8'); //京东服饰
+      await JDUserSignPre(Wait(stop), 'JDSchool', '京东商城-校园', '2QUxWHx5BSCNtnBDjtt5gZTq7zdZ'); //京东校园 
       await JDUserSignPre(Wait(stop), 'JDHealth', '京东商城-健康', 'w2oeK5yLdHqHvwef7SMMy4PL8LF'); //京东健康
-     // await JDUserSignPre(Wait(stop), 'JDShoes', '京东商城-鞋靴', '4RXyb1W4Y986LJW8ToqMK14BdTD'); //京东鞋靴
-     // await JDUserSignPre(Wait(stop), 'JDChild', '京东商城-童装', '3Af6mZNcf5m795T8dtDVfDwWVNhJ'); //京东童装馆
-     // await JDUserSignPre(Wait(stop), 'JDBaby', '京东商城-母婴', '3BbAVGQPDd6vTyHYjmAutXrKAos6'); //京东母婴馆
-     // await JDUserSignPre(Wait(stop), 'JD3C', '京东商城-数码', '4SWjnZSCTHPYjE5T7j35rxxuMTb6'); //京东数码电器馆
-     // await JDUserSignPre(Wait(stop), 'JDWomen', '京东商城-女装', 'DpSh7ma8JV7QAxSE2gJNro8Q2h9'); //京东女装馆
-     // await JDUserSignPre(Wait(stop), 'JDBook', '京东商城-图书', '3SC6rw5iBg66qrXPGmZMqFDwcyXi'); //京东图书
-     // await JDUserSignPre(Wait(stop), 'JDShand', '京东拍拍-二手', '3S28janPLYmtFxypu37AYAGgivfp'); //京东拍拍二手
+      await JDUserSignPre(Wait(stop), 'JDShoes', '京东商城-鞋靴', '4RXyb1W4Y986LJW8ToqMK14BdTD'); //京东鞋靴
+      await JDUserSignPre(Wait(stop), 'JDChild', '京东商城-童装', '3Af6mZNcf5m795T8dtDVfDwWVNhJ'); //京东童装馆
+      await JDUserSignPre(Wait(stop), 'JDBaby', '京东商城-母婴', '3BbAVGQPDd6vTyHYjmAutXrKAos6'); //京东母婴馆
+      await JDUserSignPre(Wait(stop), 'JD3C', '京东商城-数码', '4SWjnZSCTHPYjE5T7j35rxxuMTb6'); //京东数码电器馆
+      await JDUserSignPre(Wait(stop), 'JDWomen', '京东商城-女装', 'DpSh7ma8JV7QAxSE2gJNro8Q2h9'); //京东女装馆
+      await JDUserSignPre(Wait(stop), 'JDBook', '京东商城-图书', '3SC6rw5iBg66qrXPGmZMqFDwcyXi'); //京东图书
+      await JDUserSignPre(Wait(stop), 'JDShand', '京东拍拍-二手', '3S28janPLYmtFxypu37AYAGgivfp'); //京东拍拍二手
       // await JDUserSignPre(Wait(stop), 'JDMakeup', '京东商城-美妆', '2smCxzLNuam5L14zNJHYu43ovbAP'); //京东美妆馆
-    //  await JDUserSignPre(Wait(stop), 'JDVege', '京东商城-菜场', 'Wcu2LVCFMkBP3HraRvb7pgSpt64'); //京东菜场
+      await JDUserSignPre(Wait(stop), 'JDVege', '京东商城-菜场', 'Wcu2LVCFMkBP3HraRvb7pgSpt64'); //京东菜场
       await JDUserSignPre(Wait(stop), 'JDPlus', '京东商城-PLUS', '3bhgbFe5HZcFCjEZf2jzp3umx4ZR'); //京东PLUS
-     // await JDUserSignPre(Wait(stop), 'JDStore', '京东超市', 'QPwDgLSops2bcsYqQ57hENGrjgj'); //京东超市
-    //  await JDUserSignPre(Wait(stop), 'JDaccompany', '京东商城-陪伴', 'kPM3Xedz1PBiGQjY4ZYGmeVvrts'); //京东陪伴
+      await JDUserSignPre(Wait(stop), 'JDStore', '京东超市', 'QPwDgLSops2bcsYqQ57hENGrjgj'); //京东超市
+      await JDUserSignPre(Wait(stop), 'JDaccompany', '京东商城-陪伴', 'kPM3Xedz1PBiGQjY4ZYGmeVvrts'); //京东陪伴
       // await JDUserSignPre(Wait(stop), 'JDLive', '京东智能-生活', 'KcfFqWvhb5hHtaQkS4SD1UU6RcQ'); //京东智能生活
-    //  await JDUserSignPre(Wait(stop), 'JDClean', '京东商城-清洁', '2Tjm6ay1ZbZ3v7UbriTj6kHy9dn6'); //京东清洁馆
-     // await JDUserSignPre(Wait(stop), 'JDCare', '京东商城-个护', '2tZssTgnQsiUqhmg5ooLSHY9XSeN'); //京东个人护理馆
-     // await JDUserSignPre(Wait(stop), 'JDJiaDian', '京东商城-家电', '3uvPyw1pwHARGgndatCXddLNUxHw'); // 京东小家电馆
+      await JDUserSignPre(Wait(stop), 'JDClean', '京东商城-清洁', '2Tjm6ay1ZbZ3v7UbriTj6kHy9dn6'); //京东清洁馆
+      await JDUserSignPre(Wait(stop), 'JDCare', '京东商城-个护', '2tZssTgnQsiUqhmg5ooLSHY9XSeN'); //京东个人护理馆
+      await JDUserSignPre(Wait(stop), 'JDJiaDian', '京东商城-家电', '3uvPyw1pwHARGgndatCXddLNUxHw'); // 京东小家电馆
       // await JDUserSignPre(Wait(stop), 'ReceiveJD', '京东商城-领豆', 'Ni5PUSK7fzZc4EKangHhqPuprn2'); //京东-领京豆
       // await JDUserSignPre(Wait(stop), 'JDJewels', '京东商城-珠宝', 'zHUHpTHNTaztSRfNBFNVZscyFZU'); //京东珠宝馆
-      //await JingRongDoll(Wait(stop), 'JDDouble', '金融京豆-双签', 'F68B2C3E71', '', '', '', 'jingdou'); //京东金融 京豆双签
+      await JingRongDoll(Wait(stop), 'JDDouble', '金融京豆-双签', 'F68B2C3E71', '', '', '', 'jingdou'); //京东金融 京豆双签
       break;
   }
   await Promise.all([
diff --git a/utils/jdcookie.js b/utils/jdcookie.js
index df9c923..5444c49 100644
--- a/utils/jdcookie.js
+++ b/utils/jdcookie.js
@@ -1,37 +1,6 @@
-/*
-此文件为Node.js专用。其他用户请忽略
- */
-//此处填写京东账号cookie。
-let CookieJDs = [
-  '',//账号一ck,例:pt_key=XXX;pt_pin=XXX;
-  '',//账号二ck,例:pt_key=XXX;pt_pin=XXX;如有更多,依次类推
-]
-// 判断环境变量里面是否有京东ck
-if (process.env.JD_COOKIE) {
-  if (process.env.JD_COOKIE.indexOf('&') > -1) {
-    console.log(`您的cookie选择的是用&隔开\n`)
-    CookieJDs = process.env.JD_COOKIE.split('&');
-  } else if (process.env.JD_COOKIE.indexOf('\n') > -1) {
-    console.log(`您的cookie选择的是用换行隔开\n`)
-    CookieJDs = process.env.JD_COOKIE.split('\n');
-  } else {
-    CookieJDs = [process.env.JD_COOKIE];
-  }
-}
-/*
-if (JSON.stringify(process.env).indexOf('GITHUB')>-1) {
-  console.log(`请勿使用github action运行此脚本,无论你是从你自己的私库还是其他哪里拉取的源代码，都会导致我被封号\n`);
-  !(async () => {
-   // await require('./sendNotify').sendNotify('提醒', `请勿使用github action、滥用github资源会封我仓库以及账号`)
-   // await process.exit(0);
-  })()
-}
-*/
-CookieJDs = [...new Set(CookieJDs.filter(item => !!item))]
-console.log(`\n====================共有${CookieJDs.length}个京东账号Cookie=========\n`);
-console.log(`==================脚本执行- 北京时间(UTC+8)：${new Date(new Date().getTime() + new Date().getTimezoneOffset()*60*1000 + 8*60*60*1000).toLocaleString()}=====================\n`)
-if (process.env.JD_DEBUG && process.env.JD_DEBUG === 'false') console.log = () => {};
-for (let i = 0; i < CookieJDs.length; i++) {
-  const index = (i + 1 === 1) ? '' : (i + 1);
-  exports['CookieJD' + index] = CookieJDs[i].trim();
+// 本地测试在这边填写cookie
+let cookie = [
+];
+module.exports = {
+    cookie
 }