From 97ce979096adf1dee9facaca4abf0bd6f3e44349 Mon Sep 17 00:00:00 2001
From: Akira <e.akimoto.akira@gmail.com>
Date: Thu, 24 Dec 2020 00:06:35 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E8=B0=83=E6=95=B4crazyjoy=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E4=BA=92=E5=8A=A9=E8=BE=93=E5=87=BA=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=20-=20=E5=A2=9E=E5=8A=A0crazyjoy=E4=BB=BB=E5=8A=A1=E4=BA=92?=
 =?UTF-8?q?=E5=8A=A9=E7=A0=81=E6=8F=90=E5=8F=96=20-=20crazyjoycoin?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=A5=E5=BF=97=E5=A2=9E=E5=8A=A0=E6=88=B3?=
 =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E5=9C=A8=E9=87=8D=E5=90=AF=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=E6=B8=85=E7=A9=BA=E4=B9=8B=E5=89=8D=E7=9A=84=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/proc_file.sh | 25 +++++++++++++++----------
 jd_crazy_joy.js     |  2 +-
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/docker/proc_file.sh b/docker/proc_file.sh
index c8849c8c..6def887d 100644
--- a/docker/proc_file.sh
+++ b/docker/proc_file.sh
@@ -10,6 +10,7 @@ jxFactoryFile="${logdDir}/jd_dreamFactory.log"
 plantBean="${logdDir}/jd_plantBean.log"
 jdfruit="${logdDir}/jd_fruit.log"
 jdpet="${logdDir}/jd_pet.log"
+jdcrazyJoy="${logdDir}/jd_crazy_joy.log"
 
 echo -e >$sharecodeFile
 
@@ -31,24 +32,28 @@ echo "提取京东农场助力码完成"
 sed -n '/东东萌宠好友互助码】.*/'p $jdpet | awk '{print $4,$5}' | sort | uniq >>$sharecodeFile
 echo "提取东东萌宠助力码完成"
 
+sed -n '/crazyJoy任务好友互助码】.*/'p $jdcrazyJoy | awk '{print $4,$5}' | sort | uniq >>$sharecodeFile
+echo "提取crazyJoy任务助力码完成"
+
 echo "==========================================================================="
 echo "整理完成，具体结果请查看${sharecodeFile}文件"
 
 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重启完成"
+   echo "默认启用jd_crazy_joy_coin杀掉jd_crazy_joy_coin任务，并重启"
+   eval $(ps -ef | grep "jd_crazy" | awk '{print "kill "$1}')
+   echo '' >/scripts/logs/jd_crazy_joy_coin.log
+   node /scripts/jd_crazy_joy_coin.js | ts >>/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 '' >/scripts/logs/jd_crazy_joy_coin.log
+      node /scripts/jd_crazy_joy_coin.js | ts >>/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
+   else
+      eval $(ps -ef | grep "jd_crazy" | awk '{print "kill "$1}')
+      echo "已配置不启用jd_crazy_joy_coin任务，不处理"
+   fi
 fi
-
diff --git a/jd_crazy_joy.js b/jd_crazy_joy.js
index 2e746db6..95468cbe 100644
--- a/jd_crazy_joy.js
+++ b/jd_crazy_joy.js
@@ -294,7 +294,7 @@ function getUserInfo(code = "EdLPh8A6X5G1iWXu-uPYfA==") {
           if (safeGet(data)) {
             data = JSON.parse(data);
             if (data.success && data.data && data.data.userInviteCode) {
-              console.log(`您的助力码为: ${data.data.userInviteCode}`)
+              console.log(`\n【京东账号${$.index}（${$.nickName || $.UserName}）的${$.name}好友互助码】${data.data.userInviteCode}`)
               $.selfCodes.push(data.data.userInviteCode)
               $.nextCode = data.data.userInviteCode
             }