From 91bcefaa9f8a6e7cd5ee6287ed7595ec085ee8de Mon Sep 17 00:00:00 2001 From: lxk0301 <778732665@qq.com> Date: Wed, 23 Dec 2020 17:35:09 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=89=A9=E4=BD=99?= =?UTF-8?q?=E8=A7=82=E7=9C=8B=E8=A7=86=E9=A2=91=E6=AC=A1=E6=95=B0=20?= =?UTF-8?q?=E4=B8=BA0=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C=20?= =?UTF-8?q?=E8=BF=98=E7=BB=A7=E7=BB=AD=E7=AD=89=E5=BE=8530=E7=A7=92?= =?UTF-8?q?=E7=9A=84Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jd_crazy_joy_coin.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/jd_crazy_joy_coin.js b/jd_crazy_joy_coin.js index 4e73455b..4c85ab71 100644 --- a/jd_crazy_joy_coin.js +++ b/jd_crazy_joy_coin.js @@ -447,9 +447,11 @@ function openBox(eventType = 'LUCKY_BOX_DROP', boxId) { if (safeGet(data)) { data = JSON.parse(data); if (data['success']) { - $.log(`点击幸运盒子成功,剩余观看视频次数:${data.data.advertViewTimes},等待30秒`) - await $.wait(30000) - await rewardBox(eventType, boxId) + $.log(`点击幸运盒子成功,剩余观看视频次数:${data.data.advertViewTimes}, ${data.data.advertViewTimes > 0 ? '等待30秒' : '跳出'}`) + if (data.data.advertViewTimes > 0) { + await $.wait(30000) + await rewardBox(eventType, boxId); + } } } } From 28b0488f69d3a24eee53462db0e3ad489ef0b03e Mon Sep 17 00:00:00 2001 From: JunzhouLiu Date: Wed, 23 Dec 2020 18:50:53 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0Ubuntu=20apt-get=E5=AE=89?= =?UTF-8?q?=E8=A3=85docker-compsos=E5=92=8CDocker=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/Readme.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docker/Readme.md b/docker/Readme.md index f0660b71..beb03302 100644 --- a/docker/Readme.md +++ b/docker/Readme.md @@ -6,6 +6,19 @@ sudo curl -L "https://github.com/docker/compose/releases/download/1.24.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose sudo chmod +x /usr/local/bin/docker-compose ``` +`Ubuntu`用户快速安装`docker-compose` +``` +sudo apt-get update && sudo apt-get install -y python3-pip curl vim git moreutils +pip3 install --upgrade pip +pip install docker-compose +``` + +通过`docker-compose version`查看`docker-compose`版本,确认是否安装成功。 + +- `Docker`安装 +国内一键安装 `sudo curl -sSL https://get.daocloud.io/docker | sh` +国外一键安装 `sudo curl -sSL get.docker.com | sh` + ### 如果需要使用 docker 多个账户独立并发执行定时任务,[参考这里](https://github.com/iouAkira/scripts/blob/patch-1/docker/docker%E5%A4%9A%E8%B4%A6%E6%88%B7%E4%BD%BF%E7%94%A8%E7%8B%AC%E7%AB%8B%E5%AE%B9%E5%99%A8%E4%BD%BF%E7%94%A8%E8%AF%B4%E6%98%8E.md#%E4%BD%BF%E7%94%A8%E6%AD%A4%E6%96%B9%E5%BC%8F%E8%AF%B7%E5%85%88%E7%90%86%E8%A7%A3%E5%AD%A6%E4%BC%9A%E4%BD%BF%E7%94%A8docker%E5%8A%9E%E6%B3%95%E4%B8%80%E7%9A%84%E4%BD%BF%E7%94%A8%E6%96%B9%E5%BC%8F) ⚠️⚠️⚠️2020-12-11更新镜像启动方式,虽然兼容旧版的运行启动方式,但是强烈建议更新镜像和配置后使用 From 36a1eb341365d243a81b581600d3ceec4ac01b29 Mon Sep 17 00:00:00 2001 From: lxk0301 <778732665@qq.com> Date: Wed, 23 Dec 2020 19:33:16 +0800 Subject: [PATCH 3/4] fix --- jd_unbind.js | 1 - 1 file changed, 1 deletion(-) diff --git a/jd_unbind.js b/jd_unbind.js index 29c14ad3..a2a3d707 100644 --- a/jd_unbind.js +++ b/jd_unbind.js @@ -221,7 +221,6 @@ function TotalBean() { } function requireConfig() { return new Promise(resolve => { - process.env.UN_BIND_STOP_CARD = `123&457&34324` if ($.isNode() && process.env.UN_BIND_CARD_NUM) { $.UN_BIND_NUM = process.env.UN_BIND_CARD_NUM } From b255c2c20e4dad63719cd7f32976ba41d91fcad1 Mon Sep 17 00:00:00 2001 From: lxk0301 <778732665@qq.com> Date: Wed, 23 Dec 2020 22:59:55 +0800 Subject: [PATCH 4/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2a903127..90fd70a8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -## 不要fork! 不然下次GitHub还会继续封这个仓库 +# 不要fork! 请点亮Star ## 特别声明: