diff --git a/jd_dreamFactory.js b/jd_dreamFactory.js index 1d31f543..96151748 100644 --- a/jd_dreamFactory.js +++ b/jd_dreamFactory.js @@ -105,7 +105,7 @@ if ($.isNode()) { continue } $.UserName = decodeURIComponent(cookie.match(/pt_pin=([^; ]+)(?=;?)/) && cookie.match(/pt_pin=([^; ]+)(?=;?)/)[1]) - await joinLeaderTuan();//参团 + if ((cookiesArr && cookiesArr.length >= ($.tuanNum || 5)) && $.canHelp) { console.log(`\n账号${$.UserName} 内部相互进团\n`); for (let item of $.tuanIds) { @@ -115,6 +115,7 @@ if ($.isNode()) { await $.wait(1000); } } + if ($.canHelp) await joinLeaderTuan();//参团 } } if ($.isNode() && allMessage) { @@ -1589,7 +1590,7 @@ function decrypt(time, stk, type, url) { $.token = `tk01wcdf61cb3a8nYUtHcmhSUFFCfddDPRvKvYaMjHkxo6Aj7dhzO+GXGFa9nPXfcgT+mULoF1b1YIS1ghvSlbwhE0Xc`; $.fingerprint = 5287160221454703; const str = `${$.token}${$.fingerprint}${timestamp}${$.appId}${random}`; - hash1 = $.CryptoJS.SHA512(str, token).toString($.CryptoJS.enc.Hex); + hash1 = $.CryptoJS.SHA512(str, $.token).toString($.CryptoJS.enc.Hex); } let st = ''; stk.split(',').map((item, index) => {