|
|
@@ -37,7 +37,7 @@ function checkHandleRequest(){
|
|
|
}
|
|
|
|
|
|
async function getLoginJumpUrl(){
|
|
|
- return new Promise((resolve) => {
|
|
|
+ return new Promise((resolve, reject) => {
|
|
|
let url = 'https://m.cloud.189.cn/udb/udb_login.jsp?pageId=1&pageKey=default&clientType=wap&redirectURL=https://m.cloud.189.cn/zhuanti/2021/shakeLottery/index.html';
|
|
|
let body = ``;
|
|
|
let options = {
|
|
|
@@ -73,7 +73,7 @@ async function getLoginJumpUrl(){
|
|
|
|
|
|
|
|
|
async function getLoginAccoutUrl(url){
|
|
|
- return new Promise((resolve) => {
|
|
|
+ return new Promise((resolve, reject) => {
|
|
|
let body = ``;
|
|
|
let options = {
|
|
|
url: url,
|
|
|
@@ -127,7 +127,7 @@ function getFieldFromText(regexPattern, text, index=1) {
|
|
|
}
|
|
|
|
|
|
function getLoginData(url){
|
|
|
- return new Promise((resolve) => {
|
|
|
+ return new Promise((resolve, reject) => {
|
|
|
if(!url){
|
|
|
resolve(false);
|
|
|
return;
|
|
|
@@ -222,13 +222,12 @@ function rsaEncode(j_rsakey, text) {
|
|
|
}
|
|
|
|
|
|
async function login(username, password){
|
|
|
- let url = await getLoginUrl();
|
|
|
- let extData = null;
|
|
|
- if(url){
|
|
|
- extData = await getLoginData(url);
|
|
|
- }
|
|
|
- magicJS.logger.info(`登录0`);
|
|
|
- return new Promise((resolve) => {
|
|
|
+ return new Promise(async (resolve, reject) => {
|
|
|
+ let url = await getLoginUrl();
|
|
|
+ let extData = null;
|
|
|
+ if(url){
|
|
|
+ extData = await getLoginData(url);
|
|
|
+ }
|
|
|
if(!extData){
|
|
|
resolve(false);
|
|
|
return;
|
|
|
@@ -262,19 +261,18 @@ async function login(username, password){
|
|
|
body: body
|
|
|
};
|
|
|
magicJS.logger.info(`登录2`);
|
|
|
- magicJS.http.post(options, (err, resp, data) => {
|
|
|
- magicJS.logger.info(`登录返回`);
|
|
|
- if (err) {
|
|
|
- magicJS.logger.info(`登录失败,http请求异常:${err}`);
|
|
|
+ magicJS.http.post(options).then(resp => {
|
|
|
+ const htmlText = resp.body;
|
|
|
+ try {
|
|
|
+ magicJS.logger.info(`接口数据:${data}`);
|
|
|
+ resolve(true);
|
|
|
+ } catch (err) {
|
|
|
resolve(false);
|
|
|
- } else {
|
|
|
- try {
|
|
|
- magicJS.logger.info(`接口数据:${data}`);
|
|
|
- resolve(true);
|
|
|
- } catch (err) {
|
|
|
- resolve(false);
|
|
|
- }
|
|
|
}
|
|
|
+ }).catch(err => {
|
|
|
+ const msg = `获取页面数据异常\n${JSON.stringify(err)}`;
|
|
|
+ magicJS.logger.error(msg);
|
|
|
+ reject(false);
|
|
|
});
|
|
|
});
|
|
|
}
|