|
|
@@ -196,14 +196,22 @@ function getLoginData(url){
|
|
|
let returnUrl = getFieldFromText(`returnUrl= '(.+?)'`, htmlText);
|
|
|
let paramId = getFieldFromText(`paramId = "(.+?)"`, htmlText);
|
|
|
let j_rsakey = getFieldFromText(`j_rsaKey" value="(.+?)"`, htmlText);
|
|
|
+ let REQID = getFieldFromText(`&REQID=(.+?)&`, htmlText);
|
|
|
let retData = {
|
|
|
captchaToken: captchaToken,
|
|
|
lt: lt,
|
|
|
returnUrl: returnUrl,
|
|
|
paramId: paramId,
|
|
|
j_rsakey: j_rsakey,
|
|
|
+ REQID: REQID,
|
|
|
};
|
|
|
- magicJS.logger.log(JSON.stringify(resp.headers));
|
|
|
+ let cookieData = MagicJS3.parseSetCookies(resp.headers['Set-Cookie'] || '');
|
|
|
+ if(cookieData){
|
|
|
+ retData.pageOp = cookieData.pageOp;
|
|
|
+ retData.QRCODE = cookieData.QRCODE;
|
|
|
+ }
|
|
|
+ magicJS.logger.log(JSON.stringify(cookieData));
|
|
|
+
|
|
|
magicJS.logger.log(JSON.stringify(htmlText));
|
|
|
|
|
|
magicJS.logger.log(JSON.stringify(retData));
|
|
|
@@ -511,7 +519,7 @@ async function checkWapLogin(username, password, extData){
|
|
|
state: '',
|
|
|
paramId: extData.paramId,
|
|
|
lt: extData.lt,
|
|
|
- REQID: generateRandomHex(16),
|
|
|
+ REQID: extData.REQID || generateRandomHex(16),
|
|
|
callbackMsg: 'callbackMsg',
|
|
|
};
|
|
|
let cookieData = {
|
|
|
@@ -522,8 +530,8 @@ async function checkWapLogin(username, password, extData){
|
|
|
"wnormal.client.static.version": "2.88",
|
|
|
"wnormal.visited": "true",
|
|
|
//以下几个动态生成的
|
|
|
- "QRCODE": "6de2c8af4e5fc710c",
|
|
|
- "pageOp": "bccb4530a4fa22f234b7a3d30a0791c6",
|
|
|
+ "QRCODE": extData.QRCODE,
|
|
|
+ "pageOp": extData.pageOp,
|
|
|
"JSESSIONID": "aaapv0b8Wd4vJaKLOYg6y",
|
|
|
}
|
|
|
let body = magicJS.objToQueryStr(reqData,true);
|