shawenguan 1 год назад
Родитель
Сommit
863f576387
1 измененных файлов с 18 добавлено и 14 удалено
  1. 18 14
      Scripts/smzdm/smzdmHelper.js

+ 18 - 14
Scripts/smzdm/smzdmHelper.js

@@ -7,6 +7,7 @@
 
 ^https?:\/\/user-api\.smzdm\.com\/checkin$ url script-request-header https://git.jojo21.top/shawenguan/Quantumult-X/raw/master/Scripts/smzdm/smzdmHelper.js
 ^https?:\/\/zhiyou\.smzdm\.com\/user url script-request-header https://git.jojo21.top/shawenguan/Quantumult-X/raw/master/Scripts/smzdm/smzdmHelper.js
+^https?:\/\/zhiyou\.smzdm\.com\/user\/exp url script-request-header https://git.jojo21.top/shawenguan/Quantumult-X/raw/master/Scripts/smzdm/smzdmHelper.js
 
 [MITM]
 
@@ -29,7 +30,9 @@ const magicJS = MagicJS(scriptName, "INFO");
 
 let currentCookie = "";
 
-let appUserAgent = 'smzdm 10.7.7 rv:146.5 (iPhone 14 Pro; iOS 16.6.1; zh_CN)/iphone_smzdmapp/10.7.7';
+let iosUserAgent = 'smzdm 10.7.7 rv:146.5 (iPhone 14 Pro; iOS 16.6.1; zh_CN)/iphone_smzdmapp/10.7.7';
+let androidUserAgent = 'smzdm_android_V10.6.15 rv:936 (MT2110;Android13;zh)smzdmapp';
+
 let webUserAgent = 'Mozilla/5.0 (iPhone; CPU iPhone OS 16_6_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1';
 let mixUserAgent = 'Mozilla/5.0 (iPhone; CPU iPhone OS 16_6_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148/smzdm 10.7.7 rv:146.5 (iPhone 14 Pro; iOS 16.6.1; zh_CN)/iphone_smzdmapp/10.7.7/wkwebview/jsbv_1.0.0';
 
@@ -52,9 +55,7 @@ async function checkHandleRequest(){
     const url = request.url;
     const path = request.path;
     magicJS.logger.info(`path=${path}`);
-    if (path.match(/\/checkin$/)) {
-        await getWebOrAppCookie();
-    } else if (path.match(/\/user/)) {
+    if (path.match(/\/checkin$/) || path.match(/\/user/) || path.match(/\/user\/exp/)) {
         await getWebOrAppCookie();
     } else {
         switch (path) {
@@ -79,7 +80,7 @@ magicJS.http.interceptors.request.use((config) => {
         // 尝试将Cookie中的iOS相关信息去除
         // config.headers.Cookie = config.headers.Cookie.replace("iphone", "android").replace("iPhone", "Android").replace("apk_partner_name=appstore", "apk_partner_name=android");
 
-        magicJS.logger.info(`${config.headers.Cookie}`);
+        // magicJS.logger.info(`${config.headers.Cookie}`);
     }
     return config;
 });
@@ -162,15 +163,17 @@ function androidSignin(username) {
         const rawData = `f=android&sk=${username}&time=${outcome}000&token=${smzdmToken}&v=9.9.12&weixin=1&key=${smzdmKey}`;
         let md5 = createWMd5();
         const sign = md5.hex_md5_32Upper(rawData);
+        let androidCookie = currentCookie.replace("iphone", "android").replace("iPhone", "Android").replace("apk_partner_name=appstore", "apk_partner_name=android");
         await magicJS.http.post({
             url: "https://user-api.smzdm.com/checkin",
             headers: {
-                'User-Agent': appUserAgent,
+                'User-Agent': androidUserAgent,
                 'Accept-Language': 'zh-Hans-CN;q=1',
                 'Accept-Encoding': 'gzip, deflate, br',
                 'Connection': 'Keep-Alive',
                 'request_key': randomStr(18),
-                'Content-Type': 'application/x-www-form-urlencoded'
+                'Content-Type': 'application/x-www-form-urlencoded',
+                'Cookie': androidCookie,
             },
             body: `sk=${username}&sign=${sign}&weixin=1&v=9.9.12&captcha=&f=android&token=${encodeURIComponent(smzdmToken)}&touchstone_event=&time=${outcome}000`,
         }).then(resp => {
@@ -185,7 +188,7 @@ function androidSignin(username) {
                 magicJS.logger.info("Android端重复签到");
                 resolve([true, "Android端重复签到"]);
             } else {
-                magicJS.logger.warning(`Android端签到出现异常,接口返回数据不合法:${obj}`);
+                magicJS.logger.warning(`Android端签到出现异常,接口返回数据不合法:${JSON.stringify(obj)}`);
                 reject("Android端签到异常");
             }
         })
@@ -457,7 +460,8 @@ async function multiUsersSignIn() {
         magicJS.logger.error(
             scriptName,
             "",
-            "没有发现需要签到的Cookies\n请点击通知进行登录。", {
+            "没有发现需要签到的Cookies\n请点击通知进行登录。",
+            {
                 "open-url": "https://zhiyou.smzdm.com/user/login?redirect_to=http://zhiyou.smzdm.com/user",
             }
         );
@@ -482,11 +486,11 @@ async function multiUsersSignIn() {
             // 每日签到
             if (magicJS.data.read(smzdmSigninKey, true) === true) {
                 // Android端签到
-                await magicJS.utils
-                    .retry(androidSignin, 5, 1000)(beforeUserInfo["nick_name"])
-                    .catch((err) => {
-                        subTitle = `Android端签到异常: ${err}`;
-                    });
+                // await magicJS.utils
+                //     .retry(androidSignin, 5, 1000)(beforeUserInfo["nick_name"])
+                //     .catch((err) => {
+                //         subTitle = `Android端签到异常: ${err}`;
+                //     });
             }
 
             // 日常任务