|
|
@@ -24,8 +24,9 @@ async function Main() {
|
|
|
checkHandleRequest();
|
|
|
} else {
|
|
|
magicJS.logger.info('##############');
|
|
|
- let username = magicJS.data.read(cloud189UserNameKey, "", "13430389115");
|
|
|
- let password = magicJS.data.read(cloud189PassWordKey, "", "Sjojo510520");
|
|
|
+ let session = '1';
|
|
|
+ let username = magicJS.data.read(cloud189UserNameKey, "13430389115", session);
|
|
|
+ let password = magicJS.data.read(cloud189PassWordKey, "Sjojo510520", session);
|
|
|
magicJS.logger.info(`用户信息:${username}#${password}`);
|
|
|
await login(username,password);
|
|
|
let loginUrl = await getLoginUrl();
|
|
|
@@ -60,22 +61,22 @@ async function getLoginUrlStep1(){
|
|
|
},
|
|
|
body: body
|
|
|
}
|
|
|
- magicJS.http.get(options, (err, resp, data) => {
|
|
|
- if (err) {
|
|
|
- magicJS.logger.info(`http请求异常:${err}`);
|
|
|
- resolve();
|
|
|
- } else {
|
|
|
- try {
|
|
|
- magicJS.logger.info(`接口数据:${data}`);
|
|
|
- let urlMatch = data.match(/https?:\/\/[^\s'"]+/); // 正则表达式匹配
|
|
|
- magicJS
|
|
|
- if(urlMatch){
|
|
|
- resolve(urlMatch[0]);
|
|
|
- }
|
|
|
- } catch (err) {
|
|
|
- resolve();
|
|
|
+
|
|
|
+ magicJS.http.get(options).then(resp => {
|
|
|
+ const data = resp.body;
|
|
|
+ try {
|
|
|
+ magicJS.logger.info(`接口数据:${data}`);
|
|
|
+ let urlMatch = data.match(/https?:\/\/[^\s'"]+/); // 正则表达式匹配
|
|
|
+ if(urlMatch){
|
|
|
+ resolve(urlMatch[0]);
|
|
|
}
|
|
|
+ } catch (err) {
|
|
|
+ resolve();
|
|
|
}
|
|
|
+ }).catch(err => {
|
|
|
+ const msg = `获取数据异常\n${err}`;
|
|
|
+ magicJS.logger.error(msg);
|
|
|
+ reject(msg);
|
|
|
});
|
|
|
});
|
|
|
}
|
|
|
@@ -95,21 +96,21 @@ async function getLoginUrlStep2(url){
|
|
|
},
|
|
|
body: body
|
|
|
}
|
|
|
- magicJS.http.get(options, (err, resp, data) => {
|
|
|
- if (err) {
|
|
|
- magicJS.logger.info(`http请求异常:${err}`);
|
|
|
- resolve();
|
|
|
- } else {
|
|
|
- try {
|
|
|
- magicJS.logger.info(`接口数据:${data}`);
|
|
|
- let urlMatch = data.match(/<a id="j-tab-login-link"[^>]*href="([^"]+)"/); // 正则表达式匹配
|
|
|
- if(urlMatch){
|
|
|
- resolve(urlMatch[1]);
|
|
|
- }
|
|
|
- } catch (err) {
|
|
|
- resolve();
|
|
|
+ magicJS.http.get(options).then(resp => {
|
|
|
+ const data = resp.body;
|
|
|
+ try {
|
|
|
+ magicJS.logger.info(`接口数据:${data}`);
|
|
|
+ let urlMatch = data.match(/<a id="j-tab-login-link"[^>]*href="([^"]+)"/); // 正则表达式匹配
|
|
|
+ if(urlMatch){
|
|
|
+ resolve(urlMatch[0]);
|
|
|
}
|
|
|
+ } catch (err) {
|
|
|
+ resolve();
|
|
|
}
|
|
|
+ }).catch(err => {
|
|
|
+ const msg = `获取数据异常\n${err}`;
|
|
|
+ magicJS.logger.error(msg);
|
|
|
+ reject(msg);
|
|
|
});
|
|
|
});
|
|
|
}
|
|
|
@@ -145,18 +146,17 @@ function getLoginData(url){
|
|
|
},
|
|
|
body: body
|
|
|
}
|
|
|
- magicJS.http.get(options, (err, resp, data) => {
|
|
|
- if (err) {
|
|
|
- magicJS.logger.info(`http请求异常:${err}`);
|
|
|
- resolve(false);
|
|
|
- } else {
|
|
|
- try {
|
|
|
- magicJS.logger.info(`接口数据:${data}`);
|
|
|
- resolve(true);
|
|
|
- } catch (err) {
|
|
|
- resolve(false);
|
|
|
- }
|
|
|
+ magicJS.http.get(options).then(resp => {
|
|
|
+ const data = resp.body;
|
|
|
+ try {
|
|
|
+ magicJS.logger.info(`接口数据:${data}`);
|
|
|
+ } catch (err) {
|
|
|
+ resolve();
|
|
|
}
|
|
|
+ }).catch(err => {
|
|
|
+ const msg = `获取数据异常\n${err}`;
|
|
|
+ magicJS.logger.error(msg);
|
|
|
+ reject(msg);
|
|
|
});
|
|
|
});
|
|
|
}
|