From 9358f77f2cf3f7a1d2ec2f06915234603b5b12c2 Mon Sep 17 00:00:00 2001
From: Akira <e.akimoto.akira@gmail.com>
Date: Wed, 23 Dec 2020 17:22:23 +0800
Subject: [PATCH 1/3] Update crontab_list.sh

---
 docker/crontab_list.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker/crontab_list.sh b/docker/crontab_list.sh
index 74d8635a..c2510d14 100644
--- a/docker/crontab_list.sh
+++ b/docker/crontab_list.sh
@@ -14,6 +14,8 @@
 10 6 1-31 12 * node /scripts/jr_sign.js >> /scripts/logs/jr_sign.log 2>&1
 # 京东健康APP集汪汪卡瓜分百万红包(2021.1.6活动过期)
 10 8 * * * node /scripts/jd_jdh.js >> /scripts/logs/jd_jdh.log 2>&1
+# crazyJoy自动每日任务
+10 7 * * * node /scripts/jd_crazy_joy.js >> /scripts/logs/jd_crazy_joy.log 2>&1
 
 ##############长期活动##############
 # 签到

From b6108201b5ab2d8989e368f6c3fbd2b108620a14 Mon Sep 17 00:00:00 2001
From: Akira <e.akimoto.akira@gmail.com>
Date: Wed, 23 Dec 2020 17:22:48 +0800
Subject: [PATCH 2/3] Update proc_file.sh

---
 docker/proc_file.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docker/proc_file.sh b/docker/proc_file.sh
index bf963c17..f8bad9d7 100644
--- a/docker/proc_file.sh
+++ b/docker/proc_file.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
-set -e
 
 echo "整理各个日志文件里面的互助码相关信息。。。"
 echo "==========================================================================="
@@ -34,3 +33,8 @@ echo "提取东东萌宠助力码完成"
 
 echo "==========================================================================="
 echo "整理完成，具体结果请查看${sharecodeFile}文件"
+
+echo "杀掉jd_crazy_joy_coin任务，并重启"
+eval $(ps -ef | grep "jd_crazy" | awk '{print "kill "$1}')
+node /scripts/jd_crazy_joy_coin.js >> /scripts/logs/jd_crazy_joy_coin.log 2>&1  &
+echo "jd_crazy_joy_coin重启完成"

From 3b4531cd42bd9acea5f7d85db408033f2ca6f6af Mon Sep 17 00:00:00 2001
From: Akira <e.akimoto.akira@gmail.com>
Date: Wed, 23 Dec 2020 17:38:26 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0CRZAY=5FJOY=5FCOIN=5FENAB?=
 =?UTF-8?q?LE=E5=BC=80=E5=85=B3=E9=85=8D=E7=BD=AE=EF=BC=8C=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=BC=80=E5=90=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关闭的话需要配置CRZAY_JOY_COIN_ENABLE=N
---
 docker/proc_file.sh | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/docker/proc_file.sh b/docker/proc_file.sh
index f8bad9d7..c8849c8c 100644
--- a/docker/proc_file.sh
+++ b/docker/proc_file.sh
@@ -34,7 +34,21 @@ echo "提取东东萌宠助力码完成"
 echo "==========================================================================="
 echo "整理完成，具体结果请查看${sharecodeFile}文件"
 
-echo "杀掉jd_crazy_joy_coin任务，并重启"
-eval $(ps -ef | grep "jd_crazy" | awk '{print "kill "$1}')
-node /scripts/jd_crazy_joy_coin.js >> /scripts/logs/jd_crazy_joy_coin.log 2>&1  &
-echo "jd_crazy_joy_coin重启完成"
+echo "处理jd_crazy_joy_coin任务。。。"
+if [ ! $CRZAY_JOY_COIN_ENABLE ]; then
+    echo "默认启用jd_crazy_joy_coin杀掉jd_crazy_joy_coin任务，并重启"
+    eval $(ps -ef | grep "jd_crazy" | awk '{print "kill "$1}')
+    node /scripts/jd_crazy_joy_coin.js >> /scripts/logs/jd_crazy_joy_coin.log 2>&1  &
+    echo "默认jd_crazy_joy_coin重启完成"
+else
+   if [ $CRZAY_JOY_COIN_ENABLE = "Y" ]; then
+      echo "配置启用jd_crazy_joy_coin，杀掉jd_crazy_joy_coin任务，并重启"
+      eval $(ps -ef | grep "jd_crazy" | awk '{print "kill "$1}')
+      node /scripts/jd_crazy_joy_coin.js >> /scripts/logs/jd_crazy_joy_coin.log 2>&1  &
+      echo "配置jd_crazy_joy_coin重启完成"
+  else
+     eval $(ps -ef | grep "jd_crazy" | awk '{print "kill "$1}')
+     echo "已配置不启用jd_crazy_joy_coin任务，不处理"
+  fi
+fi
+