|
|
@@ -29,10 +29,6 @@ async function Main() {
|
|
|
let password = magicJS.data.read(cloud189PassWordKey, "Sjojo510520", session);
|
|
|
magicJS.logger.info(`用户信息:${username}#${password}`);
|
|
|
await login(username,password);
|
|
|
- let loginUrl = await getLoginUrl();
|
|
|
- // if(loginUrl){
|
|
|
- // await getLoginData(loginUrl);
|
|
|
- // }
|
|
|
}
|
|
|
magicJS.done();
|
|
|
}
|
|
|
@@ -102,7 +98,6 @@ async function getLoginAccoutUrl(url){
|
|
|
// magicJS.logger.info(`页面数据:${data}`);
|
|
|
let urlMatch = data.match(/<a id="j-tab-login-link"[^>]*href="([^"]+)"/); // 正则表达式匹配
|
|
|
if(urlMatch){
|
|
|
- magicJS.logger.info(`${JSON.stringify(urlMatch)}`);
|
|
|
resolve(urlMatch[1]);
|
|
|
}
|
|
|
} catch (err) {
|
|
|
@@ -153,7 +148,7 @@ function getLoginData(url){
|
|
|
resolve();
|
|
|
}
|
|
|
}).catch(err => {
|
|
|
- const msg = `获取数据异常\n${err}`;
|
|
|
+ const msg = `获取数据异常\n${JSON.stringify(err)}`;
|
|
|
magicJS.logger.error(msg);
|
|
|
reject(msg);
|
|
|
});
|
|
|
@@ -161,10 +156,10 @@ function getLoginData(url){
|
|
|
}
|
|
|
|
|
|
async function login(username, password){
|
|
|
- // let loginUrl = await getLoginUrl();
|
|
|
- // if(loginUrl){
|
|
|
- // await getLoginData(loginUrl);
|
|
|
- // }
|
|
|
+ let loginUrl = await getLoginUrl();
|
|
|
+ if(loginUrl){
|
|
|
+ await getLoginData(loginUrl);
|
|
|
+ }
|
|
|
return new Promise((resolve) => {
|
|
|
resolve(false);
|
|
|
|