From 58391846f28ed13a21ebdc6df2a544806b9fcef3 Mon Sep 17 00:00:00 2001 From: Faker Date: Mon, 14 Mar 2022 11:12:48 +0800 Subject: [PATCH] sync --- jd_bean_sign.js | 10 +--- jd_jrmx.py | 10 +--- jd_nzmh.js | 22 --------- utils/.DS_Store | Bin 6148 -> 0 bytes utils/JD_DailyBonus.js | 106 ++++++++++++++++++++--------------------- utils/jdcookie.js | 41 ++++++++++++++-- 6 files changed, 91 insertions(+), 98 deletions(-) delete mode 100644 utils/.DS_Store diff --git a/jd_bean_sign.js b/jd_bean_sign.js index f2070b8..469f3a3 100644 --- a/jd_bean_sign.js +++ b/jd_bean_sign.js @@ -2063,12 +2063,4 @@ function nobyda() { }; }).catch(e => { console.error("ERRROR:",e) -<<<<<<< Updated upstream -<<<<<<< Updated upstream -}) -======= -}) ->>>>>>> Stashed changes -======= -}) ->>>>>>> Stashed changes +}) \ No newline at end of file diff --git a/jd_jrmx.py b/jd_jrmx.py index 687ee9e..718d21e 100644 --- a/jd_jrmx.py +++ b/jd_jrmx.py @@ -270,12 +270,4 @@ if __name__ == '__main__': eid=json.loads(geteid(info[1],info[2]).split('_*')[1])['eid'] fp=info[0] token=gettoken() -<<<<<<< Updated upstream -<<<<<<< Updated upstream - assist(ck,eid,fp,token,inviteinfo.split('@')[0],inviteinfo.split('@')[1]) -======= - assist(ck,eid,fp,token,inviteinfo.split('@')[0],inviteinfo.split('@')[1]) ->>>>>>> Stashed changes -======= - assist(ck,eid,fp,token,inviteinfo.split('@')[0],inviteinfo.split('@')[1]) ->>>>>>> Stashed changes + assist(ck,eid,fp,token,inviteinfo.split('@')[0],inviteinfo.split('@')[1]) \ No newline at end of file diff --git a/jd_nzmh.js b/jd_nzmh.js index 2b381fe..733b18a 100644 --- a/jd_nzmh.js +++ b/jd_nzmh.js @@ -8,24 +8,6 @@ ============Quantumultx=============== [task_local] #女装盲盒 -<<<<<<< Updated upstream -<<<<<<< Updated upstream -35 1,23 * * * https://raw.githubusercontent.com/Aaron-lv/sync/jd_scripts/jd_nzmh.js, tag=女装盲盒, img-url=https://raw.githubusercontent.com/Orz-3/mini/master/Color/jd.png, enabled=true -======= -35 1,23 * * * https://raw.githubusercontent.com/222222/sync/jd_scripts/jd_nzmh.js, tag=女装盲盒, img-url=https://raw.githubusercontent.com/Orz-3/mini/master/Color/jd.png, enabled=true ->>>>>>> Stashed changes - -================Loon============== -[Script] -cron "35 1,23 * * *" script-path=https://raw.githubusercontent.com/222222/sync/jd_scripts/jd_nzmh.js,tag=女装盲盒 - -===============Surge================= -女装盲盒 = type=cron,cronexp="35 1,23 * * *",wake-system=1,timeout=3600,script-path=https://raw.githubusercontent.com/222222/sync/jd_scripts/jd_nzmh.js - -============小火箭========= -<<<<<<< Updated upstream -女装盲盒 = type=cron,script-path=https://raw.githubusercontent.com/Aaron-lv/sync/jd_scripts/jd_nzmh.js, cronexpr="35 1,23 * * *", timeout=3600, enable=true -======= 35 1,23 * * * https://raw.githubusercontent.com/222222/sync/jd_scripts/jd_nzmh.js, tag=女装盲盒, img-url=https://raw.githubusercontent.com/Orz-3/mini/master/Color/jd.png, enabled=true ================Loon============== @@ -37,10 +19,6 @@ cron "35 1,23 * * *" script-path=https://raw.githubusercontent.com/222222/sync/j ============小火箭========= 女装盲盒 = type=cron,script-path=https://raw.githubusercontent.com/222222/sync/jd_scripts/jd_nzmh.js, cronexpr="35 1,23 * * *", timeout=3600, enable=true ->>>>>>> Stashed changes -======= -女装盲盒 = type=cron,script-path=https://raw.githubusercontent.com/222222/sync/jd_scripts/jd_nzmh.js, cronexpr="35 1,23 * * *", timeout=3600, enable=true ->>>>>>> Stashed changes */ const $ = new Env('女装盲盒抽京豆'); const notify = $.isNode() ? require('./sendNotify') : ''; diff --git a/utils/.DS_Store b/utils/.DS_Store deleted file mode 100644 index ff78b20aac0803a1a0b9cd117961fbd972197259..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%Sr<=6g|-{DsH-TnJ;kg4~B6>1d&3~txnsiwrVT$Sh$-{_uQK(7RRj&as$b^ z?<5B%nE-HEyF3FX0LJWsPK2H&=3du93>I`+V~t0gVuSjv=_xcsldSy+3+%AP3g6a0 zzi#WMqBp|~@2JtB#48fqG4=&5<&xF}ISTp;O1IQYRBA0)tD@}+Q=Aj0)OKX1@220#)l^V~~SF~?6a;+;%eqH5FTxHK5hDf)q$rvyOi~(a{01WWXmNq^P zXrnP;3>X7n49NN5*#*;xT|hlLIOr3AIHFk_WqC_Tj*pl|>;lrm=0Yklq`LUTa3P&` zALG)9UBHkIr!%uoocZ(d;&gV}y@tc30c|t}jDdXy4ud+8`~QNUOz$IqKgBd-z!>;v z47gD~%QJ2&-mO2jCwHx9e_)p;ah(Wkl=prDsK_~TqR!y=A~P -1) { + console.log(`您的cookie选择的是用&隔开\n`) + CookieJDs = process.env.JD_COOKIE.split('&'); + } else if (process.env.JD_COOKIE.indexOf('\n') > -1) { + console.log(`您的cookie选择的是用换行隔开\n`) + CookieJDs = process.env.JD_COOKIE.split('\n'); + } else { + CookieJDs = [process.env.JD_COOKIE]; + } +} +/* +if (JSON.stringify(process.env).indexOf('GITHUB')>-1) { + console.log(`请勿使用github action运行此脚本,无论你是从你自己的私库还是其他哪里拉取的源代码，都会导致我被封号\n`); + !(async () => { + // await require('./sendNotify').sendNotify('提醒', `请勿使用github action、滥用github资源会封我仓库以及账号`) + // await process.exit(0); + })() +} +*/ +CookieJDs = [...new Set(CookieJDs.filter(item => !!item))] +console.log(`\n====================共有${CookieJDs.length}个京东账号Cookie=========\n`); +console.log(`==================脚本执行- 北京时间(UTC+8)：${new Date(new Date().getTime() + new Date().getTimezoneOffset()*60*1000 + 8*60*60*1000).toLocaleString()}=====================\n`) +if (process.env.JD_DEBUG && process.env.JD_DEBUG === 'false') console.log = () => {}; +for (let i = 0; i < CookieJDs.length; i++) { + const index = (i + 1 === 1) ? '' : (i + 1); + exports['CookieJD' + index] = CookieJDs[i].trim(); }