修改

Scripts/telecom/cloud189Helper.js

@@ -27,42 +27,38 @@ async function Main() {
         let username = magicJS.data.read(cloud189UserNameKey, "18022485650", session);
         let password = magicJS.data.read(cloud189PassWordKey, "Sjojo510520@", session);
         magicJS.logger.info(`用户：${username}`);
-        try {
-            let loginExtData = await login(username,password);
-            if(loginExtData){
-                let signInRet = await signIn(loginExtData.lt);
-                let msg = '';
-                if(signInRet){
-                    if(signInRet.isSign){
-                        msg = `已经签到过了，签到获得${netdiskBonus}M空间`;
+        let loginExtData = await login(username,password);
+        if(loginExtData){
+            let signInRet = await signIn(loginExtData.lt);
+            let msg = '';
+            if(signInRet){
+                if(signInRet.isSign){
+                    msg = `已经签到过了，签到获得${signInRet.netdiskBonus}M空间`;
+                }else{
+                    msg = `未签到，签到获得${signInRet.netdiskBonus}M空间`;
+                }
+                magicJS.logger.info(msg);
+                magicJS.notification.appendNotifyInfo(msg);
+            }
+            let drawUrlList = [
+                'https://m.cloud.189.cn/v2/drawPrizeMarketDetails.action?taskId=TASK_SIGNIN&activityId=ACT_SIGNIN',
+                'https://m.cloud.189.cn/v2/drawPrizeMarketDetails.action?taskId=TASK_SIGNIN_PHOTOS&activityId=ACT_SIGNIN',
+                'https://m.cloud.189.cn/v2/drawPrizeMarketDetails.action?taskId=TASK_2022_FLDFS_KJ&activityId=ACT_SIGNIN',
+            ];
+            for(let i=0; i < drawUrlList.length; i++){
+                let drawRet = await lotteryDraw(drawUrlList[i], loginExtData.lt);
+                if(drawRet){
+                    if(drawRet.errorCode){
+                        msg = `抽奖失败：${drawRet.errorCode}`;
                     }else{
-                        msg = `未签到，签到获得${signInRet.netdiskBonus}M空间`;
+                        msg = `抽奖获得：${drawRet.description}`;
                     }
                     magicJS.logger.info(msg);
                     magicJS.notification.appendNotifyInfo(msg);
                 }
-                let drawUrlList = [
-                    'https://m.cloud.189.cn/v2/drawPrizeMarketDetails.action?taskId=TASK_SIGNIN&activityId=ACT_SIGNIN',
-                    'https://m.cloud.189.cn/v2/drawPrizeMarketDetails.action?taskId=TASK_SIGNIN_PHOTOS&activityId=ACT_SIGNIN',
-                    'https://m.cloud.189.cn/v2/drawPrizeMarketDetails.action?taskId=TASK_2022_FLDFS_KJ&activityId=ACT_SIGNIN',
-                ];
-                for(let i=0; i < drawUrlList.length; i++){
-                    let drawRet = await lotteryDraw(drawUrlList[i], loginExtData.lt);
-                    if(drawRet){
-                        if(drawRet.errorCode){
-                            msg = `抽奖失败：${drawRet.errorCode}`;
-                        }else{
-                            msg = `抽奖获得：${drawRet.description}`;
-                        }
-                        magicJS.logger.info(msg);
-                        magicJS.notification.appendNotifyInfo(msg);
-                    }
-                }
             }
-            // await logout();
-        }catch (err) {
-            magicJS.logger.info(JSON.stringify(err));
         }
+        // await logout();
     }
     magicJS.notification.msg('');
     magicJS.done();
@@ -123,7 +119,7 @@ async function getLoginAccoutUrl(url){
         magicJS.http.get(options).then(resp => {
             const htmlText = resp.body;
             try {
-                magicJS.logger.info(`页面数据：${htmlText}`);
+                // magicJS.logger.info(`页面数据：${htmlText}`);
                 let urlMatch = htmlText.match(/<a id="j-tab-login-link"[^>]*href="([^"]+)"/); // 正则表达式匹配
                 if(urlMatch){
                     resolve(urlMatch[1]);
@@ -328,7 +324,7 @@ async function tryJumpToUrl(url){
         magicJS.http.get(options).then(resp => {
             const htmlText = resp.body;
             try {
-                magicJS.logger.info(`获取[${url}]页面数据：\n${htmlText}`);
+                // magicJS.logger.info(`获取[${url}]页面数据：\n${htmlText}`);
                 resolve(resp);
             } catch (err) {
                 resolve();
@@ -354,6 +350,7 @@ function login(username, password){
         }
         let loginData = await checkLogin(username, password, extData);
         if(loginData && loginData.result == 0){
+            // toUrl=做任务 抽好礼
             await tryJumpToUrl(loginData.toUrl);
             resolve(extData);
         }else{

Scripts/util/MagicJS3.js

@@ -958,6 +958,7 @@ function MagicData(env, logger) {
 function MagicNotification(scriptName, env, logger, http) {
     let _barkUrl = null;
     let _barkKey = null;
+    let notifyInfo = []
     const setBark = url => {
         try {
             let _url = url.replace(/\/+$/g, "");
@@ -967,6 +968,38 @@ function MagicNotification(scriptName, env, logger, http) {
             logger.error(`Bark url error: ${ex}.`);
         }
     };
+
+    function appendNotifyInfo(info, type) {
+        if (type == 1) {
+            notifyInfo = info
+        } else {
+            notifyInfo.push(info)
+        }
+    }
+
+    function prependNotifyInfo(info) {
+        notifyInfo.splice(0, 0, info)
+    }
+
+    function msg(subtitle, message, openUrl, mediaUrl) {
+        let opts = {};
+        if(openUrl){
+            opts["open-url"] = openUrl;
+        }
+        if(mediaUrl){
+            opts["media-url"] = mediaUrl;
+        }
+        if(!message || message.length == 0){
+            if (Array.isArray(notifyInfo)) {
+                message = notifyInfo.join("\n");
+            } else {
+                message = notifyInfo;
+            }
+        }
+        if(message && message.length > 0){
+            post(scriptName, "", message, opts);
+        }
+    }
     function post(title = scriptName, subTitle = "", body = "", opts = "") {
         const _adaptOpts = _opts => {
             try {
@@ -1056,7 +1089,10 @@ function MagicNotification(scriptName, env, logger, http) {
         post: post,
         debug: debug,
         bark: bark,
-        setBark: setBark
+        setBark: setBark,
+        appendNotifyInfo: appendNotifyInfo,
+        prependNotifyInfo: prependNotifyInfo,
+        msg: msg,
     };
 }