From e14a255a03bc9c1e95de43f175440e90808e6a0e Mon Sep 17 00:00:00 2001
From: Akira <e.akimoto.akira@gmail.com>
Date: Wed, 23 Dec 2020 11:06:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A6=82=E6=9E=9CRANDOM=5FDELAY=5FMAX?=
 =?UTF-8?q?=E6=9C=AA=E9=85=8D=E7=BD=AE=E6=89=A7=E8=A1=8C=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?sh:=201:=20unknown=20operand?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

如果RANDOM_DELAY_MAX未配置执行提示sh: 1: unknown operand，增一个判断提示
https://github.com/lxk0301/jd_scripts/pull/372
---
 docker/default_task.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/docker/default_task.sh b/docker/default_task.sh
index d099871c..caf4f6d1 100644
--- a/docker/default_task.sh
+++ b/docker/default_task.sh
@@ -107,12 +107,16 @@ if [ $(grep -c "default_task.sh" $mergedListFile) -eq '0' ]; then
     echo "52 */1 * * * sh /scripts/docker/default_task.sh |ts >> /scripts/logs/default_task.log 2>&1" >>$mergedListFile
 fi
 
-if [ $RANDOM_DELAY_MAX -ge 1 ]; then
-    echo "已设置随机延迟为 $RANDOM_DELAY_MAX , 设置延迟任务中... "
-    sed -i "/\(jd_bean_sign.js\|jd_blueCoin.js\|jd_joy_reward.js\|jd_joy_steal.js\|jd_joy_feedPets.js\)/!s/node/sleep \$((RANDOM % \$RANDOM_DELAY_MAX)); node/g" $mergedListFile
+if [ $RANDOM_DELAY_MAX ];then
+    if [ $RANDOM_DELAY_MAX -ge 1 ]; then
+        echo "已设置随机延迟为 $RANDOM_DELAY_MAX , 设置延迟任务中... "
+        sed -i "/\(jd_bean_sign.js\|jd_blueCoin.js\|jd_joy_reward.js\|jd_joy_steal.js\|jd_joy_feedPets.js\)/!s/node/sleep \$((RANDOM % \$RANDOM_DELAY_MAX)); node/g" $mergedListFile
+    fi
+else
+    echo "未配置随即延迟对应的环境变量，故不设置延迟任务"
 fi
 
 echo "加载最新的定时任务文件..."
 crontab $mergedListFile
 
-sh -x /scripts/docker/proc_file.sh
\ No newline at end of file
+sh -x /scripts/docker/proc_file.sh

From 30fa1351743f44eb1d2bcabc54efe1772c82206f Mon Sep 17 00:00:00 2001
From: Akira <e.akimoto.akira@gmail.com>
Date: Wed, 23 Dec 2020 11:16:08 +0800
Subject: [PATCH 2/2] bug fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

因为之前测试时候日志输出未设置ts，所以$1没问题，默认所有日志有|ts输出，所以需要改取 $4,$5也取是担心中间会有多的空格影响分列
---
 docker/proc_file.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker/proc_file.sh b/docker/proc_file.sh
index 6ad3a51a..bf963c17 100644
--- a/docker/proc_file.sh
+++ b/docker/proc_file.sh
@@ -14,22 +14,22 @@ jdpet="${logdDir}/jd_pet.log"
 
 echo -e >$sharecodeFile
 
-sed -n '/京东赚赚好友互助码】.*/'p $jdzzFile | awk '{print $1}' | sort | uniq >>$sharecodeFile
+sed -n '/京东赚赚好友互助码】.*/'p $jdzzFile | awk '{print $4,$5}' | sort | uniq >>$sharecodeFile
 echo "提取京东赚赚助力码完成"
 
-sed -n '/东东工厂好友互助码】.*/'p $jdfactoryFile | awk '{print $1}' | sort | uniq >>$sharecodeFile
+sed -n '/东东工厂好友互助码】.*/'p $jdfactoryFile | awk '{print $4,$5}' | sort | uniq >>$sharecodeFile
 echo "提取东东工厂助力码完成"
 
-sed -n '/京喜工厂好友互助码.*/'p $jxFactoryFile | awk '{print $1}' | sort | uniq >>$sharecodeFile
+sed -n '/京喜工厂好友互助码.*/'p $jxFactoryFile | awk '{print $4,$5}' | sort | uniq >>$sharecodeFile
 echo "提取京喜工厂助力码完成"
 
-sed -n '/京东种豆得豆好友互助码】.*/'p $plantBean | awk '{print $1}' | sort | uniq >>$sharecodeFile
+sed -n '/京东种豆得豆好友互助码】.*/'p $plantBean | awk '{print $4,$5}' | sort | uniq >>$sharecodeFile
 echo "提取京东种豆助力码完成"
 
-sed -n '/东东农场好友互助码】.*/'p $jdfruit | awk '{print $1}' | sort | uniq >>$sharecodeFile
+sed -n '/东东农场好友互助码】.*/'p $jdfruit | awk '{print $4,$5}' | sort | uniq >>$sharecodeFile
 echo "提取京东农场助力码完成"
 
-sed -n '/东东萌宠好友互助码】.*/'p $jdpet | awk '{print $1}' | sort | uniq >>$sharecodeFile
+sed -n '/东东萌宠好友互助码】.*/'p $jdpet | awk '{print $4,$5}' | sort | uniq >>$sharecodeFile
 echo "提取东东萌宠助力码完成"
 
 echo "==========================================================================="