Revert "update"

This reverts commit aa7dc67716cdd9655a4452b78403465035189c97.
This commit is contained in:
lxk0301
2021-03-11 10:09:03 +08:00
parent 46d7bf20ac
commit 58c7f89c25
2 changed files with 21 additions and 24 deletions

View File

@@ -115,7 +115,7 @@ if [ $ENABLE_AUTO_HELP = "true" ]; then
echo "开启自动助力" echo "开启自动助力"
#在所有脚本执行前,先执行助力码导出 #在所有脚本执行前,先执行助力码导出
sed -i 's/node/ . \/scripts\/docker\/auto_help.sh export >> \/scripts\/logs\/auto_help_export.log \&\& node /g' ${mergedListFile} sed -i 's/node/ . \/scripts\/docker\/auto_help.sh export \&\& node /g' ${mergedListFile}
else else
echo "未开启自动助力" echo "未开启自动助力"
fi fi

View File

@@ -141,46 +141,43 @@ async function bean() {
function TotalBean() { function TotalBean() {
return new Promise(async resolve => { return new Promise(async resolve => {
const options = { const options = {
"url": `https://wq.jd.com/user/info/QueryJDUserInfo?sceneval=2`, url: "https://me-api.jd.com/user_new/info/GetJDUserInfoUnion",
"headers": { headers: {
"Accept": "application/json,text/plain, */*", Host: "me-api.jd.com",
"Content-Type": "application/x-www-form-urlencoded", Accept: "*/*",
"Accept-Encoding": "gzip, deflate, br", Connection: "keep-alive",
Cookie: cookie,
"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"),
"Accept-Language": "zh-cn", "Accept-Language": "zh-cn",
"Connection": "keep-alive", "Referer": "https://home.m.jd.com/myJd/newhome.action?sceneval=2&ufc=&",
"Cookie": cookie, "Accept-Encoding": "gzip, deflate, br"
"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.2.2;14.2;%E4%BA%AC%E4%B8%9C/9.2.2 CFNetwork/1206 Darwin/20.1.0")
} }
} }
$.post(options, (err, resp, data) => { $.get(options, (err, resp, data) => {
try { try {
if (err) { if (err) {
console.log(`${JSON.stringify(err)}`) $.logErr(err)
console.log(`${$.name} API请求失败请检查网路重试`)
} else { } else {
if (data) { if (data) {
data = JSON.parse(data); data = JSON.parse(data);
if (data['retcode'] === 13) { if (data['retcode'] === "1001") {
$.isLogin = false; //cookie过期 $.isLogin = false; //cookie过期
return return;
} }
if (data['retcode'] === 0) { if (data['retcode'] === "0" && data.data && data.data.hasOwnProperty("userInfo")) {
$.nickName = (data['base'] && data['base'].nickname) || $.UserName; $.nickName = data.data.userInfo.baseInfo.nickname;
} else {
$.nickName = $.UserName
} }
if (data['retcode'] === 0) { if (data['retcode'] === '0' && data.data && data.data['assetInfo']) {
$.beanCount = data['base'].jdNum; $.beanCount = data.data && data.data['assetInfo']['beanNum'];
} }
} else { } else {
console.log(`京东服务器返回空数据`) $.log('京东服务器返回空数据');
} }
} }
} catch (e) { } catch (e) {
$.logErr(e, resp) $.logErr(e)
} finally { } finally {
resolve(data); resolve();
} }
}) })
}) })