From f83c549e85471cb8050fc9f1ab24e0bbe24586e7 Mon Sep 17 00:00:00 2001 From: NobyDa <53217160+NobyDa@users.noreply.github.com> Date: Sun, 21 Jun 2020 17:41:00 +0800 Subject: [PATCH 1/5] Fix regex problem #136 --- QuantumultX/Rewrite_lhie1.conf | 10 ++++++++-- Surge/AdRuleRegex.list | 10 ++++++++-- Surge/Module/RewriteRules.sgmodule | 10 ++++++++-- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/QuantumultX/Rewrite_lhie1.conf b/QuantumultX/Rewrite_lhie1.conf index d9bae7f..518b49c 100644 --- a/QuantumultX/Rewrite_lhie1.conf +++ b/QuantumultX/Rewrite_lhie1.conf @@ -1,4 +1,4 @@ -# Update-2020..6.8 +# Update-2020..6.21 # This rewrite rule does not include ConnersHua hostname = api.cognitive.microsofttranslator.com,offline.microsofttranslator.com,sf*ttcdn-tos.pstatp.com,oset-api.open-adx.com,qidian.qpic.cn,www.icourse163.org,ulogs.umeng.com,ulogs.umengcloud.com,alogs.umeng.com,alogs.umeng.co,*.byteoversea.com,*.cnbetacdn.com,101.201.62.22,113.105.222.132,113.96.109.*,118.178.214.118,121.14.89.216,121.9.212.178,14.21.76.30,183.232.237.194,183.232.246.225,183.60.159.227,59.37.96.220,789.kakamobi.cn,aarkissltrial.secure2.footprint.net,activity2.api.ofo.com,adm.10jqka.com.cn,adproxy.autohome.com.cn,afd.baidu.com,api.app.vhall.com,api.fengshows.com,api.k.sohu.com,api.laifeng.com,api.m.mi.com,api.mddcloud.com.cn,api-mifit.huami.com,api-mifit-cn.huami.com,app.10086.cn,app.m.zj.chinamobile.com,app2.autoimg.cn,appsdk.soku.com,atrace.chelaile.net.cn,capi.douyucdn.cn,cdn.kuaidi100.com,classbox2.kechenggezi.com,connect.facebook.net,creatives.ftimg.net,d.1qianbao.com,dapis.mting.info,dl.app.gtja.com,dongfeng.alicdn.com,dsp-impr2.youdao.com,erebor.douban.com,fm.fenqile.com,fuss10.elemecdn.com,g1.163.com,gorgon.youdao.com,hm.xiaomi.com,hui.sohu.com,i1.hoopchina.com.cn,iface2.iqiyi.com,img.zuoyebang.cc,img1.126.net,impservice.dictapp.youdao.com,impservice.youdao.com,kano.guahao.cn,lf.snssdk.com,lives.l.qq.com,m.aty.sohu.com,m5.amap.com,ma.ofo.com,mage.if.qidian.com,mapi.appvipshop.com,mbl.56.com,mimg.127.net,mmg.aty.sohu.com,mmgr.gtimg.com,nex.163.com,oimagea4.ydstatic.com,oimagec2.ydstatic.com,p.kuaidi100.com,p1.music.126.net,pic.k.sohu.com,pic1.chelaile.net.cn,ress.dxpmedia.com,rm.aarki.net,sso.ifanr.com,static.api.m.panda.tv,staticlive.douyucdn.cn,storage.wax.weibo.com,supportda.ofo.com,ups.youku.com,wapwenku.baidu.com,wenku.baidu.com,www.facebook.com,www.ft.com,www.oschina.net,api-mifit.huami.com,api-163.biliapi.net,pan-api.bitqiu.com,api.feng.com,m.tuniu.com,img.meituan.net,sdkapp.uve.weibo.com,ptmpcap.caocaokeji.cn,creditcardapp.bankcomm.com,newapp.szsmk.com,client.qunar.com,mpcs.suning.com,api2.helper.qq.com,cdnfile1.msstatic.com,res.xiaojukeji.com,cube.elemecdn.com,dimg04.c-ctrip.com,prom.mobile.gome.com.cn,y.gtimg.cn,du.hupucdn.com,interfac*.music.163.com,yxyapi2.drcuiyutao.com,api.vistopia.com.cn,capis-clb.didapinche.com,api.jxedt.com,mi.gdt.qq.com,richmanapi.jxedt.com,nfmovies.com,app-api.smzdm.com,emdcadvertise.eastmoney.com, @@ -419,7 +419,13 @@ hostname = api.cognitive.microsofttranslator.com,offline.microsofttranslator.com ^https?:\/\/api\.yangkeduo\.com\/api\/cappuccino\/splash url reject-img ^https?:\/\/mp\.weixin\.qq\.com\/(s|mp)\/(ad_|advertisement|getappmsgad|report|appmsgreport|appmsgpicreport) url reject-img ^https?:\/\/ap(i|p)\.bilibili\.com\/((x\/v2|pgc)\/(search\/defaultword|season\/rank\/cn|splash\/)|(pgc/season/rank/cn|x/v2/(rank.*rid=(168|5)|search/(defaultword|hot|recommend|resource)))) url reject-img -^https?:\/\/(api|www)\.zhihu\.com\/((terms\/privacy\/confirm|app_config|banner|commercial_api\/(launch|real_time))|(fringe|zst|drama|adx|commercial|real_time|ad-style-service|banners|market/popover|mqtt|.*(launch|featured-comment-ad|guide|recommendations|community-ad)|search/(top|tab|preset)|ab)) url reject-img +^https?:\/\/www\.zhihu\.com\/terms\/privacy\/confirm url reject-img +^https?:\/\/api\.zhihu\.com\/market\/popover url reject-img +^https?:\/\/api\.zhihu\.com\/search\/(top|tab|preset) url reject-img +^https?:\/\/api\.zhihu\.com\/(launch|ad-style-service|app_config|real_time|ab\/api) url reject-img +^https?:\/\/api\.zhihu\.com\/commercial_api\/(launch|real_time) url reject-img +^https?:\/\/(api|www)\.zhihu\.com\/.*(featured-comment-ad|recommendations|community-ad) url reject-img +^https?:\/\/(api|www)\.zhihu\.com\/(fringe|zst|adx|commercial|ad-style-service|banners|mqtt) url reject-img ^https?:\/\/interface3?\.music\.163\.com/eapi/(ad|abtest|sp|hot|store|mlog|search/(specialkeyword|defaultkeyword|hot)) url reject-img ^https?:\/\/weibointl\.api\.weibo\.cn\/portal\.php\?a=get_coopen_ads url reject-img ^https?:\/\/yxyapi2\.drcuiyutao\.com\/yxy-api-gateway\/api\/json\/advert\/getsAd url reject-dict diff --git a/Surge/AdRuleRegex.list b/Surge/AdRuleRegex.list index bd33892..146771d 100644 --- a/Surge/AdRuleRegex.list +++ b/Surge/AdRuleRegex.list @@ -1,4 +1,4 @@ -# Update 2020.6.8 +# Update 2020.6.21 # Advertising rules. Integration lhie1 and ConnersHua # MitM: sf*ttcdn-tos.pstatp.com, oset-api.open-adx.com, www.icourse163.org, ulogs.umeng.com, ulogs.umengcloud.com, alogs.umeng.com, alogs.umeng.co, *.byteoversea.com, *.cnbetacdn.com, *.doubanio.com, 101.201.62.22, 113.105.222.132, 113.96.109.*, 118.178.214.118, 121.14.89.216, 121.9.212.178, 14.21.76.30, 183.232.237.194, 183.232.246.225, 183.60.159.227, 59.37.96.220, 789.kakamobi.cn, aarkissltrial.secure2.footprint.net, activity2.api.ofo.com, adm.10jqka.com.cn, adproxy.autohome.com.cn, afd.baidu.com, api.app.vhall.com, api.fengshows.com, api.k.sohu.com, api.laifeng.com, api.m.mi.com, api.mddcloud.com.cn, api-mifit.huami.com, api-mifit-cn.huami.com, app.10086.cn, app.m.zj.chinamobile.com, app2.autoimg.cn, appsdk.soku.com, atrace.chelaile.net.cn, capi.douyucdn.cn, cdn.kuaidi100.com, classbox2.kechenggezi.com, connect.facebook.net, creatives.ftimg.net, d.1qianbao.com, dapis.mting.info, dl.app.gtja.com, dongfeng.alicdn.com, dsp-impr2.youdao.com, erebor.douban.com, fm.fenqile.com, fuss10.elemecdn.com, g1.163.com, gorgon.youdao.com, hm.xiaomi.com, hui.sohu.com, i1.hoopchina.com.cn, img.zuoyebang.cc, img1.126.net, img1.doubanio.com, img3.doubanio.com, impservice.dictapp.youdao.com, impservice.youdao.com, kano.guahao.cn, lf.snssdk.com, lives.l.qq.com, m.aty.sohu.com, m5.amap.com, ma.ofo.com, mage.if.qidian.com, mapi.appvipshop.com, mbl.56.com, mimg.127.net, mmg.aty.sohu.com, mmgr.gtimg.com, nex.163.com, oimagea4.ydstatic.com, oimagec2.ydstatic.com, p.kuaidi100.com, p1.music.126.net, pic.k.sohu.com, pic1.chelaile.net.cn, ress.dxpmedia.com, rm.aarki.net, sso.ifanr.com, static.api.m.panda.tv, staticlive.douyucdn.cn, storage.wax.weibo.com, supportda.ofo.com, ups.youku.com, wapwenku.baidu.com, wenku.baidu.com, www.facebook.com, www.ft.com, www.oschina.net, *.applovin.com, *.iydsj.com, *.k.sohu.com, *.kakamobi.cn, *.kingsoft-office-service.com, *.meituan.net, *.musical.ly, *.ofo.com, *.pstatp.com, *.snssdk.com, *.uve.weibo.com, *.ydstatic.com, *.youtube.com, a.apicloud.com, a.qiumibao.com, a.wkanx.com, act.vip.iqiyi.com, api.21jingji.com, api.caijingmobile.com, api.chelaile.net.cn, api.daydaycook.com.cn, api.gotokeep.com, api.haohaozhu.cn, api.huomao.com, api.intsig.net, api.izuiyou.com, api.jr.mi.com, api.jxedt.com, api.kkmh.com, api.m.jd.com, api.mgzf.com, api.psy-1.com, api.rr.tv, api.smzdm.com, api.tv.sohu.com, api.wallstreetcn.com, api.xiachufang.com, api.zhihu.com, api.zhuishushenqi.com, api*.tiktokv.com, api5.futunn.com, api-mifit*.huami.com, api-release.wuta-cam.com, app.58.com, app.api.ke.com, app.bilibili.com, api.douban.com, app.mixcapp.com, app.variflight.com, app.wy.guahao.com, app.yinxiang.com, b.zhuishushenqi.com, c.m.163.com, cap.caocaokeji.cn, capi.mwee.cn, cdn.moji.com, channel.beitaichufang.com, clientaccess.10086.cn, client.mail.163.com, cms.daydaycook.com.cn, consumer.fcbox.com, creditcard.ecitic.com, daoyu.sdo.com, dxy.com, e.dangdang.com, easyreadfs.nosdn.127.net, gateway.shouqiev.com, gw-passenger.01zhuanche.com, huichuan.sm.cn, i.ys7.com, iapi.bishijie.com, iface.iqiyi.com, ih2.ireader.com, img01.10101111cdn.com, img*.doubanio.com, img.jiemian.com, interfac*.music.163.com, ios.lantouzi.com, ios.wps.cn, m*.amap.com, m.client.10010.com, m.creditcard.ecitic.com, m.ibuscloud.com, m.yap.yahoo.com, mapi.mafengwo.cn, media.qyer.com, mlife.jf365.boc.cn, mob.mddcloud.com.cn, mobile-api2011.elong.com, mp.weixin.qq.com, mrobot.pcauto.com.cn, mrobot.pconline.com.cn, ms.jr.jd.com, msspjh.emarbox.com, newsso.map.qq.com, nnapp.cloudbae.cn, open.qyer.com, pic*.chelaile.net, portal-xunyou.qingcdn.com, pss.txffp.com, r.inews.qq.com, render.alipay.com, resrelease.wuta-cam.com, richmanapi.jxedt.com, rtbapi.douyucdn.cn, service.4gtv.tv, smkmp.96225.com, slapi.oray.net, snailsleep.net, sp.kaola.com, ssl.kohsocialapp.qq.com, static.vuevideo.net, static1.keepcdn.com, status.boohee.com, support.you.163.com, thor.weidian.com, tiku.zhan.com, weibointl.api.weibo.cn, www.dandanzan.com, www.flyertea.com, www.zhihu.com, www.zybang.com, youtubei.googleapis.com, zhidao.baidu.com, app.stoneread.com, api.mh.163.com, api.bilibili.com, i.weiread.qq.com, googlevideo.com, *.googlevideo.com, github.com, gist.github.com, shimo.im, p.doras.api.vcinema.cn, ios.prod.ftl.netflix.com, p.du.163.com, vsco.co, api.vnision.com, pan.baidu.com, *.applovin.com, i.weread.qq.com, m.poizon.com, ss0.bdstatic.com, s.youtube.com, www.youtube.com, 123.59.31.1, 119.18.193.135, qidian.qpic.cn, a.applovin.com, api.weibo.cn, youtubei.googleapis.com, api-mifit.huami.com, api-163.biliapi.net, mg.meituan.net, s3plus.meituan.net, pan-api.bitqiu.com, *pi.feng.com, 4gimg.map.qq.com, restapi.iyunmai.com, www.bodivis.com.cn, api.feng.com, m.tuniu.com, img.meituan.net, sdkapp.uve.weibo.com, ptmpcap.caocaokeji.cn, creditcardapp.bankcomm.com, newapp.szsmk.com, client.qunar.com, mpcs.suning.com, api2.helper.qq.com, cdnfile1.msstatic.com, res.xiaojukeji.com, cube.elemecdn.com, dimg04.c-ctrip.com, prom.mobile.gome.com.cn, y.gtimg.cn, du.hupucdn.com, dl.app.gtja.com, yxyapi*.drcuiyutao.com, yxyapi2.drcuiyutao.com, api.vistopia.com.cn, capis-clb.didapinche.com, g.cdn.pengpengla.com, api.qbb6.com, mcupdate.gstarcad.com, api.jxedt.com, mi.gdt.qq.com, richmanapi.jxedt.com, nfmovies.com, app-api.smzdm.com, emdcadvertise.eastmoney.com URL-REGEX,^https?:\/\/interface\.music\.163\.com\/eapi\/ad @@ -706,7 +706,13 @@ URL-REGEX,^https?:\/\/api\.yangkeduo\.com\/api\/cappuccino\/splash URL-REGEX,^https?:\/\/mp\.weixin\.qq\.com\/(s|mp)\/(ad_|advertisement|getappmsgad|report|appmsgreport|appmsgpicreport) URL-REGEX,^https?:\/\/dl\.app\.gtja\.com\/dzswem\/kvController\/.+\.jpg$ URL-REGEX,^https?:\/\/yxyapi\d\.drcuiyutao\.com\/yxy-api-gateway\/api\/json\/advert\/ -URL-REGEX,^https?:\/\/(api|www)\.zhihu\.com\/((terms\/privacy\/confirm|app_config|banner|commercial_api\/(launch|real_time))|(fringe|zst|drama|adx|commercial|real_time|ad-style-service|banners|market/popover|mqtt|.*(launch|featured-comment-ad|guide|recommendations|community-ad)|search/(top|tab|preset)|ab)) +URL-REGEX,^https?:\/\/www\.zhihu\.com\/terms\/privacy\/confirm +URL-REGEX,^https?:\/\/api\.zhihu\.com\/market\/popover +URL-REGEX,^https?:\/\/api\.zhihu\.com\/search\/(top|tab|preset) +URL-REGEX,^https?:\/\/api\.zhihu\.com\/(launch|ad-style-service|app_config|real_time|ab\/api) +URL-REGEX,^https?:\/\/api\.zhihu\.com\/commercial_api\/(launch|real_time) +URL-REGEX,^https?:\/\/(api|www)\.zhihu\.com\/.*(featured-comment-ad|recommendations|community-ad) +URL-REGEX,^https?:\/\/(api|www)\.zhihu\.com\/(fringe|zst|adx|commercial|ad-style-service|banners|mqtt) URL-REGEX,^https?:\/\/ap(i|p)\.bilibili\.com\/((x\/v2|pgc)\/(search\/defaultword|season\/rank\/cn|splash\/)|(pgc/season/rank/cn|x/v2/(search/(defaultword|hot|recommend|resource)))) URL-REGEX,^https?:\/\/interface3?\.music\.163\.com/eapi/(ad|abtest|sp|hot|store|mlog|search/(specialkeyword|defaultkeyword|hot)) URL-REGEX,^https?:\/\/capis-slb\.didapinche\.com\/ad\/ diff --git a/Surge/Module/RewriteRules.sgmodule b/Surge/Module/RewriteRules.sgmodule index 5640aec..0d950da 100644 --- a/Surge/Module/RewriteRules.sgmodule +++ b/Surge/Module/RewriteRules.sgmodule @@ -3,7 +3,7 @@ [URL Rewrite] -# Update time: 2020.6.8 +# Update time: 2020.6.21 # This rewrite rule does not decrypt Youtube ads. if you need to, please add the host name：*.googlevideo.com ^https?:\/\/interface\.music\.163\.com\/eapi\/ad - reject @@ -711,7 +711,13 @@ ^https?:\/\/mp\.weixin\.qq\.com\/(s|mp)\/(ad_|advertisement|getappmsgad|report|appmsgreport|appmsgpicreport) - reject ^https?:\/\/dl\.app\.gtja\.com\/dzswem\/kvController\/.+\.jpg$ - reject ^https?:\/\/yxyapi\d\.drcuiyutao\.com\/yxy-api-gateway\/api\/json\/advert\/ - reject -^https?:\/\/(api|www)\.zhihu\.com\/((terms\/privacy\/confirm|app_config|banner|commercial_api\/(launch|real_time))|(fringe|zst|drama|adx|commercial|real_time|ad-style-service|banners|market/popover|mqtt|.*(launch|featured-comment-ad|guide|recommendations|community-ad)|search/(top|tab|preset)|ab)) - reject +^https?:\/\/www\.zhihu\.com\/terms\/privacy\/confirm - reject +^https?:\/\/api\.zhihu\.com\/market\/popover - reject +^https?:\/\/api\.zhihu\.com\/search\/(top|tab|preset) - reject +^https?:\/\/api\.zhihu\.com\/(launch|ad-style-service|app_config|real_time|ab\/api) - reject +^https?:\/\/api\.zhihu\.com\/commercial_api\/(launch|real_time) - reject +^https?:\/\/(api|www)\.zhihu\.com\/.*(featured-comment-ad|recommendations|community-ad) - reject +^https?:\/\/(api|www)\.zhihu\.com\/(fringe|zst|adx|commercial|ad-style-service|banners|mqtt) - reject ^https?:\/\/ap(i|p)\.bilibili\.com\/((x\/v2|pgc)\/(search\/defaultword|season\/rank\/cn|splash\/)|(pgc/season/rank/cn|x/v2/(search/(defaultword|hot|recommend|resource)))) - reject ^https?:\/\/interface3?\.music\.163\.com/eapi/(ad|abtest|sp|hot|store|mlog|search/(specialkeyword|defaultkeyword|hot)) - reject ^https?:\/\/capis-slb\.didapinche\.com\/ad\/ - reject From e434ec717f8dcf36fd994b249789c7af680747fd Mon Sep 17 00:00:00 2001 From: NobyDa <53217160+NobyDa@users.noreply.github.com> Date: Mon, 22 Jun 2020 08:47:51 +0800 Subject: [PATCH 2/5] Fix jd scripts --- JD-DailyBonus/JD_DailyBonus.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/JD-DailyBonus/JD_DailyBonus.js b/JD-DailyBonus/JD_DailyBonus.js index 3f31b94..79fdedf 100644 --- a/JD-DailyBonus/JD_DailyBonus.js +++ b/JD-DailyBonus/JD_DailyBonus.js @@ -2,7 +2,7 @@ 京东多合一签到脚本 -更新时间: 2020.6.12 22:40 v1.14 +更新时间: 2020.6.22 8:40 v1.16 有效接口: 29+ 脚本兼容: QuantumultX, Surge, Loon, JSBox, Node.js 电报频道: @NobyDa @@ -123,7 +123,7 @@ async function all() { JDPersonalCare(stop), //京东个人护理馆 JingDongJewels(stop), //京东珠宝馆 JDMagicCube(stop), //京东小魔方 - JingDongFish(stop), //京东小京鱼 + //JingDongFish(stop), //京东小京鱼 JingDongPrize(stop), //京东抽大奖 JingDongSubsidy(stop), //京东金贴 JingDongShake(stop) //京东摇一摇 @@ -157,7 +157,7 @@ async function all() { await JingDongClean(stop); //京东清洁馆 await JDPersonalCare(stop); //京东个人护理馆 await JingDongSubsidy(stop); //京东金贴 - await JingDongFish(stop); //京东小京鱼 + //await JingDongFish(stop); //京东小京鱼 } await JRDoubleSign(stop); //金融双签 await Promise.all([ @@ -1248,7 +1248,7 @@ function JingDongClean(s) { "Content-Type": "application/x-www-form-urlencoded", Cookie: KEY, }, - body: "body=%7B%22params%22%3A%22%7B%5C%22enActK%5C%22%3A%5C%227mdc%2B5n2j0UXbWyvL9anyMh8lgRy8r63xFsvEENqalwaZs%2Fn4coLNw%3D%3D%5C%22%2C%5C%22isFloatLayer%5C%22%3Afalse%2C%5C%22ruleSrv%5C%22%3A%5C%22%5C%22%2C%5C%22signId%5C%22%3A%5C%22BwPxKwLESVwaZs%2Fn4coLNw%3D%3D%5C%22%7D%22%7D&client=wh5" + body: "body=%7B%22params%22%3A%22%7B%5C%22enActK%5C%22%3A%5C%22HIOyycfmx330SrJ4SukarhW1Nb8OyCEFt%2FRE30D8oREaZs%2Fn4coLNw%3D%3D%5C%22%2C%5C%22isFloatLayer%5C%22%3Afalse%2C%5C%22ruleSrv%5C%22%3A%5C%22%5C%22%2C%5C%22signId%5C%22%3A%5C%226alqR%2FjtRGgaZs%2Fn4coLNw%3D%3D%5C%22%7D%22%7D&client=wh5" }; $nobyda.post(JDCUUrl, function(error, response, data) { try { @@ -1439,7 +1439,7 @@ function JDPersonalCare(s) { "Content-Type": "application/x-www-form-urlencoded", Cookie: KEY, }, - body: "body=%7B%22params%22%3A%22%7B%5C%22enActK%5C%22%3A%5C%225orLuHl03NGp6P5%2FdmLf1PMfngICkMP6ILP8xX4jSRUaZs%2Fn4coLNw%3D%3D%5C%22%2C%5C%22isFloatLayer%5C%22%3Afalse%2C%5C%22ruleSrv%5C%22%3A%5C%22%5C%22%2C%5C%22signId%5C%22%3A%5C%22UZKIH1NL3McaZs%2Fn4coLNw%3D%3D%5C%22%7D%22%7D&client=wh5" + body: "body=%7B%22params%22%3A%22%7B%5C%22enActK%5C%22%3A%5C%22NOtPxXOcYgbv%2BxX3%2BohTjVuzYUtcP0iaSyiYhRLP9NMaZs%2Fn4coLNw%3D%3D%5C%22%2C%5C%22isFloatLayer%5C%22%3Afalse%2C%5C%22ruleSrv%5C%22%3A%5C%22%5C%22%2C%5C%22signId%5C%22%3A%5C%22PKmYqc8WDMUaZs%2Fn4coLNw%3D%3D%5C%22%7D%22%7D&client=wh5" }; $nobyda.post(JDPCUrl, function(error, response, data) { try { From f27ef188bec77505a7e3db52325875d40973c343 Mon Sep 17 00:00:00 2001 From: NobyDa <53217160+NobyDa@users.noreply.github.com> Date: Fri, 26 Jun 2020 17:51:44 +0800 Subject: [PATCH 3/5] Fix the potential cookie problem of JD scripts. --- JD-DailyBonus/JD_DailyBonus.js | 54 ++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/JD-DailyBonus/JD_DailyBonus.js b/JD-DailyBonus/JD_DailyBonus.js index 79fdedf..b9b09a8 100644 --- a/JD-DailyBonus/JD_DailyBonus.js +++ b/JD-DailyBonus/JD_DailyBonus.js @@ -2,8 +2,8 @@ 京东多合一签到脚本 -更新时间: 2020.6.22 8:40 v1.16 -有效接口: 29+ +更新时间: 2020.6.26 17:40 v1.17 +有效接口: 27+ 脚本兼容: QuantumultX, Surge, Loon, JSBox, Node.js 电报频道: @NobyDa 问题反馈: @NobyDa_bot @@ -90,7 +90,7 @@ var stop = 0; //自定义延迟签到,单位毫秒. 默认并发无延迟. (延 var DeleteCookie = false; //是否清除Cookie, true则开启 -var out = 5000; //接口超时退出, 用于可能发生的网络不稳定. 建议不少于3000毫秒, 0则关闭. +var out = 6000; //接口超时退出, 用于可能发生的网络不稳定. 建议不少于3000毫秒, 0则关闭. var $nobyda = nobyda(); @@ -116,13 +116,13 @@ async function all() { JdVegeMarket(stop), //京东菜场 JingDongCash(stop), //京东现金红包 JingDongFood(stop), //京东美食馆 - JingRSeeAds(stop), //金融看广告 - JingRongGame(stop), //金融游戏大厅 + //JingRSeeAds(stop), //金融看广告 + //JingRongGame(stop), //金融游戏大厅 JingDongLive(stop), //京东智能生活馆 JingDongClean(stop), //京东清洁馆 JDPersonalCare(stop), //京东个人护理馆 JingDongJewels(stop), //京东珠宝馆 - JDMagicCube(stop), //京东小魔方 + //JDMagicCube(stop), //京东小魔方 //JingDongFish(stop), //京东小京鱼 JingDongPrize(stop), //京东抽大奖 JingDongSubsidy(stop), //京东金贴 @@ -147,12 +147,12 @@ async function all() { await JingDMakeup(stop); //京东美妆馆 await JingDongWomen(stop); //京东女装馆 await JdVegeMarket(stop); //京东菜场 - await JDMagicCube(stop); //京东小魔方 + //await JDMagicCube(stop); //京东小魔方 await JingDongCash(stop); //京东现金红包 await JingDongJewels(stop); //京东珠宝馆 await JingDongFood(stop); //京东美食馆 - await JingRSeeAds(stop); //金融看广告 - await JingRongGame(stop); //金融游戏大厅 + //await JingRSeeAds(stop); //金融看广告 + //await JingRongGame(stop); //金融游戏大厅 await JingDongLive(stop); //京东智能生活馆 await JingDongClean(stop); //京东清洁馆 await JDPersonalCare(stop); //京东个人护理馆 @@ -183,9 +183,9 @@ function notify() { fail += Number(merge[i].fail) notify += merge[i].notify ? "\n" + merge[i].notify : "" } - var beans = merge.JDShake.Qbear ? merge.JDShake.Qbear + "京豆, " : "" - var Steel = merge.JRSteel.TSteel ? merge.JRSteel.TSteel + "钢镚, " : "" var Cash = merge.JDCash.TCash ? merge.JDCash.TCash + "红包" : "" + var Steel = merge.JRSteel.TSteel ? merge.JRSteel.TSteel + "钢镚" + (Cash ? ", " : "") : "" + var beans = merge.JDShake.Qbear ? merge.JDShake.Qbear + "京豆" + (Steel || Cash ? ", " : "" ) : "" var bsc = beans ? "\n" : Steel ? "\n" : Cash ? "\n" : "获取失败\n" var Tbean = bean ? bean + "京豆" + (steel || merge.JDCash.Cash ? ", " : "") : "" var TSteel = steel ? steel + "钢镚" + (merge.JDCash.Cash ? ", " : "") : "" @@ -1537,10 +1537,10 @@ function JingRSeeAds(s) { if (data.match(/(\"resultCode\":3|先登录)/)) { merge.JRSeeAds.notify = "京东金融-广告: 失败, 原因: Cookie失效‼️" merge.JRSeeAds.fail = 1 - } //else { - //merge.JRSeeAds.notify = "京东金融-广告: 失败, 原因: 未知 ⚠️" - //merge.JRSeeAds.fail = 1 - //} + } else { + merge.JRSeeAds.notify = "京东金融-广告: 失败, 原因: 未开始 ⚠️" + merge.JRSeeAds.fail = 1 + } } } } @@ -1763,10 +1763,10 @@ function JDMagicCube(s) { if (data.match(/(\"code\":3)/)) { merge.JDCube.notify = "京东商城-魔方: 失败, 原因: Cookie失效‼️" merge.JDCube.fail = 1 - } //else { - //merge.JDCube.notify = "京东商城-魔方: 失败, 原因: 未知 ⚠️" - //merge.JDCube.fail = 1 - //} + } else { + merge.JDCube.notify = "京东商城-魔方: 失败, 原因: 未知 ⚠️" + merge.JDCube.fail = 1 + } } } } @@ -1971,7 +1971,7 @@ function JingDongJewels(s) { "Content-Type": "application/x-www-form-urlencoded", Cookie: KEY, }, - body: "body=%7B%22riskParam%22%3A%7B%22eid%22%3A%22O5X6JYMZTXIEX4VBCBWEM5PTIZV6HXH7M3AI75EABM5GBZYVQKRGQJ5A2PPO5PSELSRMI72SYF4KTCB4NIU6AZQ3O6C3J7ZVEP3RVDFEBKVN2RER2GTQ%22%2C%22shshshfpb%22%3A%22v1%5C%2FzMYRjEWKgYe%2BUiNwEvaVlrHBQGVwqLx4CsS9PH1s0s0Vs9AWk%2B7vr9KSHh3BQd5NTukznDTZnd75xHzonHnw%3D%3D%22%2C%22pageClickKey%22%3A%22Babel_Sign%22%2C%22childActivityUrl%22%3A%22https%3A%5C%2F%5C%2Fpro.m.jd.com%5C%2Fmall%5C%2Factive%5C%2FzHUHpTHNTaztSRfNBFNVZscyFZU%5C%2Findex.html%22%7D%2C%22url%22%3A%22https%3A%5C%2F%5C%2Fpro.m.jd.com%5C%2Fmall%5C%2Factive%5C%2FzHUHpTHNTaztSRfNBFNVZscyFZU%5C%2Findex.html%22%2C%22params%22%3A%22%7B%5C%22enActK%5C%22%3A%5C%22LHJJM12LuKXc4TMfNJAxzdQx46zfllNqmfuzKsdU1RQaZs%5C%2Fn4coLNw%3D%3D%5C%22%2C%5C%22isFloatLayer%5C%22%3Atrue%2C%5C%22ruleSrv%5C%22%3A%5C%2200116952_36178285_t0%5C%22%2C%5C%22signId%5C%22%3A%5C%22jQaB6ncpBLQaZs%5C%2Fn4coLNw%3D%3D%5C%22%7D%22%2C%22geo%22%3A%7B%22lng%22%3A%220.000000%22%2C%22lat%22%3A%220.000000%22%7D%7D&build=167237&client=apple&clientVersion=9.0.0&openudid=1fce88cd05c42fe2b054e846f11bdf33f016d676&partner=apple&scope=11&sign=5373cc6a3966b674711af4e8e1a07f6a&st=1591960944289&sv=101" + body: "body=%7B%22params%22%3A%22%7B%5C%22enActK%5C%22%3A%5C%22nnpwpEXNlz8SHkPPXlGwF%2FlW70GyWhRm%2BKc12m3aC7saZs%2Fn4coLNw%3D%3D%5C%22%2C%5C%22isFloatLayer%5C%22%3Afalse%2C%5C%22ruleSrv%5C%22%3A%5C%22%5C%22%2C%5C%22signId%5C%22%3A%5C%22XzS3bsc7deYaZs%2Fn4coLNw%3D%3D%5C%22%7D%22%7D&client=wh5" }; $nobyda.post(JewelsUrl, function(error, response, data) { try { @@ -2549,7 +2549,7 @@ function JingRongDoll(s, type, num) { const Details = LogDetails ? "response:\n" + data : ''; if (cc.resultCode == 0) { if (cc.resultData.data.businessData != null) { - console.log("\n" + "京东金融-娃娃登录成功 " + Details) + console.log("\n" + "京东金融-娃娃登录成功 " + Details) if (cc.resultData.data.businessData.pickStatus == 2) { if (data.match(/\"rewardPrice\":\"?(\d+)/)) { var JRDoll_bean = data.match(/\"rewardPrice\":\"?(\d+)/)[1] @@ -2617,7 +2617,7 @@ function JDOverseas(s) { merge.Overseas.success = 1 if (data.match(/\"jdBeanAmount\":[1-9]+/)) { merge.Overseas.bean = data.match(/\"jdBeanAmount\":(\d+)/)[1] - merge.Overseas.notify = "京东商城-国际: 成功, 明细: " + merge.Overseas.bean + "京豆 🐶" + merge.Overseas.notify = "京东商城-国际: 成功, 明细: " + merge.Overseas.bean + "京豆 🐶" } else { merge.Overseas.notify = "京东商城-国际: 成功, 明细: 无京豆 🐶" } @@ -2805,8 +2805,10 @@ function GetCookie() { var CV = $request.headers['Cookie'] if (CV.match(/(pt_key=.+?pt_pin=|pt_pin=.+?pt_key=)/)) { var CookieValue = CV.match(/pt_key=.+?;/) + CV.match(/pt_pin=.+?;/) - var AccountOne = $nobyda.read("CookieJD") ? $nobyda.read("CookieJD").match(/pin=(.+?);/)[1] : null - var AccountTwo = $nobyda.read("CookieJD2") ? $nobyda.read("CookieJD2").match(/pt_pin=(.+?);/)[1] : null + var CK1 = $nobyda.read("CookieJD") + var CK2 = $nobyda.read("CookieJD2") + var AccountOne = CK1 ? CK1.match(/pt_pin=.+?;/) ? CK1.match(/pt_pin=(.+?);/)[1] : null : null + var AccountTwo = CK2 ? CK2.match(/pt_pin=.+?;/) ? CK2.match(/pt_pin=(.+?);/)[1] : null : null var UserName = CookieValue.match(/pt_pin=(.+?);/)[1] var DecodeName = decodeURIComponent(UserName) if (!AccountOne || UserName == AccountOne) { @@ -2846,7 +2848,9 @@ function GetCookie() { $nobyda.notify("写入京东Cookie失败", "", "请检查匹配URL或配置内脚本类型 ‼️"); } } catch (eor) { - $nobyda.notify("写入京东Cookie失败", "", '请手动开启脚本内 "DeleteCookie" 选项, \n清空Cookie后尝试 ‼️') + $nobyda.write("", "CookieJD") + $nobyda.write("", "CookieJD2") + $nobyda.notify("写入京东Cookie失败", "", '已尝试清空历史Cookie, 请重试 ⚠️') console.log(JSON.stringify(eor) + "\n" + eor + "\n" + JSON.stringify($request.headers)) } $nobyda.done() From c538806e43ae412a0ad2b6f32e1285e4ea351bba Mon Sep 17 00:00:00 2001 From: NobyDa <53217160+NobyDa@users.noreply.github.com> Date: Sun, 28 Jun 2020 21:16:39 +0800 Subject: [PATCH 4/5] Fix rules. --- QuantumultX/AdRule.list | 1 - Surge/AdRule.list | 1 - 2 files changed, 2 deletions(-) diff --git a/QuantumultX/AdRule.list b/QuantumultX/AdRule.list index a0b2378..93efbda 100644 --- a/QuantumultX/AdRule.list +++ b/QuantumultX/AdRule.list @@ -6121,7 +6121,6 @@ DOMAIN-SUFFIX,rotate.ymtracking.com,REJECT DOMAIN-SUFFIX,rotator.tradetracker.net,REJECT DOMAIN-SUFFIX,router.bittorrent.com,REJECT DOMAIN-SUFFIX,router.gwdang.com,REJECT -DOMAIN-SUFFIX,rovio-news-app.angrybirdsgame.com,REJECT DOMAIN-SUFFIX,rp.crasheye.cn,REJECT DOMAIN-SUFFIX,rp.gwallet.com,REJECT DOMAIN-SUFFIX,rpaulfrank.com,REJECT diff --git a/Surge/AdRule.list b/Surge/AdRule.list index 69525b1..cface1a 100644 --- a/Surge/AdRule.list +++ b/Surge/AdRule.list @@ -6130,7 +6130,6 @@ DOMAIN-SUFFIX,rotate.ymtracking.com DOMAIN-SUFFIX,rotator.tradetracker.net DOMAIN-SUFFIX,router.bittorrent.com DOMAIN-SUFFIX,router.gwdang.com -DOMAIN-SUFFIX,rovio-news-app.angrybirdsgame.com DOMAIN-SUFFIX,rp.crasheye.cn DOMAIN-SUFFIX,rp.gwallet.com DOMAIN-SUFFIX,rpaulfrank.com From d0b52c3d7c0724d8fad09c13ae5aa088a80f679b Mon Sep 17 00:00:00 2001 From: NobyDa <53217160+NobyDa@users.noreply.github.com> Date: Mon, 29 Jun 2020 13:43:29 +0800 Subject: [PATCH 5/5] Fix rules. --- QuantumultX/AdRule.list | 4 +--- Surge/AdRule.list | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/QuantumultX/AdRule.list b/QuantumultX/AdRule.list index a0b2378..0daf00e 100644 --- a/QuantumultX/AdRule.list +++ b/QuantumultX/AdRule.list @@ -1,5 +1,4 @@ -# Update-2020.6.6 Self-use rule, Remove versus shenji duplicates and optimizations -# This rule does not include shenji +# Update > 2020.6.29 This rule is based on optimization by lhie1/Rules. DOMAIN-SUFFIX,apoll.m.taobao.com,REJECT DOMAIN-SUFFIX,comet.yahoo.com,REJECT DOMAIN-SUFFIX,gemini.yahoo.com,REJECT @@ -2186,7 +2185,6 @@ DOMAIN-SUFFIX,clkservice.union.youdao.com,REJECT DOMAIN-SUFFIX,clkservice.youdao.com,REJECT DOMAIN-SUFFIX,clkservice2.dict.youdao.com,REJECT DOMAIN-SUFFIX,cloud.codenow.cn,REJECT -DOMAIN-SUFFIX,cloud.rovio.com,REJECT DOMAIN-SUFFIX,cloud.zyiis.net,REJECT DOMAIN-SUFFIX,cloudad.asia,REJECT DOMAIN-SUFFIX,cloudcdn.yousee.com,REJECT diff --git a/Surge/AdRule.list b/Surge/AdRule.list index 69525b1..5e121b1 100644 --- a/Surge/AdRule.list +++ b/Surge/AdRule.list @@ -1,4 +1,4 @@ -# Update > 2020.6.6 Go advertising rule Integration lhie1 and ConnersHua +# Update > 2020.6.29 Go advertising rule Integration lhie1 and ConnersHua DOMAIN-SUFFIX,mcupdate.gstarcad.com DOMAIN-SUFFIX,adx.open-adx.com DOMAIN-SUFFIX,adservice.sigmob.cn @@ -2196,7 +2196,6 @@ DOMAIN-SUFFIX,clkservice.union.youdao.com DOMAIN-SUFFIX,clkservice.youdao.com DOMAIN-SUFFIX,clkservice2.dict.youdao.com DOMAIN-SUFFIX,cloud.codenow.cn -DOMAIN-SUFFIX,cloud.rovio.com DOMAIN-SUFFIX,cloud.zyiis.net DOMAIN-SUFFIX,cloudad.asia DOMAIN-SUFFIX,cloudcdn.yousee.com