diff --git a/activity/jd_818.js b/activity/jd_818.js index 58929fa..db221c9 100644 --- a/activity/jd_818.js +++ b/activity/jd_818.js @@ -832,7 +832,7 @@ function getListRank() { }) }) } -function updateShareCodes(url = 'https://raw.githubusercontent.com/lxk0301/updateTeam/master/jd_shareCodes.json') { +function updateShareCodes(url = 'https://raw.githubusercontent.com/LXK9301/updateTeam/master/jd_shareCodes.json') { return new Promise(resolve => { //https://cdn.jsdelivr.net/gh/lxk0301/updateTeam@master/jd_shareCodes.json //https://raw.githubusercontent.com/lxk0301/updateTeam/master/jd_shareCodes.json diff --git a/jd_dreamFactory.js b/jd_dreamFactory.js index 70be799..b1b4594 100644 --- a/jd_dreamFactory.js +++ b/jd_dreamFactory.js @@ -1186,7 +1186,7 @@ function tuanAward(activeId, tuanId, isTuanLeader = true) { }) }) } -function updateTuanIds(url = 'https://raw.githubusercontent.com/lxk0301/updateTeam/master/jd_updateFactoryTuanId.json') { +function updateTuanIds(url = 'https://raw.githubusercontent.com/LXK9301/updateTeam/master/jd_updateFactoryTuanId.json') { return new Promise(resolve => { $.get({url}, (err, resp, data) => { try { @@ -1203,7 +1203,7 @@ function updateTuanIds(url = 'https://raw.githubusercontent.com/lxk0301/updateTe }) }) } -function updateTuanIdsCDN(url = 'https://raw.fastgit.org/lxk0301/updateTeam/master/jd_updateFactoryTuanId.json') { +function updateTuanIdsCDN(url) { return new Promise(async resolve => { $.get({url, headers:{ @@ -1345,7 +1345,7 @@ function requireConfig() { return new Promise(async resolve => { await updateTuanIdsCDN('https://gitee.com/lxk0301/updateTeam/raw/master/jd_updateFactoryTuanId.json'); if (!$.tuanIdS) await updateTuanIds(); - if (!$.tuanIdS) await updateTuanIdsCDN('https://cdn.jsdelivr.net/gh/lxk0301/updateTeam@master/jd_updateFactoryTuanId.json'); + if (!$.tuanIdS) await updateTuanIdsCDN('https://cdn.jsdelivr.net/gh/LXK9301/updateTeam@master/jd_updateFactoryTuanId.json'); if ($.tuanIdS && $.tuanIdS.tuanActiveId) { tuanActiveId = $.tuanIdS.tuanActiveId; } diff --git a/jd_small_home.js b/jd_small_home.js index ae51ac2..92ae930 100644 --- a/jd_small_home.js +++ b/jd_small_home.js @@ -786,7 +786,7 @@ function login(userName) { }) }) } -function updateInviteCode(url = 'https://raw.githubusercontent.com/lxk0301/updateTeam/master/jd_updateSmallHomeInviteCode.json') { +function updateInviteCode(url = 'https://raw.githubusercontent.com/LXK9301/updateTeam/master/jd_updateSmallHomeInviteCode.json') { return new Promise(resolve => { $.get({url}, async (err, resp, data) => { try { @@ -803,7 +803,7 @@ function updateInviteCode(url = 'https://raw.githubusercontent.com/lxk0301/updat }) }) } -function updateInviteCodeCDN(url = 'https://raw.fastgit.org/lxk0301/updateTeam/master/jd_updateSmallHomeInviteCode.json') { +function updateInviteCodeCDN(url) { return new Promise(async resolve => { $.get({url}, async (err, resp, data) => { try { diff --git a/jd_superMarket.js b/jd_superMarket.js index 471c63d..ce73db4 100644 --- a/jd_superMarket.js +++ b/jd_superMarket.js @@ -314,7 +314,7 @@ async function businessCircleActivity() { console.log(`\n注:PK会在每天的七点自动随机加入lxk0301创建的队伍\n`) await updatePkActivityId(); if (!$.updatePkActivityIdRes) await updatePkActivityIdCDN('https://gitee.com/lxk0301/updateTeam/raw/master/jd_updateTeam.json'); - if (!$.updatePkActivityIdRes) await updatePkActivityIdCDN('https://cdn.jsdelivr.net/gh/lxk0301/updateTeam@master/jd_updateTeam.json'); + if (!$.updatePkActivityIdRes) await updatePkActivityIdCDN('https://cdn.jsdelivr.net/gh/LXK9301/updateTeam@master/jd_updateTeam.json'); console.log(`\nupdatePkActivityId[pkActivityId]:::${$.updatePkActivityIdRes.pkActivityId}`); console.log(`\n京东服务器返回的[pkActivityId] ${pkActivityId}`); if ($.updatePkActivityIdRes && ($.updatePkActivityIdRes.pkActivityId === pkActivityId)) { @@ -844,10 +844,8 @@ function smtg_sellMerchandise(body) { }) } //新版东东超市 -function updatePkActivityId(url = 'https://raw.githubusercontent.com/lxk0301/updateTeam/master/jd_updateTeam.json') { +function updatePkActivityId(url = 'https://raw.githubusercontent.com/LXK9301/updateTeam/master/jd_updateTeam.json') { return new Promise(resolve => { - //https://cdn.jsdelivr.net/gh/lxk0301/updateTeam@master/jd_updateTeam.json - //https://raw.githubusercontent.com/lxk0301/updateTeam/master/jd_updateTeam.json $.get({url}, async (err, resp, data) => { try { if (err) { @@ -864,10 +862,8 @@ function updatePkActivityId(url = 'https://raw.githubusercontent.com/lxk0301/upd }) }) } -function updatePkActivityIdCDN(url = 'https://raw.fastgit.org/lxk0301/updateTeam/master/jd_updateTeam.json') { +function updatePkActivityIdCDN(url) { return new Promise(async resolve => { - //https://cdn.jsdelivr.net/gh/lxk0301/updateTeam@master/jd_updateTeam.json - //https://raw.githubusercontent.com/lxk0301/updateTeam/master/jd_updateTeam.json const 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" } diff --git a/package-lock.json b/package-lock.json index e8928fd..37dac32 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1145,6 +1145,11 @@ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" }, + "qrcode-terminal": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz", + "integrity": "sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ==" + }, "qs": { "version": "6.9.4", "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz", @@ -1376,6 +1381,11 @@ "escape-string-regexp": "^1.0.2" } }, + "tunnel": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz", + "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==" + }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",