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 } } }