|
|
@@ -356,11 +356,8 @@ function login(username, password){
|
|
|
return;
|
|
|
}
|
|
|
let loginData = await checkLogin(username, password, extData);
|
|
|
- magicJS.logger.error('login##0');
|
|
|
if(loginData && loginData.result == 0){
|
|
|
- magicJS.logger.error('login##1');
|
|
|
await tryJumpToUrl(loginData.toUrl);
|
|
|
- magicJS.logger.error('login##2');
|
|
|
resolve(extData);
|
|
|
}else{
|
|
|
resolve(null);
|
|
|
@@ -459,13 +456,13 @@ async function lotteryDraw(url, lt){
|
|
|
magicJS.http.get(options).then(resp => {
|
|
|
try {
|
|
|
const rspData = resp.body;
|
|
|
- magicJS.logger.info(`签到数据:${JSON.stringify(rspData)}`);
|
|
|
+ magicJS.logger.info(`抽奖数据:${JSON.stringify(rspData)}`);
|
|
|
resolve(rspData);
|
|
|
} catch (err) {
|
|
|
resolve();
|
|
|
}
|
|
|
}).catch(err => {
|
|
|
- const msg = `签到异常\n${JSON.stringify(err)}`;
|
|
|
+ const msg = `抽奖异常\n${JSON.stringify(err)}`;
|
|
|
magicJS.logger.error(msg);
|
|
|
reject(msg);
|
|
|
});
|