shawenguan hace 1 año
padre
commit
0dee3c6830
Se han modificado 1 ficheros con 10 adiciones y 12 borrados
  1. 10 12
      Scripts/telecom/cloud189Helper.js

+ 10 - 12
Scripts/telecom/cloud189Helper.js

@@ -121,7 +121,7 @@ async function getLoginJumpUrl(url){
 }
 
 
-async function getLoginAccoutUrl(url){
+async function getLoginAccoutUrlInfo(url){
     return new Promise((resolve, reject) => {
         let body = ``;
         let options = {
@@ -173,13 +173,13 @@ async function getLoginAccoutUrl(url){
 
 async function getLoginUrlInfo(){
     let retUrl = null;
-    let retCookie = null;
+    let retCookie = {};
     let entryUrl = '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 jumpUrl = await getLoginJumpUrl(entryUrl);
     if(jumpUrl){
-        let retInfo = await getLoginAccoutUrl(jumpUrl);
+        let retInfo = await getLoginAccoutUrlInfo(jumpUrl);
         if(retInfo){
-            retUrl =retInfo.url;
+            retUrl = retInfo.url;
             retCookie = retInfo.cookie;
         }
     }
@@ -393,12 +393,10 @@ async function tryJumpToUrl(url){
 
 function login(username, password){
     return new Promise(async (resolve, reject) => {
-        let {url, cookie} = await getLoginUrlInfo();
-        magicJS.logger.error(url);
-        magicJS.logger.error(cookie);
+        const retInfo = await getLoginUrlInfo();
         let extData = null;
-        if(url){
-            extData = await getLoginData(url, cookie);
+        if(retInfo.url){
+            extData = await getLoginData(retInfo.url, retInfo.cookie);
         }
         if(!extData){
             resolve({cacheUse: 1});
@@ -613,10 +611,10 @@ async function checkWapLogin(username, password, extData){
 
 function wapLogin(username, password){
     return new Promise(async (resolve, reject) => {
-        let {url, cookie} = await getLoginUrlInfo();
+        let retInfo = await getLoginUrlInfo();
         let extData = null;
-        if(url){
-            extData = await getLoginData(url, cookie);
+        if(retInfo.url){
+            extData = await getLoginData(retInfo.url, retInfo.cookie);
         }
         if(!extData){
             resolve({cacheUse: 1});