From 085b0fb6a73bab8ced4d73287ddeae6e71de548f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=BF=97=E5=86=9B?= Date: Sat, 13 Nov 2021 15:40:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8A=A9=E5=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/test_bean.js | 41 +++++++++++++++++++------------- src/main/resources/test_fruit.js | 38 +++++++++++++++-------------- src/main/resources/test_pet.js | 20 +++++++++++----- 3 files changed, 58 insertions(+), 41 deletions(-) diff --git a/src/main/resources/test_bean.js b/src/main/resources/test_bean.js index 5712ac2..3a47093 100644 --- a/src/main/resources/test_bean.js +++ b/src/main/resources/test_bean.js @@ -1,3 +1,4 @@ + /* 种豆得豆 脚本更新地址：https://raw.githubusercontent.com/Aaron-lv/sync/jd_scripts/jd_plantBean.js 更新时间：2021-04-9 @@ -96,9 +97,20 @@ let num; await jdPlantBean(); await showMsg(); } + message += "----\n\n" } + that.log(message) + postToDingTalk(message) + date = new Date() + if (date.getDay() == postDay && date.getHours() == postTime) { + postToDingTalk1(message) + } + + message= "" + message += "[通知] 种豆得豆 \n\n --- \n\n" + //开始互助 for (let i = 0; i < cookiesArr.length; i++) { if (cookiesArr[i]) { @@ -154,13 +166,7 @@ let num; message += " " + `❌ ${$.name}, 失败! 原因: ${e}!` + "\n\n" $.log('', `❌ ${$.name}, 失败! 原因: ${e}!`, '') }).finally(() => { - that.log(message) postToDingTalk(message) - date = new Date() - if (date.getDay() == postDay && date.getHours() == postTime) { - postToDingTalk1(message) - } - $.done(); }) @@ -489,6 +495,7 @@ async function doHelp() { if ($.helpResult.data.helpShareRes) { if ($.helpResult.data.helpShareRes.state === '1') { console.log(`助力好友${plantUuid}成功`) + message = message + " "+ `助力好友${plantUuid}成功` +" \n\n " console.log(`${$.helpResult.data.helpShareRes.promptText}\n`); } else if ($.helpResult.data.helpShareRes.state === '2') { console.log('您今日助力的机会已耗尽，已不能再帮助好友助力了\n'); @@ -669,17 +676,17 @@ function requireConfig() { cookiesArr = [$.getdata('CookieJD'), $.getdata('CookieJD2'), ...jsonParse($.getdata('CookiesJD') || "[]").map(item => item.cookie)].filter(item => !!item); } console.log(`共${cookiesArr.length}个动动账号\n`) - $.shareCodesArr = []; - if ($.isNode()) { - Object.keys(jdPlantBeanShareCodes).forEach((item) => { - if (jdPlantBeanShareCodes[item]) { - $.shareCodesArr.push(jdPlantBeanShareCodes[item]) - } - }) - } else { - if ($.getdata('jd_plantbean_inviter')) $.shareCodesArr = $.getdata('jd_plantbean_inviter').split('\n').filter(item => !!item); - console.log(`\nBoxJs设置的${$.name}好友邀请码:${$.getdata('jd_plantbean_inviter') ? $.getdata('jd_plantbean_inviter') : '暂无'}\n`); - } + // $.shareCodesArr = []; + // if ($.isNode()) { + // Object.keys(jdPlantBeanShareCodes).forEach((item) => { + // if (jdPlantBeanShareCodes[item]) { + // $.shareCodesArr.push(jdPlantBeanShareCodes[item]) + // } + // }) + // } else { + // if ($.getdata('jd_plantbean_inviter')) $.shareCodesArr = $.getdata('jd_plantbean_inviter').split('\n').filter(item => !!item); + // console.log(`\nBoxJs设置的${$.name}好友邀请码:${$.getdata('jd_plantbean_inviter') ? $.getdata('jd_plantbean_inviter') : '暂无'}\n`); + // } // console.log(`\n种豆得豆助力码::${JSON.stringify($.shareCodesArr)}`); console.log(`您提供了${$.shareCodesArr.length}个账号的种豆得豆助力码\n`); resolve() diff --git a/src/main/resources/test_fruit.js b/src/main/resources/test_fruit.js index 5fefa0e..8ba621c 100644 --- a/src/main/resources/test_fruit.js +++ b/src/main/resources/test_fruit.js @@ -1,4 +1,5 @@ -let cookiesArr = [], cookie = '', jdFruitShareArr = [], isBox = false, notify, newShareCodes; +let cookiesArr = [], cookie = '', jdFruitShareArr = [], isBox = false, notify; +let newShareCodes = []; //助力好友分享码(最多4个,否则后面的助力失败),原因:动动农场每人每天只有四次助力机会 //此此内容是IOS用户下载脚本到本地使用，填写互助码的地方，同一动动账号的好友互助码请使用@符号隔开。 //下面给出两个账号的填写示例（iOS只支持2个动动账号） @@ -72,25 +73,25 @@ const urlSchema = `openjd://virtual?params=%7B%20%22category%22:%20%22jump%22,%2 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`); + 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 } - continue - } - await masterHelpShare();//助力好友 - //互助 账号内部互助 + await masterHelpShare();//助力好友 + //互助 账号内部互助 } - } + } })() @@ -730,6 +731,7 @@ async function masterHelpShare() { if ($.helpResult.helpResult.code === '0') { //助力成功 salveHelpAddWater += $.helpResult.helpResult.salveHelpAddWater; + message += "" + `【助力好友结果】: 已成功给【${$.helpResult.helpResult.masterUserInfo.nickName}】助力` + " \n\n " that.log(`【助力好友结果】: 已成功给【${$.helpResult.helpResult.masterUserInfo.nickName}】助力`); that.log(`给好友【${$.helpResult.helpResult.masterUserInfo.nickName}】助力获得${$.helpResult.helpResult.salveHelpAddWater}g水滴`) helpSuccessPeoples += ($.helpResult.helpResult.masterUserInfo.nickName || '匿名用户') + ','; diff --git a/src/main/resources/test_pet.js b/src/main/resources/test_pet.js index b8e3400..dc6a111 100644 --- a/src/main/resources/test_pet.js +++ b/src/main/resources/test_pet.js @@ -1,9 +1,10 @@ -let cookiesArr = [], cookie = '', jdPetShareArr = [], isBox = false, notify, newShareCodes, allMessage = ''; +let cookiesArr = [], cookie = '', jdPetShareArr = [], isBox = false, notify, allMessage = ''; //助力好友分享码(最多5个,否则后面的助力失败),原因:动动农场每人每天只有四次助力机会 //此此内容是IOS用户下载脚本到本地使用，填写互助码的地方，同一动动账号的好友互助码请使用@符号隔开。 //下面给出两个账号的填写示例（iOS只支持2个动动账号） let shareCodes = [ // IOS本地脚本用户这个列表填入你要助力的好友的shareCode ] +let newShareCodes = [] let message = "", subTitle = '', option = {}; let jdNotify = false;//是否关闭通知，false打开通知推送，true关闭通知推送 const JD_API_HOST = 'https://api.m.jd.com/client.action'; @@ -60,6 +61,12 @@ let postAddress = "https://oapi.dingtalk.com/robot/send?access_token=d2b6042cb38 message += "----\n\n" } + + that.log(message) + postToDingTalk(message) + message = "" + message += "[通知] 动动萌宠 \n\n --- \n\n" + for (let i = 0; i < cookiesArr.length; i++) { if (cookiesArr[i]) { await $.wait(5000); @@ -84,6 +91,8 @@ let postAddress = "https://oapi.dingtalk.com/robot/send?access_token=d2b6042cb38 if ($.isNode()) await notify.sendNotify(`${$.name}`, errMsg); $.msg($.name, '', `动动账号${$.index} ${$.nickName || $.UserName}\n${errMsg}`) } + + message += "----\n\n" } } @@ -93,7 +102,6 @@ let postAddress = "https://oapi.dingtalk.com/robot/send?access_token=d2b6042cb38 $.log('', `❌ ${$.name}, 失败! 原因: ${e}!`, '') }) .finally(() => { - message += getPic() postToDingTalk(message) taht.log(message) $.done(); @@ -108,7 +116,7 @@ async function jdPet() { $.petInfo = initPetTownRes.result; if ($.petInfo.userStatus === 0) { // $.msg($.name, '', `【提示】动动账号${$.index}${$.nickName}\n萌宠活动未开启\n请手动去动动APP开启活动\n入口：我的->游戏与互动->查看更多开启`, { "open-url": "openapp.jdmoble://" }); - await slaveHelp();//助力好友 + // await slaveHelp();//助力好友 message = message + "" + "动动萌宠未开启\n请手动去动动APP开启活动\n入口：我的->游戏与互动->查看更多开启\n\n" $.log($.name, '', `【提示】动动账号${$.index}${$.nickName}\n萌宠活动未开启\n请手动去动动APP开启活动\n入口：我的->游戏与互动->查看更多开启`); return @@ -123,7 +131,7 @@ async function jdPet() { // option['media-url'] = goodsUrl; // that.log(`初始化萌宠信息完成: ${JSON.stringify(petInfo)}`); if ($.petInfo.petStatus === 5) { - await slaveHelp();//可以兑换而没有去兑换,也能继续助力好友 + // await slaveHelp();//可以兑换而没有去兑换,也能继续助力好友 option['open-url'] = "openApp.jdMobile://"; message = message + "" + `【提醒⏰】${$.petInfo.goodsInfo.goodsName}已可领取`, '请去动动APP或微信小程序查看' + "\n\n" $.msg($.name, `【提醒⏰】${$.petInfo.goodsInfo.goodsName}已可领取`, '请去动动APP或微信小程序查看', option); @@ -132,7 +140,7 @@ async function jdPet() { } return } else if ($.petInfo.petStatus === 6) { - await slaveHelp();//已领取红包,但未领养新的,也能继续助力好友 + // await slaveHelp();//已领取红包,但未领养新的,也能继续助力好友 option['open-url'] = "openApp.jdMobile://"; message = message + "" + `【提醒⏰】已领取红包,但未继续领养新的物品`, '请去动动APP或微信小程序继续领养' + "\n\n" $.msg($.name, `【提醒⏰】已领取红包,但未继续领养新的物品`, '请去动动APP或微信小程序继续领养', option); @@ -151,7 +159,7 @@ async function jdPet() { $.taskInfo = $.taskInit.result; await petSport();//遛弯 - await slaveHelp();//助力好友 + // await slaveHelp();//助力好友 await masterHelpInit();//获取助力的信息 await doTask();//做日常任务 await feedPetsAgain();//再次投食