From baee23023e4890e314fb3e25fc57a7c803166089 Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Wed, 31 Mar 2021 12:14:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/Readme.md | 7 ++++---
 jd_fruit.js      | 2 +-
 jd_pet.js        | 2 +-
 jd_plantBean.js  | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/docker/Readme.md b/docker/Readme.md
index 11fc7f31..3366c3a7 100644
--- a/docker/Readme.md
+++ b/docker/Readme.md
@@ -59,6 +59,10 @@ _____
 ```
 > 推荐使用`docker-compose`所以这里只介绍`docker-compose`使用方式
 
+- `Docker`安装 
+国内一键安装 `sudo curl -sSL https://get.daocloud.io/docker | sh`
+国外一键安装 `sudo curl -sSL get.docker.com | sh`
+
 - `docker-compose` 安装（群晖nas docker自带安装了docker-compose）
 ```
 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
@@ -73,9 +77,6 @@ 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)  
 
diff --git a/jd_fruit.js b/jd_fruit.js
index e2889dbc..ee6ad7b5 100644
--- a/jd_fruit.js
+++ b/jd_fruit.js
@@ -127,7 +127,7 @@ async function jdFruit() {
     $.logErr(e);
     const errMsg = `京东账号${$.index} ${$.nickName || $.UserName}\n任务执行异常，请检查执行日志 ‼️‼️`;
     if ($.isNode()) await notify.sendNotify(`${$.name}`, errMsg);
-    $.msg($.name, '', `京东账号${$.index} ${$.nickName || $.UserName}\n${errMsg}`)
+    $.msg($.name, '', `${errMsg}`)
   }
   await showMsg();
 }
diff --git a/jd_pet.js b/jd_pet.js
index fad0a7b8..3a161545 100644
--- a/jd_pet.js
+++ b/jd_pet.js
@@ -143,7 +143,7 @@ async function jdPet() {
     $.logErr(e)
     const errMsg = `京东账号${$.index} ${$.nickName || $.UserName}\n任务执行异常，请检查执行日志 ‼️‼️`;
     if ($.isNode()) await notify.sendNotify(`${$.name}`, errMsg);
-    $.msg($.name, '', `京东账号${$.index} ${$.nickName || $.UserName}\n${errMsg}`)
+    $.msg($.name, '', `${errMsg}`)
   }
 }
 // 收取所有好感度
diff --git a/jd_plantBean.js b/jd_plantBean.js
index 5b2d0c14..78eb94c8 100644
--- a/jd_plantBean.js
+++ b/jd_plantBean.js
@@ -90,7 +90,7 @@ async function jdPlantBean() {
     console.log(`获取任务及基本信息`)
     await plantBeanIndex();
     // console.log(plantBeanIndexResult.data.taskList);
-    if ($.plantBeanIndexResult && $.plantBeanIndexResult.code === '0') {
+    if ($.plantBeanIndexResult && $.plantBeanIndexResult.code === '0' && $.plantBeanIndexResult.data) {
       const shareUrl = $.plantBeanIndexResult.data.jwordShareInfo.shareUrl
       $.myPlantUuid = getParam(shareUrl, 'plantUuid')
       console.log(`\n【京东账号${$.index}（${$.UserName}）的${$.name}好友互助码】${$.myPlantUuid}\n`);
@@ -118,7 +118,7 @@ async function jdPlantBean() {
     $.logErr(e);
     const errMsg = `京东账号${$.index} ${$.nickName || $.UserName}\n任务执行异常，请检查执行日志 ‼️‼️`;
     if ($.isNode()) await notify.sendNotify(`${$.name}`, errMsg);
-    $.msg($.name, '', `京东账号${$.index} ${$.nickName || $.UserName}\n${errMsg}`)
+    $.msg($.name, '', `${errMsg}`)
   }
 }
 async function doGetReward() {