From 34c33137af1ef8a0380c5a4189f79ed583e94c67 Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Sun, 11 Apr 2021 16:28:46 +0800
Subject: [PATCH] fix

---
 jd_dreamFactory.js | 21 +++++++++++++++++----
 jd_jdzz.js         | 13 ++++++++++---
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/jd_dreamFactory.js b/jd_dreamFactory.js
index 96151748..90df2594 100644
--- a/jd_dreamFactory.js
+++ b/jd_dreamFactory.js
@@ -1194,11 +1194,24 @@ function tuanAward(activeId, tuanId, isTuanLeader = true) {
 
 function updateTuanIdsCDN(url = 'https://raw.githubusercontent.com/gitupdate/updateTeam/master/shareCodes/jd_updateFactoryTuanId.json') {
   return new Promise(async resolve => {
-    $.get({url,
-      timeout: 200000,
-      headers:{
+    const options = {
+      url: `${url}?${new Date()}`, "timeout": 10000, headers: {
         "User-Agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.3 Mobile/15E148 Safari/604.1 Edg/87.0.4280.88"
-      }}, (err, resp, data) => {
+      }
+    };
+    if ($.isNode() && process.env.TG_PROXY_HOST && process.env.TG_PROXY_PORT) {
+      const tunnel = require("tunnel");
+      const agent = {
+        https: tunnel.httpsOverHttp({
+          proxy: {
+            host: process.env.TG_PROXY_HOST,
+            port: process.env.TG_PROXY_PORT * 1
+          }
+        })
+      }
+      Object.assign(options, { agent })
+    }
+    $.get(options, (err, resp, data) => {
       try {
         if (err) {
           // console.log(`${JSON.stringify(err)}`)
diff --git a/jd_jdzz.js b/jd_jdzz.js
index 41805b76..786e2aad 100644
--- a/jd_jdzz.js
+++ b/jd_jdzz.js
@@ -122,10 +122,11 @@ async function jdWish() {
   await getTaskList(true)
   await getUserTuanInfo()
   if (!$.tuan) {
+    console.log(`准备再次开团`)
     await openTuan()
     if ($.hasOpen) await getUserTuanInfo()
   }
-  if ($.tuan && $.assistStatus !== 3) $.tuanList.push($.tuan)
+  if ($.tuan && $.tuan.hasOwnProperty('assistedPinEncrypted') && $.assistStatus !== 3) $.tuanList.push($.tuan)
 
   await helpFriends()
   await getUserInfo()
@@ -189,7 +190,6 @@ function getAuthorShareCode(url) {
         if (err) {
         } else {
           $.authorTuanList = $.authorTuanList.concat(JSON.parse(data))
-          console.log(`作者助力码获取成功`)
         }
       } catch (e) {
         $.logErr(e, resp)
@@ -241,7 +241,14 @@ function getUserTuanInfo() {
           if (safeGet(data)) {
             data = JSON.parse(data);
             if (data['success']) {
-              $.log(`\n\n【赚京豆(微信小程序)-瓜分京豆】能否再次开团: ${data.data.canStartNewAssist ? '可以' : '否'}\n\n`)
+              $.log(`\n\n当前【赚京豆(微信小程序)-瓜分京豆】能否再次开团: ${data.data.canStartNewAssist ? '可以' : '否'}`)
+              if (data.data.assistStatus === 1 && !data.data.canStartNewAssist) {
+                console.log(`已开团(未达上限)，但团成员人未满\n\n`)
+              } else if (data.data.assistStatus === 3 && data.data.canStartNewAssist) {
+                console.log(`已开团(未达上限)，团成员人已满\n\n`)
+              } else if (data.data.assistStatus === 3 && !data.data.canStartNewAssist) {
+                console.log(`今日开团已达上限，且当前团成员人已满\n\n`)
+              }
               if (data.data && !data.data.canStartNewAssist) {
                 $.tuan = {
                   "activityIdEncrypted": data.data.id,