Merge 8bed3d663d into 76b55d377e

1
2026-04-20 19:23:09 +08:00 · 2024-07-19 14:44:55 +08:00 · 2024-07-19 14:38:21 +08:00 · 2024-07-19 11:20:57 +08:00 · 2024-07-19 10:58:11 +08:00 · 2024-07-19 06:47:06 +08:00
4 changed files with 65 additions and 31 deletions
@@ -33,9 +33,36 @@ if (JSON.stringify(process.env).indexOf('GITHUB') > -1) {
 //})()
 CookieJDs = [...new Set(CookieJDs.filter(item => !!item))]
 if (process.env.JD_DEBUG && process.env.JD_DEBUG === 'false') console.log = () => { };
+if (process.env.BANPIN) {
+  try {
+    let banpin = process.env.BANPIN;
+    if (banpin.includes('@')) {
+      const arr = banpin.split('&');
+      for (let i of arr) {
+        //if (process.mainModule.filename.includes(i.split('^')[0])) {
+        if (i.split('@')[0].split('|').filter(x => process.argv[1].includes(x)).length != 0) {
+          let pinarr = i.split('@')[1].split(',');
+          console.log(`已配置该任务不执行pin: ${JSON.stringify(pinarr)}`);
+          for (let j of pinarr) {
+            CookieJDs = CookieJDs.filter(x => !x.includes(encodeURIComponent(j)));
+          }
+
+        }
+      }
+
+    } else {
+      let pinarr = banpin.split(',');
+      console.log(`已配置全局不执行pin: ${JSON.stringify(pinarr)}`);
+      for (let i of pinarr) {
+        CookieJDs = CookieJDs.filter(x => !x.includes(encodeURIComponent(i)));
+      }
+    }
+  } catch { }
+}
 console.log(`\n====================共${CookieJDs.length}个京东账号Cookie=================`);
 console.log(`===========脚本执行时间：${formatdate(new Date(new Date().getTime() + new Date().getTimezoneOffset() * 60 * 1000 + 8 * 60 * 60 * 1000))}============`);
 console.log('>>>>>>>>>>>>6Dy提醒您：有问题先更新不行在反馈>>>>>>>>>>>>>\n');
+
 for (let i = 0; i < CookieJDs.length; i++) {
  if (!CookieJDs[i].match(/pt_pin=(.+?);/) || !CookieJDs[i].match(/pt_key=(.+?);/)) console.log(`\n提示:京东cookie 【${CookieJDs[i]}】填写不规范,可能会影响部分脚本正常使用。正确格式为: pt_key=xxx;pt_pin=xxx;（分号;不可少）\n`);
  CookieJDs[i] = CookieJDs[i].replace(/[\u4e00-\u9fa5]/g, (str) => encodeURI(str));
@@ -6,7 +6,7 @@
  "dependencies": {
    "@mapbox/node-pre-gyp": {
      "version": "1.0.5",
-      "resolved": "https://registry.nlark.com/@mapbox/node-pre-gyp/download/@mapbox/node-pre-gyp-1.0.5.tgz",
+      "resolved": "https://registry.npmmirror.com/@mapbox/node-pre-gyp/download/@mapbox/node-pre-gyp-1.0.5.tgz",
      "integrity": "sha1-Kgsy/LQW+z8iUP0kyyqBQhpPWVA=",
      "requires": {
        "detect-libc": "^1.0.3",
@@ -22,7 +22,7 @@
      "dependencies": {
        "make-dir": {
          "version": "3.1.0",
-          "resolved": "https://registry.nlark.com/make-dir/download/make-dir-3.1.0.tgz",
+          "resolved": "https://registry.npmmirror.com/make-dir/download/make-dir-3.1.0.tgz",
          "integrity": "sha1-QV6WcEazp/HRhSd9hKpYIDcmoT8=",
          "requires": {
            "semver": "^6.0.0"
@@ -30,14 +30,14 @@
          "dependencies": {
            "semver": {
              "version": "6.3.0",
-              "resolved": "https://registry.nlark.com/semver/download/semver-6.3.0.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-6.3.0.tgz",
+              "resolved": "https://registry.npmmirror.com/semver/download/semver-6.3.0.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsemver%2Fdownload%2Fsemver-6.3.0.tgz",
              "integrity": "sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0="
            }
          }
        },
        "semver": {
          "version": "7.3.5",
-          "resolved": "https://registry.nlark.com/semver/download/semver-7.3.5.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-7.3.5.tgz",
+          "resolved": "https://registry.npmmirror.com/semver/download/semver-7.3.5.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsemver%2Fdownload%2Fsemver-7.3.5.tgz",
          "integrity": "sha1-C2Ich5NI2JmOSw5L6Us/EuYBjvc=",
          "requires": {
            "lru-cache": "^6.0.0"
@@ -97,12 +97,12 @@
    },
    "abbrev": {
      "version": "1.1.1",
-      "resolved": "https://registry.nlark.com/abbrev/download/abbrev-1.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/abbrev/download/abbrev-1.1.1.tgz",
      "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg="
    },
    "agent-base": {
      "version": "6.0.2",
-      "resolved": "https://registry.nlark.com/agent-base/download/agent-base-6.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/agent-base/download/agent-base-6.0.2.tgz",
      "integrity": "sha1-Sf/1hXfP7j83F2/qtMIuAPhtf3c=",
      "requires": {
        "debug": "4"
@@ -110,7 +110,7 @@
      "dependencies": {
        "debug": {
          "version": "4.3.2",
-          "resolved": "https://registry.nlark.com/debug/download/debug-4.3.2.tgz?cache=0&sync_timestamp=1625374648057&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdebug%2Fdownload%2Fdebug-4.3.2.tgz",
+          "resolved": "https://registry.npmmirror.com/debug/download/debug-4.3.2.tgz?cache=0&sync_timestamp=1625374648057&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fdebug%2Fdownload%2Fdebug-4.3.2.tgz",
          "integrity": "sha1-8KScGKyHeeMdSgxgKd+3aHPHQos=",
          "requires": {
            "ms": "2.1.2"
@@ -136,7 +136,7 @@
    },
    "aproba": {
      "version": "1.2.0",
-      "resolved": "https://registry.nlark.com/aproba/download/aproba-1.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/aproba/download/aproba-1.2.0.tgz",
      "integrity": "sha1-aALmJk79GMeQobDVF/DyYnvyyUo="
    },
    "archive-type": {
@@ -241,7 +241,7 @@
    },
    "brace-expansion": {
      "version": "1.1.11",
-      "resolved": "https://registry.nlark.com/brace-expansion/download/brace-expansion-1.1.11.tgz",
+      "resolved": "https://registry.npmmirror.com/brace-expansion/download/brace-expansion-1.1.11.tgz",
      "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=",
      "requires": {
        "balanced-match": "^1.0.0",
@@ -314,7 +314,7 @@
    },
    "canvas": {
      "version": "2.8.0",
-      "resolved": "https://registry.nlark.com/canvas/download/canvas-2.8.0.tgz?cache=0&sync_timestamp=1621239877817&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcanvas%2Fdownload%2Fcanvas-2.8.0.tgz",
+      "resolved": "https://registry.npmmirror.com/canvas/download/canvas-2.8.0.tgz?cache=0&sync_timestamp=1621239877817&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcanvas%2Fdownload%2Fcanvas-2.8.0.tgz",
      "integrity": "sha1-+Zyn8l5uJmhmYf+k/sEjm773RGE=",
      "requires": {
        "@mapbox/node-pre-gyp": "^1.0.0",
@@ -329,7 +329,7 @@
    },
    "chownr": {
      "version": "2.0.0",
-      "resolved": "https://registry.nlark.com/chownr/download/chownr-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/chownr/download/chownr-2.0.0.tgz",
      "integrity": "sha1-Fb++U9LqtM9w8YqM1o6+Wzyx3s4="
    },
    "clone-response": {
@@ -342,7 +342,7 @@
    },
    "code-point-at": {
      "version": "1.1.0",
-      "resolved": "https://registry.nlark.com/code-point-at/download/code-point-at-1.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/code-point-at/download/code-point-at-1.1.0.tgz",
      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
    },
    "colors": {
@@ -370,7 +370,7 @@
    },
    "console-control-strings": {
      "version": "1.1.0",
-      "resolved": "https://registry.nlark.com/console-control-strings/download/console-control-strings-1.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/console-control-strings/download/console-control-strings-1.1.0.tgz",
      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
    },
    "content-disposition": {
@@ -406,7 +406,7 @@
    },
    "date-fns": {
      "version": "2.22.1",
-      "resolved": "https://registry.nlark.com/date-fns/download/date-fns-2.22.1.tgz?cache=0&sync_timestamp=1622203607219&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdate-fns%2Fdownload%2Fdate-fns-2.22.1.tgz",
+      "resolved": "https://registry.npmmirror.com/date-fns/download/date-fns-2.22.1.tgz?cache=0&sync_timestamp=1622203607219&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fdate-fns%2Fdownload%2Fdate-fns-2.22.1.tgz",
      "integrity": "sha1-Hlr5WYMeux2CmSv2e3ZQUtjw78Q="
    },
    "debug": {
@@ -780,7 +780,7 @@
    },
    "fs.realpath": {
      "version": "1.0.0",
-      "resolved": "https://registry.nlark.com/fs.realpath/download/fs.realpath-1.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/fs.realpath/download/fs.realpath-1.0.0.tgz",
      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
    },
    "gauge": {
@@ -816,7 +816,7 @@
    },
    "glob": {
      "version": "7.1.7",
-      "resolved": "https://registry.nlark.com/glob/download/glob-7.1.7.tgz?cache=0&sync_timestamp=1620337382269&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fglob%2Fdownload%2Fglob-7.1.7.tgz",
+      "resolved": "https://registry.npmmirror.com/glob/download/glob-7.1.7.tgz?cache=0&sync_timestamp=1620337382269&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fglob%2Fdownload%2Fglob-7.1.7.tgz",
      "integrity": "sha1-Oxk+kjPwHULQs/eClLvutBj5SpA=",
      "requires": {
        "fs.realpath": "^1.0.0",
@@ -1023,7 +1023,7 @@
    },
    "https-proxy-agent": {
      "version": "5.0.0",
-      "resolved": "https://registry.nlark.com/https-proxy-agent/download/https-proxy-agent-5.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/https-proxy-agent/download/https-proxy-agent-5.0.0.tgz",
      "integrity": "sha1-4qkFQqu2inYuCghQ9sntrf2FBrI=",
      "requires": {
        "agent-base": "6",
@@ -1032,7 +1032,7 @@
      "dependencies": {
        "debug": {
          "version": "4.3.2",
-          "resolved": "https://registry.nlark.com/debug/download/debug-4.3.2.tgz?cache=0&sync_timestamp=1625374648057&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdebug%2Fdownload%2Fdebug-4.3.2.tgz",
+          "resolved": "https://registry.npmmirror.com/debug/download/debug-4.3.2.tgz?cache=0&sync_timestamp=1625374648057&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fdebug%2Fdownload%2Fdebug-4.3.2.tgz",
          "integrity": "sha1-8KScGKyHeeMdSgxgKd+3aHPHQos=",
          "requires": {
            "ms": "2.1.2"
@@ -1070,7 +1070,7 @@
    },
    "is-fullwidth-code-point": {
      "version": "1.0.0",
-      "resolved": "https://registry.nlark.com/is-fullwidth-code-point/download/is-fullwidth-code-point-1.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/download/is-fullwidth-code-point-1.0.0.tgz",
      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
      "requires": {
        "number-is-nan": "^1.0.0"
@@ -1271,12 +1271,12 @@
    },
    "nan": {
      "version": "2.14.2",
-      "resolved": "https://registry.nlark.com/nan/download/nan-2.14.2.tgz",
+      "resolved": "https://registry.npmmirror.com/nan/download/nan-2.14.2.tgz",
      "integrity": "sha1-9TdkAGlRaPTMaUrJOT0MlYXu6hk="
    },
    "node-fetch": {
      "version": "2.6.1",
-      "resolved": "https://registry.nlark.com/node-fetch/download/node-fetch-2.6.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnode-fetch%2Fdownload%2Fnode-fetch-2.6.1.tgz",
+      "resolved": "https://registry.npmmirror.com/node-fetch/download/node-fetch-2.6.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fnode-fetch%2Fdownload%2Fnode-fetch-2.6.1.tgz",
      "integrity": "sha1-BFvTI2Mfdu0uK1VXM5RBa2OaAFI="
    },
    "nopt": {
@@ -1309,7 +1309,7 @@
    },
    "npmlog": {
      "version": "4.1.2",
-      "resolved": "https://registry.nlark.com/npmlog/download/npmlog-4.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/npmlog/download/npmlog-4.1.2.tgz",
      "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
      "requires": {
        "are-we-there-yet": "~1.1.2",
@@ -1592,7 +1592,7 @@
    },
    "set-blocking": {
      "version": "2.0.0",
-      "resolved": "https://registry.nlark.com/set-blocking/download/set-blocking-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/set-blocking/download/set-blocking-2.0.0.tgz",
      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
    },
    "signal-exit": {
@@ -1602,7 +1602,7 @@
    },
    "simple-concat": {
      "version": "1.0.1",
-      "resolved": "https://registry.nlark.com/simple-concat/download/simple-concat-1.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/simple-concat/download/simple-concat-1.0.1.tgz",
      "integrity": "sha1-9Gl2CCujXCJj8cirXt/ibEHJVS8="
    },
    "simple-get": {
@@ -1625,7 +1625,7 @@
        },
        "mimic-response": {
          "version": "2.1.0",
-          "resolved": "https://registry.nlark.com/mimic-response/download/mimic-response-2.1.0.tgz",
+          "resolved": "https://registry.npmmirror.com/mimic-response/download/mimic-response-2.1.0.tgz",
          "integrity": "sha1-0Tdj019hPQnsN+uzC6wEacDuj0M="
        }
      }
@@ -1669,7 +1669,7 @@
    },
    "string-width": {
      "version": "1.0.2",
-      "resolved": "https://registry.nlark.com/string-width/download/string-width-1.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/string-width/download/string-width-1.0.2.tgz",
      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
      "requires": {
        "code-point-at": "^1.0.0",
@@ -1687,7 +1687,7 @@
    },
    "strip-ansi": {
      "version": "3.0.1",
-      "resolved": "https://registry.nlark.com/strip-ansi/download/strip-ansi-3.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/strip-ansi/download/strip-ansi-3.0.1.tgz",
      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
      "requires": {
        "ansi-regex": "^2.0.0"
@@ -1711,7 +1711,7 @@
    },
    "tar": {
      "version": "6.1.0",
-      "resolved": "https://registry.nlark.com/tar/download/tar-6.1.0.tgz?cache=0&sync_timestamp=1618847020118&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftar%2Fdownload%2Ftar-6.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/tar/download/tar-6.1.0.tgz?cache=0&sync_timestamp=1618847020118&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ftar%2Fdownload%2Ftar-6.1.0.tgz",
      "integrity": "sha1-0XJOm8wEuXexjVxXOzM6IgcimoM=",
      "requires": {
        "chownr": "^2.0.0",
@@ -1864,7 +1864,7 @@
    },
    "wide-align": {
      "version": "1.1.3",
-      "resolved": "https://registry.nlark.com/wide-align/download/wide-align-1.1.3.tgz",
+      "resolved": "https://registry.npmmirror.com/wide-align/download/wide-align-1.1.3.tgz",
      "integrity": "sha1-rgdOa9wMFKQx6ATmJFScYzsABFc=",
      "requires": {
        "string-width": "^1.0.2 || 2"
@@ -1887,7 +1887,7 @@
    },
    "yallist": {
      "version": "4.0.0",
-      "resolved": "https://registry.nlark.com/yallist/download/yallist-4.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/yallist/download/yallist-4.0.0.tgz",
      "integrity": "sha1-m7knkNnA7/7GO+c1GeEaNQGaOnI="
    },
    "yauzl": {
Author	SHA1	Message	Date
Chat240515	7d9a8ccc27	Merge `8bed3d663d` into `76b55d377e`	2024-07-19 14:44:55 +08:00
2024	76b55d377e	1	2024-07-19 14:38:21 +08:00
2024	ae177c904e	1	2024-07-19 11:20:57 +08:00
2024	2b14246e62	1	2024-07-19 10:58:11 +08:00
2024	a93c32ee27	1	2024-07-19 06:47:06 +08:00
Chat240515	8bed3d663d	Merge branch '6dylan6:main' into main	2024-07-17 10:13:50 +08:00
Chat240515	8f8fbacb2b	Update URLs	2024-07-15 11:24:26 +08:00