|
@@ -218,7 +218,7 @@ function rsaEncode(j_rsakey, text) {
|
|
|
let crypt = new JSEncrypt();
|
|
let crypt = new JSEncrypt();
|
|
|
crypt.setPublicKey(j_rsakey);
|
|
crypt.setPublicKey(j_rsakey);
|
|
|
let md5 = createWMd5();
|
|
let md5 = createWMd5();
|
|
|
- return crypt.encrypt(md5.hex_md5_32Upper(text));
|
|
|
|
|
|
|
+ return b64tohex(crypt.encrypt(md5.hex_md5_32Upper(text)));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
async function login(username, password){
|
|
async function login(username, password){
|
|
@@ -237,12 +237,12 @@ async function login(username, password){
|
|
|
password = rsaEncode(extData.j_rsakey, password);
|
|
password = rsaEncode(extData.j_rsakey, password);
|
|
|
magicJS.logger.info(`username:${username}`);
|
|
magicJS.logger.info(`username:${username}`);
|
|
|
magicJS.logger.info(`password:${password}`);
|
|
magicJS.logger.info(`password:${password}`);
|
|
|
- let rsqData = {
|
|
|
|
|
|
|
+ let reqData = {
|
|
|
appKey: "cloud",
|
|
appKey: "cloud",
|
|
|
accountType: '01',
|
|
accountType: '01',
|
|
|
dynamicCheck: false,
|
|
dynamicCheck: false,
|
|
|
- userName: `{{RSA}}${username}`,
|
|
|
|
|
- epd: `{{RSA}}${password}`,
|
|
|
|
|
|
|
+ userName: `{RSA}${username}`,
|
|
|
|
|
+ epd: `{RSA}${password}`,
|
|
|
validateCode: "",
|
|
validateCode: "",
|
|
|
captchaToken: extData.captchaToken,
|
|
captchaToken: extData.captchaToken,
|
|
|
returnUrl: extData.returnUrl,
|
|
returnUrl: extData.returnUrl,
|
|
@@ -252,7 +252,7 @@ async function login(username, password){
|
|
|
REQID: 'c8d6f7fb3b204eeb',
|
|
REQID: 'c8d6f7fb3b204eeb',
|
|
|
callbackMsg: '',
|
|
callbackMsg: '',
|
|
|
};
|
|
};
|
|
|
- let body = magicJS.objToQueryStr(rsqData);
|
|
|
|
|
|
|
+ let body = magicJS.objToQueryStr(reqData);
|
|
|
let options = {
|
|
let options = {
|
|
|
url: `https://open.e.189.cn/api/logbox/oauth2/loginSubmit.do?${body}`,
|
|
url: `https://open.e.189.cn/api/logbox/oauth2/loginSubmit.do?${body}`,
|
|
|
headers: {
|
|
headers: {
|
|
@@ -277,7 +277,7 @@ async function login(username, password){
|
|
|
}).catch(err => {
|
|
}).catch(err => {
|
|
|
const msg = `获取页面数据异常\n${JSON.stringify(err)}`;
|
|
const msg = `获取页面数据异常\n${JSON.stringify(err)}`;
|
|
|
magicJS.logger.error(msg);
|
|
magicJS.logger.error(msg);
|
|
|
- reject(false);
|
|
|
|
|
|
|
+ resolve(false);
|
|
|
});
|
|
});
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|