Merge pull request #190 from evilbutcher/master

尝试修复喜马拉雅、10010
chavyleung · Aug 10, 2020 · d267ccf · d267ccf
2 parents 3324b2f + 73b1938
commit d267ccf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/10010/10010.js b/10010/10010.js
@@ -165,7 +165,7 @@ function showmsg() {
     let detail = ''
 
     // 签到结果
-    if (signinfo.signapp.signinMedal) {
+    if (signinfo.signapp.signinMedal == 0) {
         subTitle = `签到: 成功`
         detail = `积分: +${signinfo.signapp.prizeCount}, 成长值: +${signinfo.signapp.growthV}, 鲜花: +${signinfo.signapp.flowerCount}`
     } else if (signinfo.signapp.msg == '用户今日已签到！') {

diff --git a/ximalaya/ximalaya.js b/ximalaya/ximalaya.js
@@ -4,11 +4,12 @@ const KEY_signcookie = 'chavy_cookie_ximalaya'
 
 const signinfo = {}
 let VAL_signcookie = chavy.getdata(KEY_signcookie)
+let time = new Date().getTime();
 
 ;(exec = async () => {
   chavy.log(`🔔 ${cookieName} 开始签到`)
   await getinfo()
-  if (signinfo.info.isTickedToday == false) await signapp()
+  if (signinfo.info.isTickedToday == 0) await signapp()
   // await browseapp()
   await getacc()
   showmsg()
@@ -17,16 +18,16 @@ let VAL_signcookie = chavy.getdata(KEY_signcookie)
 
 function signapp() {
   return new Promise((resolve, reject) => {
-    const url = { url: `https://m.ximalaya.com/starwar/lottery/check-in/check/action`, headers: { Cookie: VAL_signcookie } }
-    url.headers['Accept'] = `application/json, text/plain, */*`
-    url.headers['Accept-Encoding'] = `gzip, deflate, br`
-    url.headers['Accept-Language'] = `zh-cn`
-    url.headers['Connection'] = `keep-alive`
-    url.headers['Host'] = `m.ximalaya.com`
+    const url = { url: `https://hybrid.ximalaya.com/web-activity/signIn/action?aid=8&ts=${time}&_sonic=0&impl=com.gemd.iting&_sonic=0`, headers: { Cookie: VAL_signcookie } }
+    url.headers['Accept'] = 'application/json, text/plain, */*'
+    url.headers['Accept-Encoding'] = 'gzip, deflate, br'
+    url.headers['Accept-Language'] = 'zh-cn'
+    url.headers['Connection'] = 'keep-alive'
+    url.headers['Host'] = 'hybrid.ximalaya.com'
     url.headers['User-Agent'] = 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 iting/6.6.45 kdtunion_iting/1.0 iting(main)/6.6.45/ios_1'
     chavy.post(url, (error, response, data) => {
       try {
-        signinfo.signapp = data
+        signinfo.sign = JSON.parse(response.body)
         resolve()
       } catch (e) {
         chavy.msg(cookieName, `签到结果: 失败`, `说明: ${e}`)
@@ -115,13 +116,14 @@ function getacc() {
 function showmsg() {
   let subTitle = ''
   let detail = ''
+
   if (signinfo.info.isTickedToday == false) {
-    if (signinfo.signapp == 'true') {
+    if (signinfo.sign.data.status == 0) {
       subTitle = '签到: 成功'
       detail = `当前连签: ${signinfo.info.continuousDays}天, 积分: ${signinfo.acc.data.score}(+${signinfo.info.awardAmount})`
     } else {
       subTitle = '签到: 失败'
-      detail = `说明: ${signinfo.signapp}`
+      detail = `说明: ${signinfo.sign.data.msg}`
     }
   } else {
     subTitle = `签到: 重复`