From fb330dea788f803796f62da1904e3387a9e44f0b Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Mon, 30 Nov 2020 21:47:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E5=96=9C=E5=B7=A5=E5=8E=82=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=B8=8D=E8=83=BD=E6=B4=BB=E5=8A=A8=E5=8F=8C=E5=80=8D?=
 =?UTF-8?q?=E7=94=B5=E5=8A=9B=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jd_dreamFactory.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jd_dreamFactory.js b/jd_dreamFactory.js
index e2b3bae2..073b46f8 100644
--- a/jd_dreamFactory.js
+++ b/jd_dreamFactory.js
@@ -105,9 +105,9 @@ function collectElectricity(facId = $.factoryId, help = false, master) {
     // if (help && master) {
     //   url = `/dreamfactory/generator/CollectCurrentElectricity?zone=dream_factory&factoryid=${facId}&master=${master}&sceneval=2&g_login_type=1`;
     // }
-    let body = `factoryid=${facId}`;
-    if (master) {
-      body += `&master=${master}`;
+    let body = `factoryid=${facId}&apptoken=&pgtimestamp=&phoneID=&doubleflag=1`;
+    if (help && master) {
+      body += `factoryid=${facId}&master=${master}`;
     }
     $.get(taskurl(`generator/CollectCurrentElectricity`, body), (err, resp, data) => {
       try {
@@ -248,7 +248,7 @@ function getUserElectricity() {
               console.log(`发电机：当前 ${data.data.currentElectricityQuantity} 电力，最大值 ${data.data.maxElectricityQuantity} 电力,达到最大电量才会进行收取`)
               if (data.data.currentElectricityQuantity === data.data.maxElectricityQuantity && data.data.doubleElectricityFlag) {
                 console.log(`发电机：电力可翻倍并收获`)
-                await shareReport();
+                // await shareReport();
                 await collectElectricity()
               } else {
                 message += `【发电机电力】当前 ${data.data.currentElectricityQuantity} 电力，未达到收获标准\n`