sinvo/jd_scripts
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
lxk0301
2021-04-11 16:28:46 +08:00
parent 7d66625f6e
commit 34c33137af
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
jd_dreamFactory.js
View File

@@ -1194,11 +1194,24 @@ function tuanAward(activeId, tuanId, isTuanLeader = true) {
function updateTuanIdsCDN(url = 'https://raw.githubusercontent.com/gitupdate/updateTeam/master/shareCodes/jd_updateFactoryTuanId.json') { function updateTuanIdsCDN(url = 'https://raw.githubusercontent.com/gitupdate/updateTeam/master/shareCodes/jd_updateFactoryTuanId.json') {
return new Promise(async resolve => { return new Promise(async resolve => {
$.get({url, const options = {
timeout: 200000, url: `${url}?${new Date()}`, "timeout": 10000, headers: {
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" "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 { try {
if (err) { if (err) {
// console.log(`${JSON.stringify(err)}`) // console.log(`${JSON.stringify(err)}`)

13
jd_jdzz.js
View File

@@ -122,10 +122,11 @@ async function jdWish() {
await getTaskList(true) await getTaskList(true)
await getUserTuanInfo() await getUserTuanInfo()
if (!$.tuan) { if (!$.tuan) {
console.log(`准备再次开团`)
await openTuan() await openTuan()
if ($.hasOpen) await getUserTuanInfo() if ($.hasOpen) await getUserTuanInfo()
} }
if ($.tuan && $.assistStatus !== 3) $.tuanList.push($.tuan) if ($.tuan && $.tuan.hasOwnProperty('assistedPinEncrypted') && $.assistStatus !== 3) $.tuanList.push($.tuan)
await helpFriends() await helpFriends()
await getUserInfo() await getUserInfo()
@@ -189,7 +190,6 @@ function getAuthorShareCode(url) {
if (err) { if (err) {
} else { } else {
$.authorTuanList = $.authorTuanList.concat(JSON.parse(data)) $.authorTuanList = $.authorTuanList.concat(JSON.parse(data))
console.log(`作者助力码获取成功`)
} }
} catch (e) { } catch (e) {
$.logErr(e, resp) $.logErr(e, resp)
@@ -241,7 +241,14 @@ function getUserTuanInfo() {
if (safeGet(data)) { if (safeGet(data)) {
data = JSON.parse(data); data = JSON.parse(data);
if (data['success']) { 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) { if (data.data && !data.data.canStartNewAssist) {
$.tuan = { $.tuan = {
"activityIdEncrypted": data.data.id, "activityIdEncrypted": data.data.id,