diff --git a/src/main/resources/test_bean.js b/src/main/resources/test_bean.js index e364a5b..1e97099 100644 --- a/src/main/resources/test_bean.js +++ b/src/main/resources/test_bean.js @@ -30,7 +30,7 @@ let postTime = 11 let postDay = 1 let cookiesArr = [], cookie = '', jdPlantBeanShareArr = [], isBox = false, notify, newShareCodes, option, subTitle; let message = "" -let dingtalk = "https://oapi.dingtalk.com/robot/send?access_token=18444b555747aad3381bc1d1e3dea72b03158e152a846f818d82a1ca946bd430" +let dingtalk = "https://oapi.dingtalk.com/robot/send?access_token=18444b555747aad3381bc1d1e3dea72b03158e152a846f818d82a1ca946bd43f0" let dingtalk1 = "https://oapi.dingtalk.com/robot/send?access_token=04ab95f07aa0397e7167c6ea3a331bc7fcddbc4cda4a482b1e7e76755f97f6a0" let roleMap = { "jd_4521b375ebb5d": "锟子怪", @@ -839,7 +839,7 @@ function postToDingTalk1(messgae) { "msgtype": "markdown", "markdown": { "title": "种豆得豆", - "text": message1 + "text": message1 }, "at": { "atMobiles": [], diff --git a/src/main/resources/test_fruit.js b/src/main/resources/test_fruit.js index 57a5bdd..ba00585 100644 --- a/src/main/resources/test_fruit.js +++ b/src/main/resources/test_fruit.js @@ -1,38 +1,11 @@ -/* -东东水果:脚本更新地址 jd_fruit.js -更新时间：2021-11-09 -活动入口：京东APP我的-更多工具-东东农场 -东东农场活动链接：https://h5.m.jd.com/babelDiy/Zeus/3KSjXqQabiTuD1cJ28QskrpWoBKT/index.html -已支持IOS双京东账号,Node.js支持N个京东账号 -脚本兼容: QuantumultX, Surge, Loon, JSBox, Node.js -互助码shareCode请先手动运行脚本查看打印可看到 -一天只能帮助3个人。多出的助力码无效 -==========================Quantumultx========================= -[task_local] -#jd免费水果 -5 6-18/6 * * * jd_fruit.js, tag=东东农场, img-url=https://raw.githubusercontent.com/58xinian/icon/master/jdnc.png, enabled=true -=========================Loon============================= -[Script] -cron "5 6-18/6 * * *" script-path=jd_fruit.js,tag=东东农场 +let cookiesArr = [], cookie = '', jdFruitShareArr = [], isBox = false, notify, newShareCodes; +//助力好友分享码(最多4个,否则后面的助力失败),原因:动动农场每人每天只有四次助力机会 +//此此内容是IOS用户下载脚本到本地使用，填写互助码的地方，同一动动账号的好友互助码请使用@符号隔开。 +//下面给出两个账号的填写示例（iOS只支持2个动动账号） +let shareCodes = + [ // 这个列表填入你要助力的好友的shareCode + ] -=========================Surge============================ -东东农场 = type=cron,cronexp="5 6-18/6 * * *",wake-system=1,timeout=3600,script-path=jd_fruit.js - -=========================小火箭=========================== -东东农场 = type=cron,script-path=jd_fruit.js, cronexpr="5 6-18/6 * * *", timeout=3600, enable=true - -jd免费水果 搬的https://github.com/liuxiaoyucc/jd-helper/blob/a6f275d9785748014fc6cca821e58427162e9336/fruit/fruit.js - -export DO_TEN_WATER_AGAIN="" 默认再次浇水 - -*/ -const $ = new Env('东东农场'); -let cookiesArr = [], cookie = '', jdFruitShareArr = [], isBox = false, notify, newShareCodes, allMessage = ''; -//助力好友分享码(最多3个,否则后面的助力失败),原因:京东农场每人每天只有3次助力机会 -//此此内容是IOS用户下载脚本到本地使用，填写互助码的地方，同一京东账号的好友互助码请使用@符号隔开。 -//下面给出两个账号的填写示例（iOS只支持2个京东账号） -let shareCodes = [ -] let dingtalk = "https://oapi.dingtalk.com/robot/send?access_token=d2b6042cb38f0df63e20797c002208d2710104750c18a1dc84d54106a859a3f0" let dingtalk2 = "https://oapi.dingtalk.com/robot/send?access_token=1832f969da101ef8273e8ba2258f06f15ec34bc22282066b28ab617042a7a9b6"; let getManName = "" @@ -48,123 +21,104 @@ let roleMap = { "jd_66ea783827d30": "军子", "jd_4311ac0ff4456": "居子" } - -//目前改成先号内互助 有多余次数互助池子 let message = '', subTitle = '', option = {}, isFruitFinished = false; const retainWater = 100;//保留水滴大于多少g,默认100g; let jdNotify = false;//是否关闭通知，false打开通知推送，true关闭通知推送 let jdFruitBeanCard = false;//农场使用水滴换豆卡(如果出现限时活动时100g水换20豆,此时比浇水划算,推荐换豆),true表示换豆(不浇水),false表示不换豆(继续浇水),脚本默认是浇水 -let randomCount = $.isNode() ? 20 : 5; +let randomCount = $.isNode() ? 0 : 0; const JD_API_HOST = 'https://api.m.jd.com/client.action'; const urlSchema = `openjd://virtual?params=%7B%20%22category%22:%20%22jump%22,%20%22des%22:%20%22m%22,%20%22url%22:%20%22https://h5.m.jd.com/babelDiy/Zeus/3KSjXqQabiTuD1cJ28QskrpWoBKT/index.html%22%20%7D`; !(async () => { await requireConfig(); + message += "[通知] 动动农场 \n\n --- \n\n" if (!cookiesArr[0]) { - $.msg($.name, '【提示】请先获取京东账号一cookie\n直接使用NobyDa的京东签到获取', 'https://bean.m.jd.com/bean/signIndex.action', { "open-url": "https://bean.m.jd.com/bean/signIndex.action" }); + $.msg($.name, '【提示】请先获取动动账号一cookie\n直接使用NobyDa的动动签到获取', 'https://bean.m.jd.com/bean/signIndex.action', { "open-url": "https://bean.m.jd.com/bean/signIndex.action" }); return; } - newShareCodes = []; for (let i = 0; i < cookiesArr.length; i++) { if (cookiesArr[i]) { cookie = cookiesArr[i]; - $.UserName = decodeURIComponent(cookie.match(/pt_pin=([^; ]+)(?=;?)/) && cookie.match(/pt_pin=([^; ]+)(?=;?)/)[1]) + $.UserName = decodeURIComponent(cookie.match(/pt_pin=(.+?);/) && cookie.match(/pt_pin=(.+?);/)[1]) $.index = i + 1; $.isLogin = true; $.nickName = ''; await TotalBean(); - username = $.UserName if (roleMap[username] != undefined) { username = roleMap[username] } getManName = username + //加上名称 message = message + "【羊毛姐妹】" + username + " \n\n " - - console.log(`\n开始【京东账号${$.index}】${$.nickName || $.UserName}\n`); + that.log(`\n开始【动动账号${$.index}】${$.nickName || $.UserName}\n`); if (!$.isLogin) { - $.msg($.name, `【提示】cookie已失效`, `京东账号${$.index} ${$.nickName || $.UserName}\n请重新登录获取\nhttps://bean.m.jd.com/bean/signIndex.action`, { "open-url": "https://bean.m.jd.com/bean/signIndex.action" }); + $.msg($.name, `【提示】cookie已失效`, `动动账号${$.index} ${$.nickName || $.UserName}\n请重新登录获取\nhttps://bean.m.jd.com/bean/signIndex.action`, { "open-url": "https://bean.m.jd.com/bean/signIndex.action" }); if ($.isNode()) { - await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); + await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `动动账号${$.index} ${$.UserName}\n请重新登录获取cookie`); } continue } subTitle = ''; option = {}; - //await shareCodesFormat(); + await shareCodesFormat(); await jdFruit(); } - message += "----\n\n" - that.log(message) } - for (let i = 0; i < cookiesArr.length; i++) { - if (cookiesArr[i]) { - cookie = cookiesArr[i]; - $.UserName = decodeURIComponent(cookie.match(/pt_pin=([^; ]+)(?=;?)/) && cookie.match(/pt_pin=([^; ]+)(?=;?)/)[1]) - $.index = i + 1; - $.isLogin = true; - $.nickName = ''; - await TotalBean(); - console.log(`\n开始【京东账号${$.index}】${$.nickName || $.UserName}\n`); - if (!$.isLogin) { - $.msg($.name, `【提示】cookie已失效`, `京东账号${$.index} ${$.nickName || $.UserName}\n请重新登录获取\nhttps://bean.m.jd.com/bean/signIndex.action`, { "open-url": "https://bean.m.jd.com/bean/signIndex.action" }); - if ($.isNode()) { - await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } - continue - } - await masterHelpShare();//助力好友 - //互助 账号内部互助 - } - } - if ($.isNode() && allMessage && $.ctrTemp) { - await notify.sendNotify(`${$.name}`, `${allMessage}`) - } + that.log(message) + })() .catch((e) => { $.log('', `❌ ${$.name}, 失败! 原因: ${e}!`, '') }) .finally(() => { - $.done(); + that.log(message) + message = message + getPic() postToDingTalk(message) + $.done(); }) + + async function jdFruit() { - subTitle = `【京东账号${$.index}】${$.nickName || $.UserName}`; + subTitle = `【动动账号${$.index}】${$.nickName}`; try { await initForFarm(); if ($.farmInfo.farmUserPro) { // option['media-url'] = $.farmInfo.farmUserPro.goodsImage; message = message + "【水果名称】 " + `${$.farmInfo.farmUserPro.name}` + "\n\n"; message += "【已兑换水果】" + `${$.farmInfo.farmUserPro.winTimes}` + "次\n\n"; - console.log(`\n【京东账号${$.index}（${$.UserName}）的${$.name}好友互助码】${$.farmInfo.farmUserPro.shareCode}\n`); - console.log(`\n【已成功兑换水果】${$.farmInfo.farmUserPro.winTimes}次\n`); - newShareCodes.push($.farmInfo.farmUserPro.shareCode); + that.log(`\n【动动账号${$.index}（${$.nickName || $.UserName}）的${$.name}好友互助码】${$.farmInfo.farmUserPro.shareCode}\n`); + that.log(`\n【已成功兑换水果】${$.farmInfo.farmUserPro.winTimes}次\n`); + await getHelp(); + await masterHelpShare();//助力好友 await setHelp(); - //await masterHelpShare();//助力好友 if ($.farmInfo.treeState === 2 || $.farmInfo.treeState === 3) { option['open-url'] = urlSchema; - $.msg($.name, ``, `【京东账号${$.index}】${$.nickName || $.UserName}\n【提醒⏰】${$.farmInfo.farmUserPro.name}已可领取\n请去京东APP或微信小程序查看\n点击弹窗即达`, option); + mes = " " + getManName + "，你好\n\n【提醒⏰】" + fruitName + "已可领取\n请去动动APP或微信小程序查看\n点击弹窗即达" postToDingTalk2(mes) + + $.msg($.name, ``, `【动动账号${$.index}】${$.nickName || $.UserName}\n【提醒⏰】${$.farmInfo.farmUserPro.name}已可领取\n请去动动APP或微信小程序查看\n点击弹窗即达`, option); if ($.isNode()) { - await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName || $.UserName}水果已可领取`, `【京东账号${$.index}】${$.nickName || $.UserName}\n【提醒⏰】${$.farmInfo.farmUserPro.name}已可领取\n请去京东APP或微信小程序查看`); + await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName}水果已可领取`, `【动动账号${$.index}】${$.nickName || $.UserName}\n【提醒⏰】${$.farmInfo.farmUserPro.name}已可领取\n请去动动APP或微信小程序查看`); } return } else if ($.farmInfo.treeState === 1) { - console.log(`\n${$.farmInfo.farmUserPro.name}种植中...\n`) + that.log(`\n${$.farmInfo.farmUserPro.name}种植中...\n`) } else if ($.farmInfo.treeState === 0) { //已下单购买, 但未开始种植新的水果 option['open-url'] = urlSchema; - $.msg($.name, ``, `【京东账号${$.index}】 ${$.nickName || $.UserName}\n【提醒⏰】您忘了种植新的水果\n请去京东APP或微信小程序选购并种植新的水果\n点击弹窗即达`, option); + $.msg($.name, ``, `【动动账号${$.index}】 ${$.nickName || $.UserName}\n【提醒⏰】您忘了种植新的水果\n请去动动APP或微信小程序选购并种植新的水果\n点击弹窗即达`, option); mes = " " + getManName + "，你好\n\n【提醒⏰】您忘了种植新的水果\n请去京东APP或微信小程序选购并种植新的水果" postToDingTalk2(mes) + if ($.isNode()) { - await notify.sendNotify(`${$.name} - 您忘了种植新的水果`, `京东账号${$.index} ${$.nickName || $.UserName}\n【提醒⏰】您忘了种植新的水果\n请去京东APP或微信小程序选购并种植新的水果`); + await notify.sendNotify(`${$.name} - 您忘了种植新的水果`, `动动账号${$.index} ${$.nickName}\n【提醒⏰】您忘了种植新的水果\n请去动动APP或微信小程序选购并种植新的水果`); } return } @@ -174,54 +128,45 @@ async function jdFruit() { await getTenWaterAward();//领取10浇水奖励 await getWaterFriendGotAward();//领取为2好友浇水奖励 await duck(); - if (!process.env.DO_TEN_WATER_AGAIN) { - console.log('执行再次浇水') - await doTenWaterAgain();//再次浇水 - } else { - console.log('不执行再次浇水，攒水滴') - } + await doTenWaterAgain();//再次浇水 await predictionFruit();//预测水果成熟时间 message = message + "----\n\n" } else { - console.log(`初始化农场数据异常, 请登录京东 app查看农场0元水果功能是否正常,农场初始化数据: ${JSON.stringify($.farmInfo)}`); + that.log(`初始化农场数据异常, 请登录动动 app查看农场0元水果功能是否正常,农场初始化数据: ${JSON.stringify($.farmInfo)}`); message = message + " " + `初始化农场数据异常, 请登录动动 app查看农场0元水果功能是否正常,农场初始化数据: ${JSON.stringify($.farmInfo)}` + "\n\n"; - } } catch (e) { - console.log(`任务执行异常，请检查执行日志 ‼️‼️`); - $.logErr(e); + that.log(`任务执行异常，请检查执行日志 ‼️‼️`); message = message + " " + `任务执行异常，请检查执行日志 ‼️‼️` + e + "\n\n"; - const errMsg = `京东账号${$.index} ${$.nickName || $.UserName}\n任务执行异常，请检查执行日志 ‼️‼️`; - if ($.isNode()) await notify.sendNotify(`${$.name}`, errMsg); - $.msg($.name, '', `${errMsg}`) + $.logErr(e); } await showMsg(); } async function doDailyTask() { await taskInitForFarm(); - console.log(`开始签到`); + that.log(`开始签到`); if (!$.farmTask.signInit.todaySigned) { await signForFarm(); //签到 if ($.signResult.code === "0") { - console.log(`【签到成功】获得${$.signResult.amount}g💧\\n`) + that.log(`【签到成功】获得${$.signResult.amount}g💧\\n`) //message += `【签到成功】获得${$.signResult.amount}g💧\n`//连续签到${signResult.signDay}天 } else { // message += `签到失败,详询日志\n`; - console.log(`签到结果: ${JSON.stringify($.signResult)}`); + that.log(`签到结果: ${JSON.stringify($.signResult)}`); } } else { - console.log(`今天已签到,连续签到${$.farmTask.signInit.totalSigned},下次签到可得${$.farmTask.signInit.signEnergyEachAmount}g\n`); + that.log(`今天已签到,连续签到${$.farmTask.signInit.totalSigned},下次签到可得${$.farmTask.signInit.signEnergyEachAmount}g\n`); } // 被水滴砸中 - console.log(`被水滴砸中： ${$.farmInfo.todayGotWaterGoalTask.canPop ? '是' : '否'}`); + that.log(`被水滴砸中： ${$.farmInfo.todayGotWaterGoalTask.canPop ? '是' : '否'}`); if ($.farmInfo.todayGotWaterGoalTask.canPop) { await gotWaterGoalTaskForFarm(); if ($.goalResult.code === '0') { - console.log(`【被水滴砸中】获得${$.goalResult.addEnergy}g💧\\n`); + that.log(`【被水滴砸中】获得${$.goalResult.addEnergy}g💧\\n`); // message += `【被水滴砸中】获得${$.goalResult.addEnergy}g💧\n` } } - console.log(`签到结束,开始广告浏览任务`); + that.log(`签到结束,开始广告浏览任务`); if (!$.farmTask.gotBrowseTaskAdInit.f) { let adverts = $.farmTask.gotBrowseTaskAdInit.userBrowseTaskAds let browseReward = 0 @@ -230,51 +175,51 @@ async function doDailyTask() { for (let advert of adverts) { //开始浏览广告 if (advert.limit <= advert.hadFinishedTimes) { // browseReward+=advert.reward - console.log(`${advert.mainTitle}+ ' 已完成`);//,获得${advert.reward}g + that.log(`${advert.mainTitle}+ ' 已完成`);//,获得${advert.reward}g continue; } - console.log('正在进行广告浏览任务: ' + advert.mainTitle); + that.log('正在进行广告浏览任务: ' + advert.mainTitle); await browseAdTaskForFarm(advert.advertId, 0); if ($.browseResult.code === '0') { - console.log(`${advert.mainTitle}浏览任务完成`); + that.log(`${advert.mainTitle}浏览任务完成`); //领取奖励 await browseAdTaskForFarm(advert.advertId, 1); if ($.browseRwardResult.code === '0') { - console.log(`领取浏览${advert.mainTitle}广告奖励成功,获得${$.browseRwardResult.amount}g`) + that.log(`领取浏览${advert.mainTitle}广告奖励成功,获得${$.browseRwardResult.amount}g`) browseReward += $.browseRwardResult.amount browseSuccess++ } else { browseFail++ - console.log(`领取浏览广告奖励结果: ${JSON.stringify($.browseRwardResult)}`) + that.log(`领取浏览广告奖励结果: ${JSON.stringify($.browseRwardResult)}`) } } else { browseFail++ - console.log(`广告浏览任务结果: ${JSON.stringify($.browseResult)}`); + that.log(`广告浏览任务结果: ${JSON.stringify($.browseResult)}`); } } if (browseFail > 0) { - console.log(`【广告浏览】完成${browseSuccess}个,失败${browseFail},获得${browseReward}g💧\\n`); + that.log(`【广告浏览】完成${browseSuccess}个,失败${browseFail},获得${browseReward}g💧\\n`); // message += `【广告浏览】完成${browseSuccess}个,失败${browseFail},获得${browseReward}g💧\n`; } else { - console.log(`【广告浏览】完成${browseSuccess}个,获得${browseReward}g💧\n`); + that.log(`【广告浏览】完成${browseSuccess}个,获得${browseReward}g💧\n`); // message += `【广告浏览】完成${browseSuccess}个,获得${browseReward}g💧\n`; } } else { - console.log(`今天已经做过浏览广告任务\n`); + that.log(`今天已经做过浏览广告任务\n`); } //定时领水 if (!$.farmTask.gotThreeMealInit.f) { // await gotThreeMealForFarm(); if ($.threeMeal.code === "0") { - console.log(`【定时领水】获得${$.threeMeal.amount}g💧\n`); + that.log(`【定时领水】获得${$.threeMeal.amount}g💧\n`); // message += `【定时领水】获得${$.threeMeal.amount}g💧\n`; } else { // message += `【定时领水】失败,详询日志\n`; - console.log(`定时领水成功结果: ${JSON.stringify($.threeMeal)}`); + that.log(`定时领水成功结果: ${JSON.stringify($.threeMeal)}`); } } else { - console.log('当前不在定时领水时间断或者已经领过\n') + that.log('当前不在定时领水时间断或者已经领过\n') } //给好友浇水 if (!$.farmTask.waterFriendTaskInit.f) { @@ -282,7 +227,7 @@ async function doDailyTask() { await doFriendsWater(); } } else { - console.log(`给${$.farmTask.waterFriendTaskInit.waterFriendMax}个好友浇水任务已完成\n`) + that.log(`给${$.farmTask.waterFriendTaskInit.waterFriendMax}个好友浇水任务已完成\n`) } // await Promise.all([ // clockInIn(),//打卡领水 @@ -291,14 +236,14 @@ async function doDailyTask() { // getExtraAward(),//领取额外水滴奖励 // turntableFarm()//天天抽奖得好礼 // ]) - await getAwardInviteFriend(); + // await getAwardInviteFriend(); await clockInIn();//打卡领水 await executeWaterRains();//水滴雨 await getExtraAward();//领取额外水滴奖励 await turntableFarm()//天天抽奖得好礼 } async function predictionFruit() { - console.log('开始预测水果成熟时间\n'); + that.log('开始预测水果成熟时间\n'); await initForFarm(); await taskInitForFarm(); let waterEveryDayT = $.farmTask.totalWaterTaskInit.totalWaterTaskTimes;//今天到到目前为止，浇了多少次水 @@ -306,9 +251,6 @@ async function predictionFruit() { message += "【剩余 水滴】" + `${$.farmInfo.farmUserPro.totalEnergy}` + "g💧 \n\n" message += "【水果🍉进度】" + `${(($.farmInfo.farmUserPro.treeEnergy / $.farmInfo.farmUserPro.treeTotalEnergy) * 100).toFixed(2)}` + "%，已浇水" + `${$.farmInfo.farmUserPro.treeEnergy / 10}` + "次,还需" + `${($.farmInfo.farmUserPro.treeTotalEnergy - $.farmInfo.farmUserPro.treeEnergy) / 10}` + "次 \n\n" - - - if ($.farmInfo.toFlowTimes > ($.farmInfo.farmUserPro.treeEnergy / 10)) { message += "【水果🍉进度】" + `【开花进度】再浇水${$.farmInfo.toFlowTimes - $.farmInfo.farmUserPro.treeEnergy / 10}次开花\n\n` + "\n\n" } else if ($.farmInfo.toFruitTimes > ($.farmInfo.farmUserPro.treeEnergy / 10)) { @@ -330,45 +272,45 @@ async function doTenWater() { await myCardInfoForFarm(); const { fastCard, doubleCard, beanCard, signCard } = $.myCardInfoRes; if (`${jdFruitBeanCard}` === 'true' && JSON.stringify($.myCardInfoRes).match(`限时翻倍`) && beanCard > 0) { - console.log(`您设置的是使用水滴换豆卡，且背包有水滴换豆卡${beanCard}张, 跳过10次浇水任务`) + that.log(`您设置的是使用水滴换豆卡，且背包有水滴换豆卡${beanCard}张, 跳过10次浇水任务`) return } if ($.farmTask.totalWaterTaskInit.totalWaterTaskTimes < $.farmTask.totalWaterTaskInit.totalWaterTaskLimit) { - console.log(`\n准备浇水十次`); + that.log(`\n准备浇水十次`); let waterCount = 0; isFruitFinished = false; for (; waterCount < $.farmTask.totalWaterTaskInit.totalWaterTaskLimit - $.farmTask.totalWaterTaskInit.totalWaterTaskTimes; waterCount++) { - console.log(`第${waterCount + 1}次浇水`); + that.log(`第${waterCount + 1}次浇水`); await waterGoodForFarm(); - console.log(`本次浇水结果: ${JSON.stringify($.waterResult)}`); + that.log(`本次浇水结果: ${JSON.stringify($.waterResult)}`); if ($.waterResult.code === '0') { - console.log(`剩余水滴${$.waterResult.totalEnergy}g`); + that.log(`剩余水滴${$.waterResult.totalEnergy}g`); if ($.waterResult.finished) { // 已证实，waterResult.finished为true，表示水果可以去领取兑换了 isFruitFinished = true; break } else { if ($.waterResult.totalEnergy < 10) { - console.log(`水滴不够，结束浇水`) + that.log(`水滴不够，结束浇水`) break } await gotStageAward();//领取阶段性水滴奖励 } } else { - console.log('浇水出现失败异常,跳出不在继续浇水') + that.log('浇水出现失败异常,跳出不在继续浇水') break; } } if (isFruitFinished) { option['open-url'] = urlSchema; - $.msg($.name, ``, `【京东账号${$.index}】${$.nickName || $.UserName}\n【提醒⏰】${$.farmInfo.farmUserPro.name}已可领取\n请去京东APP或微信小程序查看\n点击弹窗即达`, option); + $.msg($.name, ``, `【动动账号${$.index}】${$.nickName || $.UserName}\n【提醒⏰】${$.farmInfo.farmUserPro.name}已可领取\n请去动动APP或微信小程序查看\n点击弹窗即达`, option); $.done(); if ($.isNode()) { - await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName || $.UserName}水果已可领取`, `京东账号${$.index} ${$.nickName || $.UserName}\n${$.farmInfo.farmUserPro.name}已可领取`); + await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName || $.UserName}水果已可领取`, `动动账号${$.index} ${$.nickName}\n${$.farmInfo.farmUserPro.name}已可领取`); } } } else { - console.log('\n今日已完成10次浇水任务\n'); + that.log('\n今日已完成10次浇水任务\n'); } } //领取首次浇水奖励 @@ -378,14 +320,14 @@ async function getFirstWaterAward() { if (!$.farmTask.firstWaterInit.f && $.farmTask.firstWaterInit.totalWaterTimes > 0) { await firstWaterTaskForFarm(); if ($.firstWaterReward.code === '0') { - console.log(`【首次浇水奖励】获得${$.firstWaterReward.amount}g💧\n`); + that.log(`【首次浇水奖励】获得${$.firstWaterReward.amount}g💧\n`); // message += `【首次浇水奖励】获得${$.firstWaterReward.amount}g💧\n`; } else { // message += '【首次浇水奖励】领取奖励失败,详询日志\n'; - console.log(`领取首次浇水奖励结果: ${JSON.stringify($.firstWaterReward)}`); + that.log(`领取首次浇水奖励结果: ${JSON.stringify($.firstWaterReward)}`); } } else { - console.log('首次浇水奖励已领取\n') + that.log('首次浇水奖励已领取\n') } } //领取十次浇水奖励 @@ -394,32 +336,32 @@ async function getTenWaterAward() { if (!$.farmTask.totalWaterTaskInit.f && $.farmTask.totalWaterTaskInit.totalWaterTaskTimes >= $.farmTask.totalWaterTaskInit.totalWaterTaskLimit) { await totalWaterTaskForFarm(); if ($.totalWaterReward.code === '0') { - console.log(`【十次浇水奖励】获得${$.totalWaterReward.totalWaterTaskEnergy}g💧\n`); + that.log(`【十次浇水奖励】获得${$.totalWaterReward.totalWaterTaskEnergy}g💧\n`); // message += `【十次浇水奖励】获得${$.totalWaterReward.totalWaterTaskEnergy}g💧\n`; } else { // message += '【十次浇水奖励】领取奖励失败,详询日志\n'; - console.log(`领取10次浇水奖励结果: ${JSON.stringify($.totalWaterReward)}`); + that.log(`领取10次浇水奖励结果: ${JSON.stringify($.totalWaterReward)}`); } } else if ($.farmTask.totalWaterTaskInit.totalWaterTaskTimes < $.farmTask.totalWaterTaskInit.totalWaterTaskLimit) { // message += `【十次浇水奖励】任务未完成，今日浇水${$.farmTask.totalWaterTaskInit.totalWaterTaskTimes}次\n`; - console.log(`【十次浇水奖励】任务未完成，今日浇水${$.farmTask.totalWaterTaskInit.totalWaterTaskTimes}次\n`); + that.log(`【十次浇水奖励】任务未完成，今日浇水${$.farmTask.totalWaterTaskInit.totalWaterTaskTimes}次\n`); } - console.log('finished 水果任务完成!'); + that.log('finished 水果任务完成!'); } //再次浇水 async function doTenWaterAgain() { - console.log('开始检查剩余水滴能否再次浇水再次浇水\n'); + that.log('开始检查剩余水滴能否再次浇水再次浇水\n'); await initForFarm(); let totalEnergy = $.farmInfo.farmUserPro.totalEnergy; - console.log(`剩余水滴${totalEnergy}g\n`); + that.log(`剩余水滴${totalEnergy}g\n`); await myCardInfoForFarm(); const { fastCard, doubleCard, beanCard, signCard } = $.myCardInfoRes; - console.log(`背包已有道具:\n快速浇水卡:${fastCard === -1 ? '未解锁' : fastCard + '张'}\n水滴翻倍卡:${doubleCard === -1 ? '未解锁' : doubleCard + '张'}\n水滴换京豆卡:${beanCard === -1 ? '未解锁' : beanCard + '张'}\n加签卡:${signCard === -1 ? '未解锁' : signCard + '张'}\n`) + that.log(`背包已有道具:\n快速浇水卡:${fastCard === -1 ? '未解锁' : fastCard + '张'}\n水滴翻倍卡:${doubleCard === -1 ? '未解锁' : doubleCard + '张'}\n水滴换京豆卡:${beanCard === -1 ? '未解锁' : beanCard + '张'}\n加签卡:${signCard === -1 ? '未解锁' : signCard + '张'}\n`) if (totalEnergy >= 100 && doubleCard > 0) { //使用翻倍水滴卡 for (let i = 0; i < new Array(doubleCard).fill('').length; i++) { await userMyCardForFarm('doubleCard'); - console.log(`使用翻倍水滴卡结果:${JSON.stringify($.userMyCardRes)}`); + that.log(`使用翻倍水滴卡结果:${JSON.stringify($.userMyCardRes)}`); } await initForFarm(); totalEnergy = $.farmInfo.farmUserPro.totalEnergy; @@ -428,7 +370,7 @@ async function doTenWaterAgain() { //使用加签卡 for (let i = 0; i < new Array(signCard).fill('').length; i++) { await userMyCardForFarm('signCard'); - console.log(`使用加签卡结果:${JSON.stringify($.userMyCardRes)}`); + that.log(`使用加签卡结果:${JSON.stringify($.userMyCardRes)}`); } await initForFarm(); totalEnergy = $.farmInfo.farmUserPro.totalEnergy; @@ -438,25 +380,25 @@ async function doTenWaterAgain() { jdFruitBeanCard = process.env.FRUIT_BEAN_CARD; } if (`${jdFruitBeanCard}` === 'true' && JSON.stringify($.myCardInfoRes).match('限时翻倍')) { - console.log(`\n您设置的是水滴换豆功能,现在为您换豆`); + that.log(`\n您设置的是水滴换豆功能,现在为您换豆`); if (totalEnergy >= 100 && $.myCardInfoRes.beanCard > 0) { //使用水滴换豆卡 await userMyCardForFarm('beanCard'); - console.log(`使用水滴换豆卡结果:${JSON.stringify($.userMyCardRes)}`); + that.log(`使用水滴换豆卡结果:${JSON.stringify($.userMyCardRes)}`); if ($.userMyCardRes.code === '0') { - message += `【水滴换豆卡】获得${$.userMyCardRes.beanCount}个京豆\n`; + message += "【水果🍉进度】" + `【水滴换豆卡】获得${$.userMyCardRes.beanCount}个京豆\n` + "\n\n"; return } } else { - console.log(`您目前水滴:${totalEnergy}g,水滴换豆卡${$.myCardInfoRes.beanCard}张,暂不满足水滴换豆的条件,为您继续浇水`) + that.log(`您目前水滴:${totalEnergy}g,水滴换豆卡${$.myCardInfoRes.beanCard}张,暂不满足水滴换豆的条件,为您继续浇水`) } } // if (totalEnergy > 100 && $.myCardInfoRes.fastCard > 0) { // //使用快速浇水卡 // await userMyCardForFarm('fastCard'); - // console.log(`使用快速浇水卡结果:${JSON.stringify($.userMyCardRes)}`); + // that.log(`使用快速浇水卡结果:${JSON.stringify($.userMyCardRes)}`); // if ($.userMyCardRes.code === '0') { - // console.log(`已使用快速浇水卡浇水${$.userMyCardRes.waterEnergy}g`); + // that.log(`已使用快速浇水卡浇水${$.userMyCardRes.waterEnergy}g`); // } // await initForFarm(); // totalEnergy = $.farmInfo.farmUserPro.totalEnergy; @@ -468,37 +410,37 @@ async function doTenWaterAgain() { isFruitFinished = false; for (let i = 0; i < ($.farmInfo.farmUserPro.treeTotalEnergy - $.farmInfo.farmUserPro.treeEnergy) / 10; i++) { await waterGoodForFarm(); - console.log(`本次浇水结果(水果马上就可兑换了): ${JSON.stringify($.waterResult)}`); + that.log(`本次浇水结果(水果马上就可兑换了): ${JSON.stringify($.waterResult)}`); if ($.waterResult.code === '0') { - console.log('\n浇水10g成功\n'); + that.log('\n浇水10g成功\n'); if ($.waterResult.finished) { // 已证实，waterResult.finished为true，表示水果可以去领取兑换了 isFruitFinished = true; break } else { - console.log(`目前水滴【${$.waterResult.totalEnergy}】g,继续浇水，水果马上就可以兑换了`) + that.log(`目前水滴【${$.waterResult.totalEnergy}】g,继续浇水，水果马上就可以兑换了`) } } else { - console.log('浇水出现失败异常,跳出不在继续浇水') + that.log('浇水出现失败异常,跳出不在继续浇水') break; } } if (isFruitFinished) { option['open-url'] = urlSchema; - $.msg($.name, ``, `【京东账号${$.index}】${$.nickName || $.UserName}\n【提醒⏰】${$.farmInfo.farmUserPro.name}已可领取\n请去京东APP或微信小程序查看\n点击弹窗即达`, option); + $.msg($.name, ``, `【动动账号${$.index}】${$.nickName || $.UserName}\n【提醒⏰】${$.farmInfo.farmUserPro.name}已可领取\n请去动动APP或微信小程序查看\n点击弹窗即达`, option); $.done(); if ($.isNode()) { - await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName || $.UserName}水果已可领取`, `京东账号${$.index} ${$.nickName || $.UserName}\n${$.farmInfo.farmUserPro.name}已可领取`); + await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName}水果已可领取`, `动动账号${$.index} ${$.nickName}\n${$.farmInfo.farmUserPro.name}已可领取`); } } } else if (overageEnergy >= 10) { - console.log("目前剩余水滴：【" + totalEnergy + "】g，可继续浇水"); + that.log("目前剩余水滴：【" + totalEnergy + "】g，可继续浇水"); isFruitFinished = false; for (let i = 0; i < parseInt(overageEnergy / 10); i++) { await waterGoodForFarm(); - console.log(`本次浇水结果: ${JSON.stringify($.waterResult)}`); + that.log(`本次浇水结果: ${JSON.stringify($.waterResult)}`); if ($.waterResult.code === '0') { - console.log(`\n浇水10g成功,剩余${$.waterResult.totalEnergy}\n`) + that.log(`\n浇水10g成功,剩余${$.waterResult.totalEnergy}\n`) if ($.waterResult.finished) { // 已证实，waterResult.finished为true，表示水果可以去领取兑换了 isFruitFinished = true; @@ -507,48 +449,48 @@ async function doTenWaterAgain() { await gotStageAward() } } else { - console.log('浇水出现失败异常,跳出不在继续浇水') + that.log('浇水出现失败异常,跳出不在继续浇水') break; } } if (isFruitFinished) { option['open-url'] = urlSchema; - $.msg($.name, ``, `【京东账号${$.index}】${$.nickName || $.UserName}\n【提醒⏰】${$.farmInfo.farmUserPro.name}已可领取\n请去京东APP或微信小程序查看\n点击弹窗即达`, option); + $.msg($.name, ``, `【动动账号${$.index}】${$.nickName || $.UserName}\n【提醒⏰】${$.farmInfo.farmUserPro.name}已可领取\n请去动动APP或微信小程序查看\n点击弹窗即达`, option); $.done(); if ($.isNode()) { - await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName || $.UserName}水果已可领取`, `京东账号${$.index} ${$.nickName || $.UserName}\n${$.farmInfo.farmUserPro.name}已可领取`); + await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName}水果已可领取`, `动动账号${$.index} ${$.nickName}\n${$.farmInfo.farmUserPro.name}已可领取`); } } } else { - console.log("目前剩余水滴：【" + totalEnergy + "】g,不再继续浇水,保留部分水滴用于完成第二天【十次浇水得水滴】任务") + that.log("目前剩余水滴：【" + totalEnergy + "】g,不再继续浇水,保留部分水滴用于完成第二天【十次浇水得水滴】任务") } } //领取阶段性水滴奖励 function gotStageAward() { return new Promise(async resolve => { if ($.waterResult.waterStatus === 0 && $.waterResult.treeEnergy === 10) { - console.log('果树发芽了,奖励30g水滴'); + that.log('果树发芽了,奖励30g水滴'); await gotStageAwardForFarm('1'); - console.log(`浇水阶段奖励1领取结果 ${JSON.stringify($.gotStageAwardForFarmRes)}`); + that.log(`浇水阶段奖励1领取结果 ${JSON.stringify($.gotStageAwardForFarmRes)}`); if ($.gotStageAwardForFarmRes.code === '0') { // message += `【果树发芽了】奖励${$.gotStageAwardForFarmRes.addEnergy}\n`; - console.log(`【果树发芽了】奖励${$.gotStageAwardForFarmRes.addEnergy}\n`); + that.log(`【果树发芽了】奖励${$.gotStageAwardForFarmRes.addEnergy}\n`); } } else if ($.waterResult.waterStatus === 1) { - console.log('果树开花了,奖励40g水滴'); + that.log('果树开花了,奖励40g水滴'); await gotStageAwardForFarm('2'); - console.log(`浇水阶段奖励2领取结果 ${JSON.stringify($.gotStageAwardForFarmRes)}`); + that.log(`浇水阶段奖励2领取结果 ${JSON.stringify($.gotStageAwardForFarmRes)}`); if ($.gotStageAwardForFarmRes.code === '0') { // message += `【果树开花了】奖励${$.gotStageAwardForFarmRes.addEnergy}g💧\n`; - console.log(`【果树开花了】奖励${$.gotStageAwardForFarmRes.addEnergy}g💧\n`); + that.log(`【果树开花了】奖励${$.gotStageAwardForFarmRes.addEnergy}g💧\n`); } } else if ($.waterResult.waterStatus === 2) { - console.log('果树长出小果子啦, 奖励50g水滴'); + that.log('果树长出小果子啦, 奖励50g水滴'); await gotStageAwardForFarm('3'); - console.log(`浇水阶段奖励3领取结果 ${JSON.stringify($.gotStageAwardForFarmRes)}`) + that.log(`浇水阶段奖励3领取结果 ${JSON.stringify($.gotStageAwardForFarmRes)}`) if ($.gotStageAwardForFarmRes.code === '0') { // message += `【果树结果了】奖励${$.gotStageAwardForFarmRes.addEnergy}g💧\n`; - console.log(`【果树结果了】奖励${$.gotStageAwardForFarmRes.addEnergy}g💧\n`); + that.log(`【果树结果了】奖励${$.gotStageAwardForFarmRes.addEnergy}g💧\n`); } } resolve() @@ -562,67 +504,67 @@ async function turntableFarm() { let { timingIntervalHours, timingLastSysTime, sysTime, timingGotStatus, remainLotteryTimes, turntableInfos } = $.initForTurntableFarmRes; if (!timingGotStatus) { - console.log(`是否到了领取免费赠送的抽奖机会----${sysTime > (timingLastSysTime + 60 * 60 * timingIntervalHours * 1000)}`) + that.log(`是否到了领取免费赠送的抽奖机会----${sysTime > (timingLastSysTime + 60 * 60 * timingIntervalHours * 1000)}`) if (sysTime > (timingLastSysTime + 60 * 60 * timingIntervalHours * 1000)) { await timingAwardForTurntableFarm(); - console.log(`领取定时奖励结果${JSON.stringify($.timingAwardRes)}`); + that.log(`领取定时奖励结果${JSON.stringify($.timingAwardRes)}`); await initForTurntableFarm(); remainLotteryTimes = $.initForTurntableFarmRes.remainLotteryTimes; } else { - console.log(`免费赠送的抽奖机会未到时间`) + that.log(`免费赠送的抽奖机会未到时间`) } } else { - console.log('4小时候免费赠送的抽奖机会已领取') + that.log('4小时候免费赠送的抽奖机会已领取') } if ($.initForTurntableFarmRes.turntableBrowserAds && $.initForTurntableFarmRes.turntableBrowserAds.length > 0) { for (let index = 0; index < $.initForTurntableFarmRes.turntableBrowserAds.length; index++) { if (!$.initForTurntableFarmRes.turntableBrowserAds[index].status) { - console.log(`开始浏览天天抽奖的第${index + 1}个逛会场任务`) + that.log(`开始浏览天天抽奖的第${index + 1}个逛会场任务`) await browserForTurntableFarm(1, $.initForTurntableFarmRes.turntableBrowserAds[index].adId); if ($.browserForTurntableFarmRes.code === '0' && $.browserForTurntableFarmRes.status) { - console.log(`第${index + 1}个逛会场任务完成，开始领取水滴奖励\n`) + that.log(`第${index + 1}个逛会场任务完成，开始领取水滴奖励\n`) await browserForTurntableFarm(2, $.initForTurntableFarmRes.turntableBrowserAds[index].adId); if ($.browserForTurntableFarmRes.code === '0') { - console.log(`第${index + 1}个逛会场任务领取水滴奖励完成\n`) + that.log(`第${index + 1}个逛会场任务领取水滴奖励完成\n`) await initForTurntableFarm(); remainLotteryTimes = $.initForTurntableFarmRes.remainLotteryTimes; } } } else { - console.log(`浏览天天抽奖的第${index + 1}个逛会场任务已完成`) + that.log(`浏览天天抽奖的第${index + 1}个逛会场任务已完成`) } } } //天天抽奖助力 - console.log('开始天天抽奖--好友助力--每人每天只有三次助力机会.') + that.log('开始天天抽奖--好友助力--每人每天只有三次助力机会.') for (let code of newShareCodes) { if (code === $.farmInfo.farmUserPro.shareCode) { - console.log('天天抽奖-不能自己给自己助力\n') + that.log('天天抽奖-不能自己给自己助力\n') continue } await lotteryMasterHelp(code); - // console.log('天天抽奖助力结果',lotteryMasterHelpRes.helpResult) + // that.log('天天抽奖助力结果',lotteryMasterHelpRes.helpResult) if ($.lotteryMasterHelpRes.helpResult.code === '0') { - console.log(`天天抽奖-助力${$.lotteryMasterHelpRes.helpResult.masterUserInfo.nickName}成功\n`) + that.log(`天天抽奖-助力${$.lotteryMasterHelpRes.helpResult.masterUserInfo.nickName}成功\n`) } else if ($.lotteryMasterHelpRes.helpResult.code === '11') { - console.log(`天天抽奖-不要重复助力${$.lotteryMasterHelpRes.helpResult.masterUserInfo.nickName}\n`) + that.log(`天天抽奖-不要重复助力${$.lotteryMasterHelpRes.helpResult.masterUserInfo.nickName}\n`) } else if ($.lotteryMasterHelpRes.helpResult.code === '13') { - console.log(`天天抽奖-助力${$.lotteryMasterHelpRes.helpResult.masterUserInfo.nickName}失败,助力次数耗尽\n`); + that.log(`天天抽奖-助力${$.lotteryMasterHelpRes.helpResult.masterUserInfo.nickName}失败,助力次数耗尽\n`); break; } } - console.log(`---天天抽奖次数remainLotteryTimes----${remainLotteryTimes}次`) + that.log(`---天天抽奖次数remainLotteryTimes----${remainLotteryTimes}次`) //抽奖 if (remainLotteryTimes > 0) { - console.log('开始抽奖') + that.log('开始抽奖') let lotteryResult = ''; for (let i = 0; i < new Array(remainLotteryTimes).fill('').length; i++) { await lotteryForTurntableFarm() - console.log(`第${i + 1}次抽奖结果${JSON.stringify($.lotteryRes)}`); + that.log(`第${i + 1}次抽奖结果${JSON.stringify($.lotteryRes)}`); if ($.lotteryRes.code === '0') { turntableInfos.map((item) => { if (item.type === $.lotteryRes.type) { - console.log(`lotteryRes.type${$.lotteryRes.type}`); + that.log(`lotteryRes.type${$.lotteryRes.type}`); if ($.lotteryRes.type.match(/bean/g) && $.lotteryRes.type.match(/bean/g)[0] === 'bean') { lotteryResult += `${item.name}个，`; } else if ($.lotteryRes.type.match(/water/g) && $.lotteryRes.type.match(/water/g)[0] === 'water') { @@ -639,14 +581,14 @@ async function turntableFarm() { } } if (lotteryResult) { - console.log(`【天天抽奖】${lotteryResult.substr(0, lotteryResult.length - 1)}\n`) + that.log(`【天天抽奖】${lotteryResult.substr(0, lotteryResult.length - 1)}\n`) // message += `【天天抽奖】${lotteryResult.substr(0, lotteryResult.length - 1)}\n`; } } else { - console.log('天天抽奖--抽奖机会为0次') + that.log('天天抽奖--抽奖机会为0次') } } else { - console.log('初始化天天抽奖得好礼失败') + that.log('初始化天天抽奖得好礼失败') } } //领取额外奖励水滴 @@ -658,15 +600,15 @@ async function getExtraAward() { if (!$.masterHelpResult.masterGotFinal) { await masterGotFinishedTaskForFarm(); if ($.masterGotFinished.code === '0') { - console.log(`已成功领取好友助力奖励：【${$.masterGotFinished.amount}】g水`); + that.log(`已成功领取好友助力奖励：【${$.masterGotFinished.amount}】g水`); message += "【额外奖励】" + `${$.masterGotFinished.amount}` + "g水领取成功\n\n"; } } else { - console.log("已经领取过5好友助力额外奖励"); - message += "" + `【额外奖励】已被领取过\n` + "\n\n"; + that.log("已经领取过5好友助力额外奖励"); + message += "【水果🍉进度】" + `【额外奖励】已被领取过\n` + "\n\n"; } } else { - console.log("助力好友未达到5个"); + that.log("助力好友未达到5个"); message += "【额外奖励】领取失败,原因：给您助力的人未达5个\n\n"; } if ($.masterHelpResult.masterHelpPeoples && $.masterHelpResult.masterHelpPeoples.length > 0) { @@ -679,86 +621,16 @@ async function getExtraAward() { } let date = new Date(item.time); let time = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + ' ' + date.getHours() + ':' + date.getMinutes() + ':' + date.getMinutes(); - console.log(`\n京东昵称【${item.nickName || "匿名用户"}】 在 ${time} 给您助过力\n`); + that.log(`\n动动昵称【${item.nickName || "匿名用户"}】 在 ${time} 给您助过力\n`); }) message += "【助力您的好友】 " + `${str}` + "\n\n" } - console.log('领取额外奖励水滴结束\n'); + that.log('领取额外奖励水滴结束\n'); } } -//助力好友 -async function masterHelpShare() { - console.log('开始助力好友') - let salveHelpAddWater = 0; - let remainTimes = 3;//今日剩余助力次数,默认3次（京东农场每人每天3次助力机会）。 - let helpSuccessPeoples = '';//成功助力好友 - await getHelp(); - console.log(`格式化后的助力码::${JSON.stringify(newShareCodes)}\n`); - - for (let code of newShareCodes) { - console.log(`开始助力京东账号${$.index} - ${$.nickName || $.UserName}的好友: ${code}`); - if (!code) continue; - if (code === $.farmInfo.farmUserPro.shareCode) { - console.log('不能为自己助力哦，跳过自己的shareCode\n') - continue - } - await masterHelp(code); - if ($.helpResult.code === '0') { - if ($.helpResult.helpResult.code === '0') { - //助力成功 - salveHelpAddWater += $.helpResult.helpResult.salveHelpAddWater; - console.log(`【助力好友结果】: 已成功给【${$.helpResult.helpResult.masterUserInfo.nickName}】助力`); - console.log(`给好友【${$.helpResult.helpResult.masterUserInfo.nickName}】助力获得${$.helpResult.helpResult.salveHelpAddWater}g水滴`) - helpSuccessPeoples += ($.helpResult.helpResult.masterUserInfo.nickName || '匿名用户') + ','; - } else if ($.helpResult.helpResult.code === '8') { - console.log(`【助力好友结果】: 助力【${$.helpResult.helpResult.masterUserInfo.nickName}】失败，您今天助力次数已耗尽`); - } else if ($.helpResult.helpResult.code === '9') { - console.log(`【助力好友结果】: 之前给【${$.helpResult.helpResult.masterUserInfo.nickName}】助力过了`); - } else if ($.helpResult.helpResult.code === '10') { - console.log(`【助力好友结果】: 好友【${$.helpResult.helpResult.masterUserInfo.nickName}】已满五人助力`); - } else { - console.log(`助力其他情况：${JSON.stringify($.helpResult.helpResult)}`); - } - console.log(`【今日助力次数还剩】${$.helpResult.helpResult.remainTimes}次\n`); - remainTimes = $.helpResult.helpResult.remainTimes; - if ($.helpResult.helpResult.remainTimes === 0) { - console.log(`您当前助力次数已耗尽，跳出助力`); - break - } - } else { - console.log(`助力失败::${JSON.stringify($.helpResult)}`); - } - } - // if ($.isLoon() || $.isQuanX() || $.isSurge()) { - // let helpSuccessPeoplesKey = timeFormat() + $.farmInfo.farmUserPro.shareCode; - // if (!$.getdata(helpSuccessPeoplesKey)) { - // //把前一天的清除 - // $.setdata('', timeFormat(Date.now() - 24 * 60 * 60 * 1000) + $.farmInfo.farmUserPro.shareCode); - // $.setdata('', helpSuccessPeoplesKey); - // } - // if (helpSuccessPeoples) { - // if ($.getdata(helpSuccessPeoplesKey)) { - // $.setdata($.getdata(helpSuccessPeoplesKey) + ',' + helpSuccessPeoples, helpSuccessPeoplesKey); - // } else { - // $.setdata(helpSuccessPeoples, helpSuccessPeoplesKey); - // } - // } - // helpSuccessPeoples = $.getdata(helpSuccessPeoplesKey); - // } - if (helpSuccessPeoples && helpSuccessPeoples.length > 0) { - // message += `【您助力的好友👬】${helpSuccessPeoples.substr(0, helpSuccessPeoples.length - 1)}\n`; - } - if (salveHelpAddWater > 0) { - // message += `【助力好友👬】获得${salveHelpAddWater}g💧\n`; - console.log(`【助力好友👬】获得${salveHelpAddWater}g💧\n`); - } - message += "" + `【今日剩余助力👬】${remainTimes}次\n` + "\n\n"; - console.log('助力好友结束，即将开始领取额外水滴奖励\n'); -} - function getHelp() { - //newShareCodes = []; + newShareCodes = []; return new Promise(resolve => { $.get({ url: "http://api.tyh52.com/act/get/jd_fruit/3" @@ -815,26 +687,78 @@ function setHelp() { }); } +//助力好友 +async function masterHelpShare() { + that.log('开始助力好友') + let salveHelpAddWater = 0; + let remainTimes = 4;//今日剩余助力次数,默认4次（动动农场每人每天4次助力机会）。 + let helpSuccessPeoples = '';//成功助力好友 + that.log(`格式化后的助力码::${JSON.stringify(newShareCodes)}\n`); + + for (let code of newShareCodes) { + that.log(`开始助力动动账号${$.index} - ${$.nickName}的好友: ${code}`); + if (!code) continue; + if (code === $.farmInfo.farmUserPro.shareCode) { + that.log('不能为自己助力哦，跳过自己的shareCode\n') + continue + } + await masterHelp(code); + if ($.helpResult.code === '0') { + if ($.helpResult.helpResult.code === '0') { + //助力成功 + salveHelpAddWater += $.helpResult.helpResult.salveHelpAddWater; + that.log(`【助力好友结果】: 已成功给【${$.helpResult.helpResult.masterUserInfo.nickName}】助力`); + that.log(`给好友【${$.helpResult.helpResult.masterUserInfo.nickName}】助力获得${$.helpResult.helpResult.salveHelpAddWater}g水滴`) + helpSuccessPeoples += ($.helpResult.helpResult.masterUserInfo.nickName || '匿名用户') + ','; + } else if ($.helpResult.helpResult.code === '8') { + that.log(`【助力好友结果】: 助力【${$.helpResult.helpResult.masterUserInfo.nickName}】失败，您今天助力次数已耗尽`); + } else if ($.helpResult.helpResult.code === '9') { + that.log(`【助力好友结果】: 之前给【${$.helpResult.helpResult.masterUserInfo.nickName}】助力过了`); + } else if ($.helpResult.helpResult.code === '10') { + that.log(`【助力好友结果】: 好友【${$.helpResult.helpResult.masterUserInfo.nickName}】已满五人助力`); + } else { + that.log(`助力其他情况：${JSON.stringify($.helpResult.helpResult)}`); + } + that.log(`【今日助力次数还剩】${$.helpResult.helpResult.remainTimes}次\n`); + remainTimes = $.helpResult.helpResult.remainTimes; + if ($.helpResult.helpResult.remainTimes === 0) { + that.log(`您当前助力次数已耗尽，跳出助力`); + break + } + } else { + that.log(`助力失败::${JSON.stringify($.helpResult)}`); + } + } + if (helpSuccessPeoples && helpSuccessPeoples.length > 0) { + message += " " + `【您助力的好友👬】${helpSuccessPeoples.substr(0, helpSuccessPeoples.length - 1)}\n` + "\n\n"; + } + if (salveHelpAddWater > 0) { + // message += `【助力好友👬】获得${salveHelpAddWater}g💧\n`; + that.log(`【助力好友👬】获得${salveHelpAddWater}g💧\n`); + } + message += "" + `【今日剩余助力👬】${remainTimes}次\n` + "\n\n"; + that.log('助力好友结束，即将开始领取额外水滴奖励\n'); +} //水滴雨 async function executeWaterRains() { let executeWaterRain = !$.farmTask.waterRainInit.f; if (executeWaterRain) { - console.log(`水滴雨任务，每天两次，最多可得10g水滴`); - console.log(`两次水滴雨任务是否全部完成：${$.farmTask.waterRainInit.f ? '是' : '否'}`); + that.log(`水滴雨任务，每天两次，最多可得10g水滴`); + that.log(`两次水滴雨任务是否全部完成：${$.farmTask.waterRainInit.f ? '是' : '否'}`); if ($.farmTask.waterRainInit.lastTime) { if (Date.now() < ($.farmTask.waterRainInit.lastTime + 3 * 60 * 60 * 1000)) { executeWaterRain = false; // message += `【第${$.farmTask.waterRainInit.winTimes + 1}次水滴雨】未到时间，请${new Date($.farmTask.waterRainInit.lastTime + 3 * 60 * 60 * 1000).toLocaleTimeString()}再试\n`; - console.log(`\`【第${$.farmTask.waterRainInit.winTimes + 1}次水滴雨】未到时间，请${new Date($.farmTask.waterRainInit.lastTime + 3 * 60 * 60 * 1000).toLocaleTimeString()}再试\n`); + that.log(`\`【第${$.farmTask.waterRainInit.winTimes + 1}次水滴雨】未到时间，请${new Date($.farmTask.waterRainInit.lastTime + 3 * 60 * 60 * 1000).toLocaleTimeString()}再试\n`); } } if (executeWaterRain) { - console.log(`开始水滴雨任务,这是第${$.farmTask.waterRainInit.winTimes + 1}次，剩余${2 - ($.farmTask.waterRainInit.winTimes + 1)}次`); + that.log(`开始水滴雨任务,这是第${$.farmTask.waterRainInit.winTimes + 1}次，剩余${2 - ($.farmTask.waterRainInit.winTimes + 1)}次`); await waterRainForFarm(); - console.log('水滴雨waterRain'); + that.log('水滴雨waterRain'); if ($.waterRain.code === '0') { - console.log('水滴雨任务执行成功，获得水滴：' + $.waterRain.addEnergy + 'g'); - console.log(`【第${$.farmTask.waterRainInit.winTimes + 1}次水滴雨】获得${$.waterRain.addEnergy}g水滴\n`); + that.log('水滴雨任务执行成功，获得水滴：' + $.waterRain.addEnergy + 'g'); + that.log(`【第${$.farmTask.waterRainInit.winTimes + 1}次水滴雨】获得${$.waterRain.addEnergy}g水滴\n`); // message += `【第${$.farmTask.waterRainInit.winTimes + 1}次水滴雨】获得${$.waterRain.addEnergy}g水滴\n`; } } @@ -844,48 +768,48 @@ async function executeWaterRains() { } //打卡领水活动 async function clockInIn() { - console.log('开始打卡领水活动（签到，关注，领券）'); + that.log('开始打卡领水活动（签到，关注，领券）'); await clockInInitForFarm(); if ($.clockInInit.code === '0') { // 签到得水滴 if (!$.clockInInit.todaySigned) { - console.log('开始今日签到'); + that.log('开始今日签到'); await clockInForFarm(); - console.log(`打卡结果${JSON.stringify($.clockInForFarmRes)}`); + that.log(`打卡结果${JSON.stringify($.clockInForFarmRes)}`); if ($.clockInForFarmRes.code === '0') { // message += `【第${$.clockInForFarmRes.signDay}天签到】获得${$.clockInForFarmRes.amount}g💧\n`; - console.log(`【第${$.clockInForFarmRes.signDay}天签到】获得${$.clockInForFarmRes.amount}g💧\n`) + that.log(`【第${$.clockInForFarmRes.signDay}天签到】获得${$.clockInForFarmRes.amount}g💧\n`) if ($.clockInForFarmRes.signDay === 7) { //可以领取惊喜礼包 - console.log('开始领取--惊喜礼包38g水滴'); + that.log('开始领取--惊喜礼包38g水滴'); await gotClockInGift(); if ($.gotClockInGiftRes.code === '0') { // message += `【惊喜礼包】获得${$.gotClockInGiftRes.amount}g💧\n`; - console.log(`【惊喜礼包】获得${$.gotClockInGiftRes.amount}g💧\n`); + that.log(`【惊喜礼包】获得${$.gotClockInGiftRes.amount}g💧\n`); } } } } if ($.clockInInit.todaySigned && $.clockInInit.totalSigned === 7) { - console.log('开始领取--惊喜礼包38g水滴'); + that.log('开始领取--惊喜礼包38g水滴'); await gotClockInGift(); if ($.gotClockInGiftRes.code === '0') { // message += `【惊喜礼包】获得${$.gotClockInGiftRes.amount}g💧\n`; - console.log(`【惊喜礼包】获得${$.gotClockInGiftRes.amount}g💧\n`); + that.log(`【惊喜礼包】获得${$.gotClockInGiftRes.amount}g💧\n`); } } // 限时关注得水滴 if ($.clockInInit.themes && $.clockInInit.themes.length > 0) { for (let item of $.clockInInit.themes) { if (!item.hadGot) { - console.log(`关注ID${item.id}`); + that.log(`关注ID${item.id}`); await clockInFollowForFarm(item.id, "theme", "1"); - console.log(`themeStep1--结果${JSON.stringify($.themeStep1)}`); + that.log(`themeStep1--结果${JSON.stringify($.themeStep1)}`); if ($.themeStep1.code === '0') { await clockInFollowForFarm(item.id, "theme", "2"); - console.log(`themeStep2--结果${JSON.stringify($.themeStep2)}`); + that.log(`themeStep2--结果${JSON.stringify($.themeStep2)}`); if ($.themeStep2.code === '0') { - console.log(`关注${item.name}，获得水滴${$.themeStep2.amount}g`); + that.log(`关注${item.name}，获得水滴${$.themeStep2.amount}g`); } } } @@ -895,59 +819,59 @@ async function clockInIn() { if ($.clockInInit.venderCoupons && $.clockInInit.venderCoupons.length > 0) { for (let item of $.clockInInit.venderCoupons) { if (!item.hadGot) { - console.log(`领券的ID${item.id}`); + that.log(`领券的ID${item.id}`); await clockInFollowForFarm(item.id, "venderCoupon", "1"); - console.log(`venderCouponStep1--结果${JSON.stringify($.venderCouponStep1)}`); + that.log(`venderCouponStep1--结果${JSON.stringify($.venderCouponStep1)}`); if ($.venderCouponStep1.code === '0') { await clockInFollowForFarm(item.id, "venderCoupon", "2"); if ($.venderCouponStep2.code === '0') { - console.log(`venderCouponStep2--结果${JSON.stringify($.venderCouponStep2)}`); - console.log(`从${item.name}领券，获得水滴${$.venderCouponStep2.amount}g`); + that.log(`venderCouponStep2--结果${JSON.stringify($.venderCouponStep2)}`); + that.log(`从${item.name}领券，获得水滴${$.venderCouponStep2.amount}g`); } } } } } } - console.log('开始打卡领水活动（签到，关注，领券）结束\n'); + that.log('开始打卡领水活动（签到，关注，领券）结束\n'); } // async function getAwardInviteFriend() { await friendListInitForFarm();//查询好友列表 - // console.log(`查询好友列表数据：${JSON.stringify($.friendList)}\n`) + that.log(`查询好友列表数据：\n`) if ($.friendList) { - console.log(`\n今日已邀请好友${$.friendList.inviteFriendCount}个 / 每日邀请上限${$.friendList.inviteFriendMax}个`); - console.log(`开始删除${$.friendList.friends && $.friendList.friends.length}个好友,可拿每天的邀请奖励`); + that.log(`\n今日已邀请好友${$.friendList.inviteFriendCount}个 / 每日邀请上限${$.friendList.inviteFriendMax}个`); + that.log(`开始删除${$.friendList.friends && $.friendList.friends.length}个好友,可拿每天的邀请奖励`); if ($.friendList.friends && $.friendList.friends.length > 0) { for (let friend of $.friendList.friends) { - console.log(`\n开始删除好友 [${friend.shareCode}]`); + that.log(`\n开始删除好友 [${friend.shareCode}]`); const deleteFriendForFarm = await request('deleteFriendForFarm', { "shareCode": `${friend.shareCode}`, "version": 8, "channel": 1 }); if (deleteFriendForFarm && deleteFriendForFarm.code === '0') { - console.log(`删除好友 [${friend.shareCode}] 成功\n`); + that.log(`删除好友 [${friend.shareCode}] 成功\n`); } } } await receiveFriendInvite();//为他人助力,接受邀请成为别人的好友 if ($.friendList.inviteFriendCount > 0) { if ($.friendList.inviteFriendCount > $.friendList.inviteFriendGotAwardCount) { - console.log('开始领取邀请好友的奖励'); + that.log('开始领取邀请好友的奖励'); await awardInviteFriendForFarm(); - console.log(`领取邀请好友的奖励结果：：${JSON.stringify($.awardInviteFriendRes)}`); + that.log(`领取邀请好友的奖励结果：：${JSON.stringify($.awardInviteFriendRes)}`); } } else { - console.log('今日未邀请过好友') + that.log('今日未邀请过好友') } } else { - console.log(`查询好友列表失败\n`); + that.log(`查询好友列表失败\n`); } } //给好友浇水 async function doFriendsWater() { await friendListInitForFarm(); - console.log('开始给好友浇水...'); + that.log('开始给好友浇水...'); await taskInitForFarm(); const { waterFriendCountKey, waterFriendMax } = $.farmTask.waterFriendTaskInit; - console.log(`今日已给${waterFriendCountKey}个好友浇水`); + that.log(`今日已给${waterFriendCountKey}个好友浇水`); if (waterFriendCountKey < waterFriendMax) { let needWaterFriends = []; if ($.friendList.friends && $.friendList.friends.length > 0) { @@ -958,44 +882,45 @@ async function doFriendsWater() { } } }); - console.log(`需要浇水的好友列表shareCodes:${JSON.stringify(needWaterFriends)}`); + //TODO ,发现bug,github action运行发现有些账号第一次没有给3个好友浇水 + that.log(`需要浇水的好友列表shareCodes:${JSON.stringify(needWaterFriends)}`); let waterFriendsCount = 0, cardInfoStr = ''; for (let index = 0; index < needWaterFriends.length; index++) { await waterFriendForFarm(needWaterFriends[index]); - console.log(`为第${index + 1}个好友浇水结果:${JSON.stringify($.waterFriendForFarmRes)}\n`) + that.log(`为第${index + 1}个好友浇水结果:${JSON.stringify($.waterFriendForFarmRes)}\n`) if ($.waterFriendForFarmRes.code === '0') { waterFriendsCount++; if ($.waterFriendForFarmRes.cardInfo) { - console.log('为好友浇水获得道具了'); + that.log('为好友浇水获得道具了'); if ($.waterFriendForFarmRes.cardInfo.type === 'beanCard') { - console.log(`获取道具卡:${$.waterFriendForFarmRes.cardInfo.rule}`); + that.log(`获取道具卡:${$.waterFriendForFarmRes.cardInfo.rule}`); cardInfoStr += `水滴换豆卡,`; } else if ($.waterFriendForFarmRes.cardInfo.type === 'fastCard') { - console.log(`获取道具卡:${$.waterFriendForFarmRes.cardInfo.rule}`); + that.log(`获取道具卡:${$.waterFriendForFarmRes.cardInfo.rule}`); cardInfoStr += `快速浇水卡,`; } else if ($.waterFriendForFarmRes.cardInfo.type === 'doubleCard') { - console.log(`获取道具卡:${$.waterFriendForFarmRes.cardInfo.rule}`); + that.log(`获取道具卡:${$.waterFriendForFarmRes.cardInfo.rule}`); cardInfoStr += `水滴翻倍卡,`; } else if ($.waterFriendForFarmRes.cardInfo.type === 'signCard') { - console.log(`获取道具卡:${$.waterFriendForFarmRes.cardInfo.rule}`); + that.log(`获取道具卡:${$.waterFriendForFarmRes.cardInfo.rule}`); cardInfoStr += `加签卡,`; } } } else if ($.waterFriendForFarmRes.code === '11') { - console.log('水滴不够,跳出浇水') + that.log('水滴不够,跳出浇水') } } // message += `【好友浇水】已给${waterFriendsCount}个好友浇水,消耗${waterFriendsCount * 10}g水\n`; - console.log(`【好友浇水】已给${waterFriendsCount}个好友浇水,消耗${waterFriendsCount * 10}g水\n`); + that.log(`【好友浇水】已给${waterFriendsCount}个好友浇水,消耗${waterFriendsCount * 10}g水\n`); if (cardInfoStr && cardInfoStr.length > 0) { // message += `【好友浇水奖励】${cardInfoStr.substr(0, cardInfoStr.length - 1)}\n`; - console.log(`【好友浇水奖励】${cardInfoStr.substr(0, cardInfoStr.length - 1)}\n`); + that.log(`【好友浇水奖励】${cardInfoStr.substr(0, cardInfoStr.length - 1)}\n`); } } else { - console.log('您的好友列表暂无好友,快去邀请您的好友吧!') + that.log('您的好友列表暂无好友,快去邀请您的好友吧!') } } else { - console.log(`今日已为好友浇水量已达${waterFriendMax}个`) + that.log(`今日已为好友浇水量已达${waterFriendMax}个`) } } //领取给3个好友浇水后的奖励水滴 @@ -1005,41 +930,41 @@ async function getWaterFriendGotAward() { if (waterFriendCountKey >= waterFriendMax) { if (!waterFriendGotAward) { await waterFriendGotAwardForFarm(); - console.log(`领取给${waterFriendMax}个好友浇水后的奖励水滴::${JSON.stringify($.waterFriendGotAwardRes)}`) + that.log(`领取给${waterFriendMax}个好友浇水后的奖励水滴::${JSON.stringify($.waterFriendGotAwardRes)}`) if ($.waterFriendGotAwardRes.code === '0') { // message += `【给${waterFriendMax}好友浇水】奖励${$.waterFriendGotAwardRes.addWater}g水滴\n`; - console.log(`【给${waterFriendMax}好友浇水】奖励${$.waterFriendGotAwardRes.addWater}g水滴\n`); + that.log(`【给${waterFriendMax}好友浇水】奖励${$.waterFriendGotAwardRes.addWater}g水滴\n`); } } else { - console.log(`给好友浇水的${waterFriendSendWater}g水滴奖励已领取\n`); + that.log(`给好友浇水的${waterFriendSendWater}g水滴奖励已领取\n`); // message += `【给${waterFriendMax}好友浇水】奖励${waterFriendSendWater}g水滴已领取\n`; } } else { - console.log(`暂未给${waterFriendMax}个好友浇水\n`); + that.log(`暂未给${waterFriendMax}个好友浇水\n`); } } //接收成为对方好友的邀请 async function receiveFriendInvite() { for (let code of newShareCodes) { if (code === $.farmInfo.farmUserPro.shareCode) { - console.log('自己不能邀请自己成为好友噢\n') + that.log('自己不能邀请自己成为好友噢\n') continue } await inviteFriend(code); - // console.log(`接收邀请成为好友结果:${JSON.stringify($.inviteFriendRes)}`) - if ($.inviteFriendRes && $.inviteFriendRes.helpResult && $.inviteFriendRes.helpResult.code === '0') { - console.log(`接收邀请成为好友结果成功,您已成为${$.inviteFriendRes.helpResult.masterUserInfo.nickName}的好友`) - } else if ($.inviteFriendRes && $.inviteFriendRes.helpResult && $.inviteFriendRes.helpResult.code === '17') { - console.log(`接收邀请成为好友结果失败,对方已是您的好友`) + // that.log(`接收邀请成为好友结果:${JSON.stringify($.inviteFriendRes.helpResult)}`) + if ($.inviteFriendRes.helpResult.code === '0') { + that.log(`接收邀请成为好友结果成功,您已成为${$.inviteFriendRes.helpResult.masterUserInfo.nickName}的好友`) + } else if ($.inviteFriendRes.helpResult.code === '17') { + that.log(`接收邀请成为好友结果失败,对方已是您的好友`) } } - // console.log(`开始接受6fbd26cc27ac44d6a7fed34092453f77的邀请\n`) + // that.log(`开始接受6fbd26cc27ac44d6a7fed34092453f77的邀请\n`) // await inviteFriend('6fbd26cc27ac44d6a7fed34092453f77'); - // console.log(`接收邀请成为好友结果:${JSON.stringify($.inviteFriendRes.helpResult)}`) + // that.log(`接收邀请成为好友结果:${JSON.stringify($.inviteFriendRes.helpResult)}`) // if ($.inviteFriendRes.helpResult.code === '0') { - // console.log(`您已成为${$.inviteFriendRes.helpResult.masterUserInfo.nickName}的好友`) + // that.log(`您已成为${$.inviteFriendRes.helpResult.masterUserInfo.nickName}的好友`) // } else if ($.inviteFriendRes.helpResult.code === '17') { - // console.log(`对方已是您的好友`) + // that.log(`对方已是您的好友`) // } } async function duck() { @@ -1048,9 +973,9 @@ async function duck() { await getFullCollectionReward(); if ($.duckRes.code === '0') { if (!$.duckRes.hasLimit) { - console.log(`小鸭子游戏:${$.duckRes.title}`); + that.log(`小鸭子游戏:${$.duckRes.title}`); // if ($.duckRes.type !== 3) { - // console.log(`${$.duckRes.title}`); + // that.log(`${$.duckRes.title}`); // if ($.duckRes.type === 1) { // message += `【小鸭子】为你带回了水滴\n`; // } else if ($.duckRes.type === 2) { @@ -1058,11 +983,11 @@ async function duck() { // } // } } else { - console.log(`${$.duckRes.title}`) + that.log(`${$.duckRes.title}`) break; } } else if ($.duckRes.code === '10') { - console.log(`小鸭子游戏达到上限`) + that.log(`小鸭子游戏达到上限`) break; } } @@ -1075,8 +1000,8 @@ async function getFullCollectionReward() { $.post(taskUrl("getFullCollectionReward", body), (err, resp, data) => { try { if (err) { - console.log('\n东东农场: API查询请求失败 ‼️‼️'); - console.log(JSON.stringify(err)); + that.log('\n动动农场: API查询请求失败 ‼️‼️'); + that.log(JSON.stringify(err)); $.logErr(err); } else { if (safeGet(data)) { @@ -1096,27 +1021,27 @@ async function getFullCollectionReward() { * 领取10次浇水奖励API */ async function totalWaterTaskForFarm() { - const functionId = arguments.callee.name.toString(); + const functionId = 'totalWaterTaskForFarm'; $.totalWaterReward = await request(functionId); } //领取首次浇水奖励API async function firstWaterTaskForFarm() { - const functionId = arguments.callee.name.toString(); + const functionId = 'firstWaterTaskForFarm'; $.firstWaterReward = await request(functionId); } //领取给3个好友浇水后的奖励水滴API async function waterFriendGotAwardForFarm() { - const functionId = arguments.callee.name.toString(); + const functionId = 'waterFriendGotAwardForFarm'; $.waterFriendGotAwardRes = await request(functionId, { "version": 4, "channel": 1 }); } // 查询背包道具卡API async function myCardInfoForFarm() { - const functionId = arguments.callee.name.toString(); + const functionId = 'myCardInfoForFarm'; $.myCardInfoRes = await request(functionId, { "version": 5, "channel": 1 }); } //使用道具卡API async function userMyCardForFarm(cardType) { - const functionId = arguments.callee.name.toString(); + const functionId = 'userMyCardForFarm'; $.userMyCardRes = await request(functionId, { "cardType": cardType }); } /** @@ -1125,39 +1050,39 @@ async function userMyCardForFarm(cardType) { * @returns {Promise} */ async function gotStageAwardForFarm(type) { - $.gotStageAwardForFarmRes = await request(arguments.callee.name.toString(), { 'type': type }); + $.gotStageAwardForFarmRes = await request('gotStageAwardForFarm', { 'type': type }); } //浇水API async function waterGoodForFarm() { await $.wait(1000); - console.log('等待了1秒'); + that.log('等待了1秒'); - const functionId = arguments.callee.name.toString(); + const functionId = 'waterGoodForFarm'; $.waterResult = await request(functionId); } // 初始化集卡抽奖活动数据API async function initForTurntableFarm() { - $.initForTurntableFarmRes = await request(arguments.callee.name.toString(), { version: 4, channel: 1 }); + $.initForTurntableFarmRes = await request('initForTurntableFarm', { version: 4, channel: 1 }); } async function lotteryForTurntableFarm() { await $.wait(2000); - console.log('等待了2秒'); - $.lotteryRes = await request(arguments.callee.name.toString(), { type: 1, version: 4, channel: 1 }); + that.log('等待了2秒'); + $.lotteryRes = await request('lotteryForTurntableFarm', { type: 1, version: 4, channel: 1 }); } async function timingAwardForTurntableFarm() { - $.timingAwardRes = await request(arguments.callee.name.toString(), { version: 4, channel: 1 }); + $.timingAwardRes = await request('timingAwardForTurntableFarm', { version: 4, channel: 1 }); } async function browserForTurntableFarm(type, adId) { if (type === 1) { - console.log('浏览爆品会场'); + that.log('浏览爆品会场'); } if (type === 2) { - console.log('天天抽奖浏览任务领取水滴'); + that.log('天天抽奖浏览任务领取水滴'); } const body = { "type": type, "adId": adId, "version": 4, "channel": 1 }; - $.browserForTurntableFarmRes = await request(arguments.callee.name.toString(), body); + $.browserForTurntableFarmRes = await request('browserForTurntableFarm', body); // 浏览爆品会场8秒 } //天天抽奖浏览任务领取水滴API @@ -1181,12 +1106,12 @@ async function lotteryMasterHelp() { //领取5人助力后的额外奖励API async function masterGotFinishedTaskForFarm() { - const functionId = arguments.callee.name.toString(); + const functionId = 'masterGotFinishedTaskForFarm'; $.masterGotFinished = await request(functionId); } //助力好友信息API async function masterHelpTaskInitForFarm() { - const functionId = arguments.callee.name.toString(); + const functionId = 'masterHelpTaskInitForFarm'; $.masterHelpResult = await request(functionId); } //接受对方邀请,成为对方好友的API @@ -1214,7 +1139,7 @@ async function masterHelp() { * 水滴雨API */ async function waterRainForFarm() { - const functionId = arguments.callee.name.toString(); + const functionId = 'waterRainForFarm'; const body = { "type": 1, "hongBaoTimes": 100, "version": 3 }; $.waterRain = await request(functionId, body); } @@ -1222,19 +1147,19 @@ async function waterRainForFarm() { * 打卡领水API */ async function clockInInitForFarm() { - const functionId = arguments.callee.name.toString(); + const functionId = 'clockInInitForFarm'; $.clockInInit = await request(functionId); } // 连续签到API async function clockInForFarm() { - const functionId = arguments.callee.name.toString(); + const functionId = 'clockInForFarm'; $.clockInForFarmRes = await request(functionId, { "type": 1 }); } //关注，领券等API async function clockInFollowForFarm(id, type, step) { - const functionId = arguments.callee.name.toString(); + const functionId = 'clockInFollowForFarm'; let body = { id, type, @@ -1262,7 +1187,7 @@ async function gotClockInGift() { //定时领水API async function gotThreeMealForFarm() { - const functionId = arguments.callee.name.toString(); + const functionId = 'gotThreeMealForFarm'; $.threeMeal = await request(functionId); } /** @@ -1271,7 +1196,7 @@ async function gotThreeMealForFarm() { * type为1时, 领取浏览任务奖励 */ async function browseAdTaskForFarm(advertId, type) { - const functionId = arguments.callee.name.toString(); + const functionId = 'browseAdTaskForFarm'; if (type === 0) { $.browseResult = await request(functionId, { advertId, type }); } else if (type === 1) { @@ -1280,11 +1205,11 @@ async function browseAdTaskForFarm(advertId, type) { } // 被水滴砸中API async function gotWaterGoalTaskForFarm() { - $.goalResult = await request(arguments.callee.name.toString(), { type: 3 }); + $.goalResult = await request('gotWaterGoalTaskForFarm', { type: 3 }); } //签到API async function signForFarm() { - const functionId = arguments.callee.name.toString(); + const functionId = 'signForFarm'; $.signResult = await request(functionId); } /** @@ -1307,7 +1232,7 @@ async function initForFarm() { "sec-fetch-dest": "empty", "sec-fetch-mode": "cors", "sec-fetch-site": "same-site", - "User-Agent": $.isNode() ? (process.env.JD_USER_AGENT ? process.env.JD_USER_AGENT : (require('./USER_AGENTS').USER_AGENT)) : ($.getdata('JDUA') ? $.getdata('JDUA') : "jdapp;iPhone;9.4.4;14.3;network/4g;Mozilla/5.0 (iPhone; CPU iPhone OS 14_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148;supportJDSHWK/1"), + "User-Agent": $.isNode() ? (process.env.JD_USER_AGENT ? process.env.JD_USER_AGENT : (require('./USER_AGENTS').USER_AGENT)) : ($.getdata('JDUA') ? $.getdata('JDUA') : "jdapp;iPhone;9.2.2;14.2;%E4%BA%AC%E4%B8%9C/9.2.2 CFNetwork/1206 Darwin/20.1.0"), "Content-Type": "application/x-www-form-urlencoded" }, timeout: 10000, @@ -1315,8 +1240,8 @@ async function initForFarm() { $.post(option, (err, resp, data) => { try { if (err) { - console.log('\n东东农场: API查询请求失败 ‼️‼️'); - console.log(JSON.stringify(err)); + that.log('\n动动农场: API查询请求失败 ‼️‼️'); + that.log(JSON.stringify(err)); $.logErr(err); } else { if (safeGet(data)) { @@ -1334,14 +1259,14 @@ async function initForFarm() { // 初始化任务列表API async function taskInitForFarm() { - console.log('\n初始化任务列表') - const functionId = arguments.callee.name.toString(); - $.farmTask = await request(functionId, { "version": 14, "channel": 1, "babelChannel": "120" }); + that.log('\n初始化任务列表') + const functionId = 'taskInitForFarm'; + $.farmTask = await request(functionId); } //获取好友列表API async function friendListInitForFarm() { $.friendList = await request('friendListInitForFarm', { "version": 4, "channel": 1 }); - // console.log('aa', aa); + // that.log('aa', aa); } // 领取邀请好友的奖励API async function awardInviteFriendForFarm() { @@ -1353,18 +1278,18 @@ async function waterFriendForFarm(shareCode) { $.waterFriendForFarmRes = await request('waterFriendForFarm', body); } async function showMsg() { + let ctrTemp; if ($.isNode() && process.env.FRUIT_NOTIFY_CONTROL) { - $.ctrTemp = `${process.env.FRUIT_NOTIFY_CONTROL}` === 'false'; + ctrTemp = `${process.env.FRUIT_NOTIFY_CONTROL}` === 'false'; } else if ($.getdata('jdFruitNotify')) { - $.ctrTemp = $.getdata('jdFruitNotify') === 'false'; + ctrTemp = $.getdata('jdFruitNotify') === 'false'; } else { - $.ctrTemp = `${jdNotify}` === 'false'; + ctrTemp = `${jdNotify}` === 'false'; } - if ($.ctrTemp) { + if (ctrTemp) { $.msg($.name, subTitle, message, option); if ($.isNode()) { - allMessage += `${subTitle}\n${message}${$.index !== cookiesArr.length ? '\n\n' : ''}`; - // await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName || $.UserName}`, `${subTitle}\n${message}`); + await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName}`, `${subTitle}\n${message}`); } } else { $.log(`\n${message}\n`); @@ -1382,14 +1307,14 @@ function timeFormat(time) { } function readShareCode() { return new Promise(async resolve => { - $.get({ url: ``, timeout: 10000 }, (err, resp, data) => { + $.get({ url: `http://jd.turinglabs.net/api/v2/jd/farm/read/${randomCount}/`, timeout: 10000, }, (err, resp, data) => { try { if (err) { - //console.log(`${JSON.stringify(err)}`) - //console.log(`${$.name} API请求失败，请检查网路重试`) + that.log(`${JSON.stringify(err)}`) + that.log(`${$.name} API请求失败，请检查网路重试`) } else { if (data) { - console.log(`随机取个${randomCount}码放到您固定的互助码后面(不影响已有固定互助)`) + that.log(`随机取个${randomCount}码放到您固定的互助码后面(不影响已有固定互助)`) data = JSON.parse(data); } } @@ -1405,12 +1330,12 @@ function readShareCode() { } function shareCodesFormat() { return new Promise(async resolve => { - // console.log(`第${$.index}个京东账号的助力码:::${$.shareCodesArr[$.index - 1]}`) + // that.log(`第${$.index}个动动账号的助力码:::${jdFruitShareArr[$.index - 1]}`) newShareCodes = []; - // if ($.shareCodesArr[$.index - 1]) { - // newShareCodes = $.shareCodesArr[$.index - 1].split('@'); + // if (jdFruitShareArr[$.index - 1]) { + // newShareCodes = jdFruitShareArr[$.index - 1].split('@'); // } else { - // console.log(`由于您第${$.index}个京东账号未提供shareCode,将采纳本脚本自带的助力码\n`) + // that.log(`由于您第${$.index}个动动账号未提供shareCode,将采纳本脚本自带的助力码\n`) // const tempIndex = $.index > shareCodes.length ? (shareCodes.length - 1) : ($.index - 1); // newShareCodes = shareCodes[tempIndex].split('@'); // } @@ -1419,15 +1344,15 @@ function shareCodesFormat() { // // newShareCodes = newShareCodes.concat(readShareCodeRes.data || []); // newShareCodes = [...new Set([...newShareCodes, ...(readShareCodeRes.data || [])])]; // } - console.log(`第${$.index}个京东账号将要助力的好友${JSON.stringify(newShareCodes)}`) + // that.log(`第${$.index}个动动账号将要助力的好友${JSON.stringify(newShareCodes)}`) resolve(); }) } function requireConfig() { return new Promise(resolve => { - console.log('开始获取配置文件\n') + that.log('开始获取配置文件\n') notify = $.isNode() ? require('./sendNotify') : ''; - //Node.js用户请在jdCookie.js处填写京东ck; + //Node.js用户请在jdCookie.js处填写动动ck; const jdCookieNode = $.isNode() ? require('./jdCookie.js') : ''; const jdFruitShareCodes = $.isNode() ? require('./jdFruitShareCodes.js') : ''; //IOS等用户直接用NobyDa的jd cookie @@ -1437,25 +1362,17 @@ function requireConfig() { cookiesArr.push(jdCookieNode[item]) } }) - if (process.env.JD_DEBUG && process.env.JD_DEBUG === 'false') console.log = () => { }; + if (process.env.JD_DEBUG && process.env.JD_DEBUG === 'false') that.log = () => { }; } else { - cookiesArr = [$.getdata('CookieJD'), $.getdata('CookieJD2'), ...jsonParse($.getdata('CookiesJD') || "[]").map(item => item.cookie)].filter(item => !!item); + let cookiesData = $.getdata('CookiesJD') || "[]"; + cookiesData = jsonParse(cookiesData); + cookiesArr = cookiesData.map(item => item.cookie); + cookiesArr.reverse(); + cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); + cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } - console.log(`共${cookiesArr.length}个京东账号\n`) - $.shareCodesArr = []; - if ($.isNode()) { - Object.keys(jdFruitShareCodes).forEach((item) => { - if (jdFruitShareCodes[item]) { - $.shareCodesArr.push(jdFruitShareCodes[item]) - } - }) - } else { - if ($.getdata('jd_fruit_inviter')) $.shareCodesArr = $.getdata('jd_fruit_inviter').split('\n').filter(item => !!item); - console.log(`\nBoxJs设置的${$.name}好友邀请码:${$.getdata('jd_fruit_inviter') ? $.getdata('jd_fruit_inviter') : '暂无'}\n`); - } - // console.log(`$.shareCodesArr::${JSON.stringify($.shareCodesArr)}`) - // console.log(`jdFruitShareArr账号长度::${$.shareCodesArr.length}`) - console.log(`您提供了${$.shareCodesArr.length}个账号的农场助力码\n`); + that.log(`共${cookiesArr.length}个动动账号\n`) resolve() }) } @@ -1471,14 +1388,15 @@ function TotalBean() { "Connection": "keep-alive", "Cookie": cookie, "Referer": "https://wqs.jd.com/my/jingdou/my.shtml?sceneval=2", - "User-Agent": $.isNode() ? (process.env.JD_USER_AGENT ? process.env.JD_USER_AGENT : (require('./USER_AGENTS').USER_AGENT)) : ($.getdata('JDUA') ? $.getdata('JDUA') : "jdapp;iPhone;9.4.4;14.3;network/4g;Mozilla/5.0 (iPhone; CPU iPhone OS 14_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148;supportJDSHWK/1") - } + "User-Agent": $.isNode() ? (process.env.JD_USER_AGENT ? process.env.JD_USER_AGENT : (require('./USER_AGENTS').USER_AGENT)) : ($.getdata('JDUA') ? $.getdata('JDUA') : "jdapp;iPhone;9.2.2;14.2;%E4%BA%AC%E4%B8%9C/9.2.2 CFNetwork/1206 Darwin/20.1.0") + }, + "timeout": 10000, } $.post(options, (err, resp, data) => { try { if (err) { - console.log(`${JSON.stringify(err)}`) - console.log(`${$.name} API请求失败，请检查网路重试`) + that.log(`${JSON.stringify(err)}`) + that.log(`${$.name} API请求失败，请检查网路重试`) } else { if (data) { data = JSON.parse(data); @@ -1486,15 +1404,13 @@ function TotalBean() { $.isLogin = false; //cookie过期 return } - if (data['retcode'] === 0 && data.base && data.base.nickname) { - $.nickName = data.base.nickname; - } + //$.nickName = data['base'].nickname; } else { - console.log(`京东服务器返回空数据`) + that.log(`动动服务器返回空数据`) } } } catch (e) { - $.logErr(e) + $.logErr(e, resp) } finally { resolve(); } @@ -1507,9 +1423,9 @@ function request(function_id, body = {}, timeout = 1000) { $.get(taskUrl(function_id, body), (err, resp, data) => { try { if (err) { - console.log('\n东东农场: API查询请求失败 ‼️‼️') - console.log(JSON.stringify(err)); - console.log(`function_id:${function_id}`) + that.log('\n动动农场: API查询请求失败 ‼️‼️') + that.log(JSON.stringify(err)); + that.log(`function_id:${function_id}`) $.logErr(err); } else { if (safeGet(data)) { @@ -1531,8 +1447,8 @@ function safeGet(data) { return true; } } catch (e) { - console.log(e); - console.log(`京东服务器访问数据为空，请检查自身设备网络情况`); + that.log(e); + that.log(`动动服务器访问数据为空，请检查自身设备网络情况`); return false; } } @@ -1541,7 +1457,7 @@ function taskUrl(function_id, body = {}) { url: `${JD_API_HOST}?functionId=${function_id}&appid=wh5&body=${escape(JSON.stringify(body))}`, headers: { Cookie: cookie, - UserAgent: $.isNode() ? (process.env.JD_USER_AGENT ? process.env.JD_USER_AGENT : (require('./USER_AGENTS').USER_AGENT)) : ($.getdata('JDUA') ? $.getdata('JDUA') : "jdapp;iPhone;9.4.4;14.3;network/4g;Mozilla/5.0 (iPhone; CPU iPhone OS 14_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148;supportJDSHWK/1"), + UserAgent: $.isNode() ? (process.env.JD_USER_AGENT ? process.env.JD_USER_AGENT : (require('./USER_AGENTS').USER_AGENT)) : ($.getdata('JDUA') ? $.getdata('JDUA') : "jdapp;iPhone;9.2.2;14.2;%E4%BA%AC%E4%B8%9C/9.2.2 CFNetwork/1206 Darwin/20.1.0"), }, timeout: 10000, } @@ -1551,14 +1467,12 @@ function jsonParse(str) { try { return JSON.parse(str); } catch (e) { - console.log(e); + that.log(e); $.msg($.name, '', '请勿随意在BoxJs输入框修改内容\n建议通过脚本去获取cookie') return []; } } } -// prettier-ignore -function Env(t, e) { "undefined" != typeof process && JSON.stringify(process.env).indexOf("GITHUB") > -1 && process.exit(0); class s { constructor(t) { this.env = t } send(t, e = "GET") { t = "string" == typeof t ? { url: t } : t; let s = this.get; return "POST" === e && (s = this.post), new Promise((e, i) => { s.call(this, t, (t, s, r) => { t ? i(t) : e(s) }) }) } get(t) { return this.send.call(this.env, t) } post(t) { return this.send.call(this.env, t, "POST") } } return new class { constructor(t, e) { this.name = t, this.http = new s(this), this.data = null, this.dataFile = "box.dat", this.logs = [], this.isMute = !1, this.isNeedRewrite = !1, this.logSeparator = "\n", this.startTime = (new Date).getTime(), Object.assign(this, e), this.log("", `🔔${this.name}, 开始!`) } isNode() { return "undefined" != typeof module && !!module.exports } isQuanX() { return "undefined" != typeof $task } isSurge() { return "undefined" != typeof $httpClient && "undefined" == typeof $loon } isLoon() { return "undefined" != typeof $loon } toObj(t, e = null) { try { return JSON.parse(t) } catch { return e } } toStr(t, e = null) { try { return JSON.stringify(t) } catch { return e } } getjson(t, e) { let s = e; const i = this.getdata(t); if (i) try { s = JSON.parse(this.getdata(t)) } catch { } return s } setjson(t, e) { try { return this.setdata(JSON.stringify(t), e) } catch { return !1 } } getScript(t) { return new Promise(e => { this.get({ url: t }, (t, s, i) => e(i)) }) } runScript(t, e) { return new Promise(s => { let i = this.getdata("@chavy_boxjs_userCfgs.httpapi"); i = i ? i.replace(/\n/g, "").trim() : i; let r = this.getdata("@chavy_boxjs_userCfgs.httpapi_timeout"); r = r ? 1 * r : 20, r = e && e.timeout ? e.timeout : r; const [o, h] = i.split("@"), n = { url: `http://${h}/v1/scripting/evaluate`, body: { script_text: t, mock_type: "cron", timeout: r }, headers: { "X-Key": o, Accept: "*/*" } }; this.post(n, (t, e, i) => s(i)) }).catch(t => this.logErr(t)) } loaddata() { if (!this.isNode()) return {}; { this.fs = this.fs ? this.fs : require("fs"), this.path = this.path ? this.path : require("path"); const t = this.path.resolve(this.dataFile), e = this.path.resolve(process.cwd(), this.dataFile), s = this.fs.existsSync(t), i = !s && this.fs.existsSync(e); if (!s && !i) return {}; { const i = s ? t : e; try { return JSON.parse(this.fs.readFileSync(i)) } catch (t) { return {} } } } } writedata() { if (this.isNode()) { this.fs = this.fs ? this.fs : require("fs"), this.path = this.path ? this.path : require("path"); const t = this.path.resolve(this.dataFile), e = this.path.resolve(process.cwd(), this.dataFile), s = this.fs.existsSync(t), i = !s && this.fs.existsSync(e), r = JSON.stringify(this.data); s ? this.fs.writeFileSync(t, r) : i ? this.fs.writeFileSync(e, r) : this.fs.writeFileSync(t, r) } } lodash_get(t, e, s) { const i = e.replace(/\[(\d+)\]/g, ".$1").split("."); let r = t; for (const t of i) if (r = Object(r)[t], void 0 === r) return s; return r } lodash_set(t, e, s) { return Object(t) !== t ? t : (Array.isArray(e) || (e = e.toString().match(/[^.[\]]+/g) || []), e.slice(0, -1).reduce((t, s, i) => Object(t[s]) === t[s] ? t[s] : t[s] = Math.abs(e[i + 1]) >> 0 == +e[i + 1] ? [] : {}, t)[e[e.length - 1]] = s, t) } getdata(t) { let e = this.getval(t); if (/^@/.test(t)) { const [, s, i] = /^@(.*?)\.(.*?)$/.exec(t), r = s ? this.getval(s) : ""; if (r) try { const t = JSON.parse(r); e = t ? this.lodash_get(t, i, "") : e } catch (t) { e = "" } } return e } setdata(t, e) { let s = !1; if (/^@/.test(e)) { const [, i, r] = /^@(.*?)\.(.*?)$/.exec(e), o = this.getval(i), h = i ? "null" === o ? null : o || "{}" : "{}"; try { const e = JSON.parse(h); this.lodash_set(e, r, t), s = this.setval(JSON.stringify(e), i) } catch (e) { const o = {}; this.lodash_set(o, r, t), s = this.setval(JSON.stringify(o), i) } } else s = this.setval(t, e); return s } getval(t) { return this.isSurge() || this.isLoon() ? $persistentStore.read(t) : this.isQuanX() ? $prefs.valueForKey(t) : this.isNode() ? (this.data = this.loaddata(), this.data[t]) : this.data && this.data[t] || null } setval(t, e) { return this.isSurge() || this.isLoon() ? $persistentStore.write(t, e) : this.isQuanX() ? $prefs.setValueForKey(t, e) : this.isNode() ? (this.data = this.loaddata(), this.data[e] = t, this.writedata(), !0) : this.data && this.data[e] || null } initGotEnv(t) { this.got = this.got ? this.got : require("got"), this.cktough = this.cktough ? this.cktough : require("tough-cookie"), this.ckjar = this.ckjar ? this.ckjar : new this.cktough.CookieJar, t && (t.headers = t.headers ? t.headers : {}, void 0 === t.headers.Cookie && void 0 === t.cookieJar && (t.cookieJar = this.ckjar)) } get(t, e = (() => { })) { t.headers && (delete t.headers["Content-Type"], delete t.headers["Content-Length"]), this.isSurge() || this.isLoon() ? (this.isSurge() && this.isNeedRewrite && (t.headers = t.headers || {}, Object.assign(t.headers, { "X-Surge-Skip-Scripting": !1 })), $httpClient.get(t, (t, s, i) => { !t && s && (s.body = i, s.statusCode = s.status), e(t, s, i) })) : this.isQuanX() ? (this.isNeedRewrite && (t.opts = t.opts || {}, Object.assign(t.opts, { hints: !1 })), $task.fetch(t).then(t => { const { statusCode: s, statusCode: i, headers: r, body: o } = t; e(null, { status: s, statusCode: i, headers: r, body: o }, o) }, t => e(t))) : this.isNode() && (this.initGotEnv(t), this.got(t).on("redirect", (t, e) => { try { if (t.headers["set-cookie"]) { const s = t.headers["set-cookie"].map(this.cktough.Cookie.parse).toString(); s && this.ckjar.setCookieSync(s, null), e.cookieJar = this.ckjar } } catch (t) { this.logErr(t) } }).then(t => { const { statusCode: s, statusCode: i, headers: r, body: o } = t; e(null, { status: s, statusCode: i, headers: r, body: o }, o) }, t => { const { message: s, response: i } = t; e(s, i, i && i.body) })) } post(t, e = (() => { })) { if (t.body && t.headers && !t.headers["Content-Type"] && (t.headers["Content-Type"] = "application/x-www-form-urlencoded"), t.headers && delete t.headers["Content-Length"], this.isSurge() || this.isLoon()) this.isSurge() && this.isNeedRewrite && (t.headers = t.headers || {}, Object.assign(t.headers, { "X-Surge-Skip-Scripting": !1 })), $httpClient.post(t, (t, s, i) => { !t && s && (s.body = i, s.statusCode = s.status), e(t, s, i) }); else if (this.isQuanX()) t.method = "POST", this.isNeedRewrite && (t.opts = t.opts || {}, Object.assign(t.opts, { hints: !1 })), $task.fetch(t).then(t => { const { statusCode: s, statusCode: i, headers: r, body: o } = t; e(null, { status: s, statusCode: i, headers: r, body: o }, o) }, t => e(t)); else if (this.isNode()) { this.initGotEnv(t); const { url: s, ...i } = t; this.got.post(s, i).then(t => { const { statusCode: s, statusCode: i, headers: r, body: o } = t; e(null, { status: s, statusCode: i, headers: r, body: o }, o) }, t => { const { message: s, response: i } = t; e(s, i, i && i.body) }) } } time(t, e = null) { const s = e ? new Date(e) : new Date; let i = { "M+": s.getMonth() + 1, "d+": s.getDate(), "H+": s.getHours(), "m+": s.getMinutes(), "s+": s.getSeconds(), "q+": Math.floor((s.getMonth() + 3) / 3), S: s.getMilliseconds() }; /(y+)/.test(t) && (t = t.replace(RegExp.$1, (s.getFullYear() + "").substr(4 - RegExp.$1.length))); for (let e in i) new RegExp("(" + e + ")").test(t) && (t = t.replace(RegExp.$1, 1 == RegExp.$1.length ? i[e] : ("00" + i[e]).substr(("" + i[e]).length))); return t } msg(e = t, s = "", i = "", r) { const o = t => { if (!t) return t; if ("string" == typeof t) return this.isLoon() ? t : this.isQuanX() ? { "open-url": t } : this.isSurge() ? { url: t } : void 0; if ("object" == typeof t) { if (this.isLoon()) { let e = t.openUrl || t.url || t["open-url"], s = t.mediaUrl || t["media-url"]; return { openUrl: e, mediaUrl: s } } if (this.isQuanX()) { let e = t["open-url"] || t.url || t.openUrl, s = t["media-url"] || t.mediaUrl; return { "open-url": e, "media-url": s } } if (this.isSurge()) { let e = t.url || t.openUrl || t["open-url"]; return { url: e } } } }; if (this.isMute || (this.isSurge() || this.isLoon() ? $notification.post(e, s, i, o(r)) : this.isQuanX() && $notify(e, s, i, o(r))), !this.isMuteLog) { let t = ["", "==============📣系统通知📣=============="]; t.push(e), s && t.push(s), i && t.push(i), console.log(t.join("\n")), this.logs = this.logs.concat(t) } } log(...t) { t.length > 0 && (this.logs = [...this.logs, ...t]), console.log(t.join(this.logSeparator)) } logErr(t, e) { const s = !this.isSurge() && !this.isQuanX() && !this.isLoon(); s ? this.log("", `❗️${this.name}, 错误!`, t.stack) : this.log("", `❗️${this.name}, 错误!`, t) } wait(t) { return new Promise(e => setTimeout(e, t)) } done(t = {}) { const e = (new Date).getTime(), s = (e - this.startTime) / 1e3; this.log("", `🔔${this.name}, 结束! 🕛 ${s} 秒`), this.log(), (this.isSurge() || this.isQuanX() || this.isLoon()) && $done(t) } }(t, e) } diff --git a/src/main/resources/test_trytryOne.js b/src/main/resources/test_trytryOne.js index 883f972..f38e3eb 100644 --- a/src/main/resources/test_trytryOne.js +++ b/src/main/resources/test_trytryOne.js @@ -477,8 +477,8 @@ function try_MyTrials(page, selected) { count++ } if (item.text.text.includes('试用资格将保留10天')) { - message1 = "" + getManName + "\n\n" - message1 = "" + `,你的商品待领取,请尽快领取` + "\n\n" + message1 = "" + `${getManName},` + "\n\n" + message1 = "" + `你的商品待领取,请尽快领取` + "\n\n" message1 += "" + `成功获取：${item.trialName}` + "\n\n" message1 += "" + `剩余时间：${remaining(item.leftTime)}` + "\n\n" postToDingTalk2(message1)