|
|
@@ -143,7 +143,9 @@ async function getLoginAccoutUrlInfo(url){
|
|
|
let urlMatch = htmlText.match(/<a id="j-tab-login-link"[^>]*href="([^"]+)"/); // 正则表达式匹配
|
|
|
magicJS.logger.info(`urlMatch=${JSON.stringify(urlMatch)}`);
|
|
|
if(urlMatch){
|
|
|
+ magicJS.logger.info(`test#0`);
|
|
|
let cookieData = magicJS.parseSetCookies(resp.headers['Set-Cookie'] || '');
|
|
|
+ magicJS.logger.info(`test#1`);
|
|
|
let cookieDict = {};
|
|
|
for(let i=0; i < cookieData.length; i++){
|
|
|
let info = cookieData[i];
|
|
|
@@ -152,16 +154,14 @@ async function getLoginAccoutUrlInfo(url){
|
|
|
if(value == ''){
|
|
|
continue;
|
|
|
}
|
|
|
- if(name == 'pageOp' || name == 'QRCODE'){
|
|
|
- cookieDict[name] = value;
|
|
|
- }
|
|
|
+ cookieDict[name] = value;
|
|
|
}
|
|
|
- magicJS.logger.info(`urlMatch=${JSON.stringify(cookieDict)}`);
|
|
|
resolve({url: urlMatch[1], cookie: cookieDict});
|
|
|
}else{
|
|
|
resolve();
|
|
|
}
|
|
|
} catch (err) {
|
|
|
+ magicJS.logger.error(err);
|
|
|
resolve();
|
|
|
}
|
|
|
}).catch(err => {
|