From e5600f71cc01fbc08905a6c306fcb2a6b77cc565 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A1=BE=E9=A3=8E?=
<51695264+q4w5e6@users.noreply.github.com>
Date: Fri, 22 Jan 2021 19:18:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=8E=AF=E5=A2=83?=
=?UTF-8?q?=E5=8F=98=E9=87=8F=20JDFACTORY=5FFORBID=5FACCOUNT=EF=BC=8C?=
=?UTF-8?q?=E7=94=A8=E4=BA=8E=E6=8E=A7=E5=88=B6=E5=93=AA=E4=B8=AA=E4=BA=AC?=
=?UTF-8?q?=E4=B8=9C=E8=B4=A6=E5=8F=B7=E4=B8=8D=E8=BF=90=E8=A1=8C=E4=B8=9C?=
=?UTF-8?q?=E4=B8=9C=E5=B7=A5=E5=8E=82=E8=84=9A=E6=9C=AC=EF=BC=8C1?=
=?UTF-8?q?=E4=BB=A3=E8=A1=A8=E7=AC=AC=E4=B8=80=E4=B8=AA=E4=BA=AC=E4=B8=9C?=
=?UTF-8?q?=E8=B4=A6=E5=8F=B7=E4=B8=8D=E8=BF=90=E8=A1=8C=EF=BC=8C=E5=A4=9A?=
=?UTF-8?q?=E4=B8=AA=E4=BD=BF=E7=94=A8&=E8=BF=9E=E6=8E=A5=EF=BC=8C?=
=?UTF-8?q?=E4=BE=8B=EF=BC=9A1&3=E4=BB=A3=E8=A1=A8=E8=B4=A6=E5=8F=B71?=
=?UTF-8?q?=E5=92=8C=E8=B4=A6=E5=8F=B73=E4=B8=8D=E8=BF=90=E8=A1=8C?=
=?UTF-8?q?=E4=B8=9C=E4=B8=9C=E5=B7=A5=E5=8E=82=E8=84=9A=E6=9C=AC=EF=BC=8C?=
=?UTF-8?q?=E6=B3=A8=EF=BC=9A=E6=95=B0=E5=AD=970=EF=BC=8C=E4=BB=A3?=
=?UTF-8?q?=E8=A1=A8=E5=85=A8=E9=83=A8=E8=B4=A6=E5=8F=B7=E4=B8=8D=E8=BF=90?=
=?UTF-8?q?=E8=A1=8C=E4=B8=9C=E4=B8=9C=E5=B7=A5=E5=8E=82=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
githubAction.md | 1 +
jd_jdfactory.js | 1 +
2 files changed, 2 insertions(+)
diff --git a/githubAction.md b/githubAction.md
index 7481540b..6cd31647 100644
--- a/githubAction.md
+++ b/githubAction.md
@@ -85,6 +85,7 @@
| `JD_IMMORTAL_LATLON` | 京东神仙书院
地理位置变量 | 非必须 | 京东神仙书院地理位置，示例格式：{"lat":33.1, "lng":118.1} |
| `JD_WECHAT_USER_AGENT` | 京东炸年兽
小程序
自定义UA | 非必须 | 强烈推荐使用自定义的小程序UA防止黑号，UA示例：
Mozilla/5.0 (iPhone; CPU iPhone OS 14_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15A148 MicroMessenger/7.0.20(0x17001320) NetType/WIFI Language/zh_CN |
| `DREAMFACTORY_FORBID_ACCOUNT`| 京喜工厂
控制哪个京东账号不运行此脚本 | 非必须 | 输入`1`代表第一个京东账号不运行，多个使用`&`连接，例：`1&3`代表账号1和账号3不运行京喜工厂脚本，注：输入`0`，代表全部账号不运行京喜工厂脚本 |
+| `JDFACTORY_FORBID_ACCOUNT`| 东东工厂
控制哪个京东账号不运行此脚本 | 非必须 | 输入`1`代表第一个京东账号不运行，多个使用`&`连接，例：`1&3`代表账号1和账号3不运行东东工厂脚本，注：输入`0`，代表全部账号不运行东东工厂脚本 |
##### 互助码的填写规则
diff --git a/jd_jdfactory.js b/jd_jdfactory.js
index d13417a4..c5fefd44 100644
--- a/jd_jdfactory.js
+++ b/jd_jdfactory.js
@@ -42,6 +42,7 @@ if ($.isNode()) {
cookiesArr.push(jdCookieNode[item])
})
if (process.env.JD_DEBUG && process.env.JD_DEBUG === 'false') console.log = () => {};
+ if (process.env.JDFACTORY_FORBID_ACCOUNT) process.env.JDFACTORY_FORBID_ACCOUNT.split('&').map((item, index) => Number(item) === 0 ? cookiesArr = [] : cookiesArr.splice(Number(item) - 1 - index, 1))
} else {
let cookiesData = $.getdata('CookiesJD') || "[]";
cookiesData = jsonParse(cookiesData);
From da44e1a8d80e0d0ced2fda7dbbe529ad87f9fce5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A1=BE=E9=A3=8E?=
<51695264+q4w5e6@users.noreply.github.com>
Date: Fri, 22 Jan 2021 19:24:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=91=E5=87=BD=E6=95=B0=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8FDREAMFACTORY=5FFOR?=
=?UTF-8?q?BID=5FACCOUNT=E5=92=8CJDFACTORY=5FFORBID=5FACCOUNT?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.github/workflows/deploy_tencent_scf.yml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.github/workflows/deploy_tencent_scf.yml b/.github/workflows/deploy_tencent_scf.yml
index b97bc1ad..22ee08d2 100644
--- a/.github/workflows/deploy_tencent_scf.yml
+++ b/.github/workflows/deploy_tencent_scf.yml
@@ -86,6 +86,8 @@ jobs:
if [ $JXNCTOKENS ]; then sed -i "/variables/a\ JXNCTOKENS: $JXNCTOKENS" serverless.yml; fi;
if [ $JD_IMMORTAL_LATLON ]; then sed -i "/variables/a\ JD_IMMORTAL_LATLON: $JD_IMMORTAL_LATLON" serverless.yml; fi;
if [ $JD_WECHAT_USER_AGENT ]; then sed -i "/variables/a\ JD_WECHAT_USER_AGENT: $JD_WECHAT_USER_AGENT" serverless.yml; fi;
+ if [ $DREAMFACTORY_FORBID_ACCOUNT ]; then sed -i "/variables/a\ DREAMFACTORY_FORBID_ACCOUNT: $DREAMFACTORY_FORBID_ACCOUNT" serverless.yml; fi;
+ if [ $JDFACTORY_FORBID_ACCOUNT ]; then sed -i "/variables/a\ JDFACTORY_FORBID_ACCOUNT: $JDFACTORY_FORBID_ACCOUNT" serverless.yml; fi;
cat serverless.yml
env
env: #因为直接读取secrets里面的值很多字符不会自动转译，导致写入serverless.yml异常，所以设置到环境变量，在读取环境变量转译过的值
@@ -150,6 +152,8 @@ jobs:
JXNCTOKENS: ${{ secrets.JXNCTOKENS}}
JD_IMMORTAL_LATLON: ${{ secrets.JD_IMMORTAL_LATLON}}
JD_WECHAT_USER_AGENT: ${{ secrets.JD_WECHAT_USER_AGENT}}
+ DREAMFACTORY_FORBID_ACCOUNT: ${{ secrets.DREAMFACTORY_FORBID_ACCOUNT}}
+ JDFACTORY_FORBID_ACCOUNT: ${{ secrets.JDFACTORY_FORBID_ACCOUNT}}
- name: "部署到腾讯云函数"
run: serverless deploy