修改

Scripts/telecom/cloud189Helper.js

@@ -301,7 +301,7 @@ async function checkLogin(username, password, extData){
         magicJS.http.post(options).then(resp => {
             const rspData = resp.body;
             try {
-                magicJS.logger.info(`登录响应头部：${JSON.stringify(resp.headers)}`);
+                // magicJS.logger.info(`登录响应头部：${JSON.stringify(resp.headers)}`);
                 magicJS.logger.info(`登录响应数据：${JSON.stringify(rspData)}`);
                 resolve(rspData);
             } catch (err) {
@@ -472,23 +472,10 @@ async function lotteryDraw(url, lt){
     });
 }
 
-async function wapLogin(username, password){
+async function checkWapLogin(username, password, extData){
     return new Promise(async (resolve, reject) => {
-        let url = await getLoginUrl();
-        let extData = null;
-        if(url){
-            extData = await getLoginData(url);
-        }
-        if(!extData){
-            resolve();
-            return;
-        }
-        magicJS.logger.info(`登录1`);
         username = rsaEncode(extData.j_rsakey, username);
-        magicJS.logger.info(`登录2`);
         password = rsaEncode(extData.j_rsakey, password);
-        magicJS.logger.info(`username：${username}`);
-        magicJS.logger.info(`password：${password}`);
         let reqData = {
             appKey: "cloud",
             accountType: '02',
@@ -527,7 +514,7 @@ async function wapLogin(username, password){
         magicJS.http.get(options).then(resp => {
             try {
                 const rspData = resp.body;
-                magicJS.logger.info(`接口数据：${typeof(rspData)}`);
+                magicJS.logger.info(`登录响应数据：${JSON.stringify(rspData)}`);
                 resolve(rspData);
             } catch (err) {
                 resolve();
@@ -540,6 +527,28 @@ async function wapLogin(username, password){
     });
 }
 
+function wapLogin(username, password){
+    return new Promise(async (resolve, reject) => {
+        let url = await getLoginUrl();
+        let extData = null;
+        if(url){
+            extData = await getLoginData(url);
+        }
+        if(!extData){
+            resolve(null);
+            return;
+        }
+        let loginData = await checkWapLogin(username, password, extData);
+        if(loginData && loginData.result == 0){
+            // toUrl=做任务 抽好礼
+            await tryJumpToUrl(loginData.toUrl);
+            resolve(extData);
+        }else{
+            resolve(null);
+        }
+    });
+}
+
 Main();