From 05efd9a3f385da560e5abcea7a0b36481724e71c Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Thu, 26 Nov 2020 10:49:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=96=B0=E5=A2=9E=E4=B8=9C?=
 =?UTF-8?q?=E4=B8=9C=E5=B7=A5=E5=8E=82=E8=84=9A=E6=9C=AC=E5=BF=83=E4=BB=AA?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E7=9A=84=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/crontab_list.sh    | 6 +++---
 docker/crontab_list_ts.sh | 6 +++---
 githubAction.md           | 1 +
 jd_jdfactory.js           | 1 +
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/docker/crontab_list.sh b/docker/crontab_list.sh
index e0b534b9..912f805d 100644
--- a/docker/crontab_list.sh
+++ b/docker/crontab_list.sh
@@ -1,6 +1,6 @@
-0 */1 * * * git -C /scripts/ pull >> /scripts/logs/pull.log 2>&1
-2 */1 * * * crontab /scripts/docker/${CRONTAB_LIST_FILE}
-3 */1 * * * npm install --prefix /scripts >> /scripts/logs/npm_install.log 2>&1
+50 */1 * * * git -C /scripts/ pull >> /scripts/logs/pull.log 2>&1
+52 */1 * * * crontab /scripts/docker/${CRONTAB_LIST_FILE}
+53 */1 * * * npm install --prefix /scripts >> /scripts/logs/npm_install.log 2>&1
 # 每3天的23:50分清理一次日志
 50 23 */3 * * rm -rf /scripts/logs/*.log
 
diff --git a/docker/crontab_list_ts.sh b/docker/crontab_list_ts.sh
index aa6fc2b1..0a94f8c2 100644
--- a/docker/crontab_list_ts.sh
+++ b/docker/crontab_list_ts.sh
@@ -1,6 +1,6 @@
-0 */1 * * * git -C /scripts/ pull |ts >> /scripts/logs/pull.log 2>&1
-2 */1 * * * crontab /scripts/docker/${CRONTAB_LIST_FILE}
-3 */1 * * * npm install --prefix /scripts |ts >> /scripts/logs/npm_install.log 2>&1
+50 */1 * * * git -C /scripts/ pull |ts >> /scripts/logs/pull.log 2>&1
+52 */1 * * * crontab /scripts/docker/${CRONTAB_LIST_FILE}
+53 */1 * * * npm install --prefix /scripts |ts >> /scripts/logs/npm_install.log 2>&1
 # 每3天的23:50分清理一次日志
 50 23 */3 * * rm -rf /scripts/logs/*.log
 
diff --git a/githubAction.md b/githubAction.md
index 5a12edb4..3cfe13a8 100644
--- a/githubAction.md
+++ b/githubAction.md
@@ -112,6 +112,7 @@
 | `TG_PROXY_HOST`   |  Telegram 代理的 IP  | 非必须 | 代理类型为 http。例子：http代理 http://127.0.0.1:1080 则填写 127.0.0.1 |
 | `TG_PROXY_PORT`   |  Telegram 代理的端口  | 非必须 | 例子：http代理 http://127.0.0.1:1080 则填写 1080 |
 | `MONEY_TREE_SELL_FRUIT` |  摇钱树是否卖出金果  | 非必须 | 控制摇钱树脚本是否自动卖出金果兑换成金币，`true`卖出，`false`不卖出，默认`true` |
+| `FACTORAY_WANTPRODUCT_NAME` |  东东工厂心仪商品  | 非必须 | 提供心仪商品名称(请尽量填写完整和别的商品有区分度)，达到条件后兑换，如不提供则会兑换当前所选商品 |
 
 
 ##### 互助码的填写规则
diff --git a/jd_jdfactory.js b/jd_jdfactory.js
index 6520fe90..f933fd33 100644
--- a/jd_jdfactory.js
+++ b/jd_jdfactory.js
@@ -436,6 +436,7 @@ function jdfactory_getProductList(flag) {
                   console.log(`${item.name.slice(-4)}         ${item.sellOut === 1 ? '已抢光':'可选'}      ${item.couponCount}`);
                   if (item.name.indexOf(wantProduct) > -1 && item.couponCount > 0 && item.sellOut === 0) {
                     await jdfactory_makeProduct(item.skuId);
+                    break
                   }
                 }
               }