diff --git a/package/ctcgfw/luci-app-openclash/Makefile b/package/ctcgfw/luci-app-openclash/Makefile index aaabff827a..e9d5008b8e 100644 --- a/package/ctcgfw/luci-app-openclash/Makefile +++ b/package/ctcgfw/luci-app-openclash/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-openclash -PKG_VERSION:=0.36.6 +PKG_VERSION:=0.36.7 PKG_RELEASE:=beta PKG_MAINTAINER:=vernesong @@ -27,7 +27,7 @@ endef define Build/Prepare $(CP) $(CURDIR)/files $(PKG_BUILD_DIR) - $(foreach po,$(wildcard ${CURDIR}/i18n/zh-cn/*.po), \ + $(foreach po,$(wildcard ${CURDIR}/i18n/zh_Hans/*.po), \ po2lmo $(po) $(PKG_BUILD_DIR)/$(patsubst %.po,%.lmo,$(notdir $(po)));) chmod 0755 $(PKG_BUILD_DIR)/files/etc/init.d/openclash chmod -R 0755 $(PKG_BUILD_DIR)/files/usr/share/openclash/ diff --git a/package/ctcgfw/luci-app-openclash/files/etc/openclash/ConnersHua.yaml b/package/ctcgfw/luci-app-openclash/files/etc/openclash/ConnersHua.yaml index 868cbaad7f..eb5fff56fa 100644 --- a/package/ctcgfw/luci-app-openclash/files/etc/openclash/ConnersHua.yaml +++ b/package/ctcgfw/luci-app-openclash/files/etc/openclash/ConnersHua.yaml @@ -1288,6 +1288,8 @@ Rule: - DOMAIN-SUFFIX,wiley.com,DIRECT - DOMAIN-SUFFIX,worldbank.org,DIRECT - DOMAIN-SUFFIX,worldscientific.com,DIRECT +# > Plex Media Server +- DOMAIN-SUFFIX,plex.tv,DIRECT # > Other - DOMAIN-SUFFIX,cn,DIRECT - DOMAIN-SUFFIX,360in.com,DIRECT diff --git a/package/ctcgfw/luci-app-openclash/files/etc/openclash/Country.mmdb b/package/ctcgfw/luci-app-openclash/files/etc/openclash/Country.mmdb index f09a71189d..866190bb84 100644 Binary files a/package/ctcgfw/luci-app-openclash/files/etc/openclash/Country.mmdb and b/package/ctcgfw/luci-app-openclash/files/etc/openclash/Country.mmdb differ diff --git a/package/ctcgfw/luci-app-openclash/files/etc/openclash/lhie1.yaml b/package/ctcgfw/luci-app-openclash/files/etc/openclash/lhie1.yaml index 7f5758b939..2d921bb85e 100644 --- a/package/ctcgfw/luci-app-openclash/files/etc/openclash/lhie1.yaml +++ b/package/ctcgfw/luci-app-openclash/files/etc/openclash/lhie1.yaml @@ -1,5 +1,4 @@ Rule: -##updated ##source:lhie1 # Ads in Video apps @@ -257,9 +256,7 @@ Rule: -# REJECT - -# > Client +# Ads in apps - DOMAIN-KEYWORD,admaster,AdBlock - DOMAIN-KEYWORD,admdfs,AdBlock - DOMAIN-KEYWORD,adnewnc,AdBlock @@ -284,7 +281,6 @@ Rule: - DOMAIN-KEYWORD,duomeng,AdBlock - DOMAIN-KEYWORD,dwtrack,AdBlock - DOMAIN-KEYWORD,fenxi,AdBlock -- DOMAIN-KEYWORD,googleads,AdBlock - DOMAIN-KEYWORD,guanggao,AdBlock - DOMAIN-KEYWORD,inmobi,AdBlock - DOMAIN-KEYWORD,lianmeng,AdBlock @@ -918,7 +914,6 @@ Rule: - DOMAIN-SUFFIX,ad.bitmedia.io,AdBlock - DOMAIN-SUFFIX,ad.bjmama.net,AdBlock - DOMAIN-SUFFIX,ad.cacafly.com,AdBlock -- DOMAIN-SUFFIX,ad.caiyunapp.com,AdBlock - DOMAIN-SUFFIX,ad.cctv.com,AdBlock - DOMAIN-SUFFIX,ad.cooks.com,AdBlock - DOMAIN-SUFFIX,ad.crichd.in,AdBlock @@ -1397,7 +1392,6 @@ Rule: - DOMAIN-SUFFIX,afpimages.eastday.com,AdBlock - DOMAIN-SUFFIX,afpmm.alicdn.com,AdBlock - DOMAIN-SUFFIX,afptrack.csbew.com,AdBlock -- DOMAIN-SUFFIX,afs.googlesyndication.com,AdBlock - DOMAIN-SUFFIX,ag.nukefans.net,AdBlock - DOMAIN-SUFFIX,agenda.complex.com,AdBlock - DOMAIN-SUFFIX,ag-gb.marketgid.com,AdBlock @@ -3736,7 +3730,6 @@ Rule: - DOMAIN-SUFFIX,global.msads.net,AdBlock - DOMAIN-SUFFIX,global.ymtracking.com,AdBlock - DOMAIN-SUFFIX,gm682.com,AdBlock -- DOMAIN-SUFFIX,gma.alicdn.com,AdBlock - DOMAIN-SUFFIX,gma1.com,AdBlock - DOMAIN-SUFFIX,gmota.g188.net,AdBlock - DOMAIN-SUFFIX,gmtdmp.mookie1.com,AdBlock @@ -4758,7 +4751,6 @@ Rule: - DOMAIN-SUFFIX,lashou1000.com,AdBlock - DOMAIN-SUFFIX,lb.gtimg.com,AdBlock - DOMAIN-SUFFIX,lb.statsevent.com,AdBlock -- DOMAIN-SUFFIX,lbs.map.qq.com,AdBlock - DOMAIN-SUFFIX,lbstatic-a.akamaihd.net,AdBlock - DOMAIN-SUFFIX,lbszb.tongbu.com,AdBlock - DOMAIN-SUFFIX,lc.jiathis.com,AdBlock @@ -5869,7 +5861,6 @@ Rule: - DOMAIN-SUFFIX,page.xywy.com,AdBlock - DOMAIN-SUFFIX,pagead.google.com,AdBlock - DOMAIN-SUFFIX,pagead.l.google.com,AdBlock -- DOMAIN-SUFFIX,pagead2.googlesyndication.com,AdBlock - DOMAIN-SUFFIX,pagead-tpc.l.google.com,AdBlock - DOMAIN-SUFFIX,pagechoice.com,AdBlock - DOMAIN-SUFFIX,pagechoice.net,AdBlock @@ -7225,7 +7216,6 @@ Rule: - DOMAIN-SUFFIX,toutiao.2haha.com,AdBlock - DOMAIN-SUFFIX,toutiao.jxnews.com.cn,AdBlock - DOMAIN-SUFFIX,tp.sgcn.com,AdBlock -- DOMAIN-SUFFIX,tpc.googlesyndication.com,AdBlock - DOMAIN-SUFFIX,tpe163.com,AdBlock - DOMAIN-SUFFIX,tpush.html5.qq.com,AdBlock - DOMAIN-SUFFIX,tqd.ntpddq.com,AdBlock @@ -7432,7 +7422,6 @@ Rule: - DOMAIN-SUFFIX,updatecenter.qq.com,AdBlock - DOMAIN-SUFFIX,updatepage.kuwo.cn,AdBlock - DOMAIN-SUFFIX,updates-s3.binaryage.com,AdBlock -- DOMAIN-SUFFIX,up-hl.3g.qq.com,AdBlock - DOMAIN-SUFFIX,uplze.code.weddingeeos.com,AdBlock - DOMAIN-SUFFIX,ups.ksmobile.net,AdBlock - DOMAIN-SUFFIX,upush.res.meizu.com,AdBlock @@ -7519,7 +7508,6 @@ Rule: - DOMAIN-SUFFIX,video.cooguo.com,AdBlock - DOMAIN-SUFFIX,video.ureport.push.qq.com,AdBlock - DOMAIN-SUFFIX,video.wap.mpush.qq.com,AdBlock -- DOMAIN-SUFFIX,video-ad-stats.googlesyndication.com,AdBlock - DOMAIN-SUFFIX,videondun.com,AdBlock - DOMAIN-SUFFIX,videopush.baidu.com,AdBlock - DOMAIN-SUFFIX,viglink.com,AdBlock @@ -8472,6 +8460,10 @@ Rule: # > letv - DOMAIN-SUFFIX,api.mob.app.letv.com,AsianTV +# > MOO +# - USER-AGENT,MOO*,AsianTV +# - USER-AGENT,TencentMidasConnect*,AsianTV + # > Tencent Video - DOMAIN-SUFFIX,vv.video.qq.com,AsianTV @@ -8485,12 +8477,15 @@ Rule: - DOMAIN-SUFFIX,go.com,GlobalTV # > Abema TV +# - USER-AGENT,AbemaTV*,GlobalTV - DOMAIN-SUFFIX,abema.io,GlobalTV - DOMAIN-SUFFIX,akamaized.net,GlobalTV - DOMAIN-SUFFIX,ameba.jp,GlobalTV - DOMAIN-SUFFIX,hayabusa.io,GlobalTV # > Amazon Prime Video +# - USER-AGENT,InstantVideo.US*,GlobalTV +# - USER-AGENT,Prime%20Video*,GlobalTV - DOMAIN-SUFFIX,aiv-cdn.net,GlobalTV - DOMAIN-SUFFIX,amazonaws.com,GlobalTV - DOMAIN-SUFFIX,amazonvideo.com,GlobalTV @@ -8502,11 +8497,13 @@ Rule: - DOMAIN-SUFFIX,tv.apple.com,GlobalTV # > Bahamut +# - USER-AGENT,Anime*,GlobalTV - DOMAIN-SUFFIX,bahamut.com.tw,GlobalTV - DOMAIN-SUFFIX,gamer.com.tw,GlobalTV - DOMAIN-SUFFIX,hinet.net,GlobalTV # > BBC +# - USER-AGENT,BBCiPlayer*,GlobalTV - DOMAIN-KEYWORD,bbcfmt,GlobalTV - DOMAIN-KEYWORD,co.uk,GlobalTV - DOMAIN-KEYWORD,uk-live,GlobalTV @@ -8517,9 +8514,11 @@ Rule: - DOMAIN-SUFFIX,bbci.co.uk,GlobalTV # > CHOCO TV +# - USER-AGENT,TwDramas*,GlobalTV - DOMAIN-SUFFIX,chocotv.com.tw,GlobalTV # > Disney Plus +# - USER-AGENT,Disney*,GlobalTV - DOMAIN,cdn.registerdisney.go.com,GlobalTV - DOMAIN-SUFFIX,disneyplus.com,GlobalTV - DOMAIN-SUFFIX,disney-plus.net,GlobalTV @@ -8528,6 +8527,7 @@ Rule: - DOMAIN-SUFFIX,execute-api.us-east-1.amazonaws.com,GlobalTV # > Now E +# - USER-AGENT,PCCW*,GlobalTV - DOMAIN-KEYWORD,nowe,GlobalTV - DOMAIN,bcbolthboa-a.akamaihd.net,GlobalTV - DOMAIN-SUFFIX,nowe.com,GlobalTV @@ -8538,6 +8538,8 @@ Rule: - DOMAIN-SUFFIX,helpshift.com,GlobalTV # > Fox+ +# - USER-AGENT,FOX%20NOW*,GlobalTV +# - USER-AGENT,FOXPlus*,GlobalTV - DOMAIN-KEYWORD,foxplus,GlobalTV - DOMAIN-SUFFIX,config.fox.com,GlobalTV - DOMAIN-SUFFIX,emome.net,GlobalTV @@ -8553,6 +8555,7 @@ Rule: - DOMAIN-SUFFIX,urlload.net,GlobalTV # > HBO && HBO Go +# - USER-AGENT,HBO%20NOW*,GlobalTV - DOMAIN-SUFFIX,execute-api.ap-southeast-1.amazonaws.com,GlobalTV - DOMAIN-SUFFIX,hbo.com,GlobalTV - DOMAIN-SUFFIX,hboasia.com,GlobalTV @@ -8561,6 +8564,7 @@ Rule: - DOMAIN-SUFFIX,hbogoasia.hk,GlobalTV # > Hulu +# - USER-AGENT,Hulu*,GlobalTV - DOMAIN-SUFFIX,happyon.jp,GlobalTV - DOMAIN-SUFFIX,hulu.com,GlobalTV - DOMAIN-SUFFIX,huluim.com,GlobalTV @@ -8570,34 +8574,27 @@ Rule: - DOMAIN-SUFFIX,imkan.tv,GlobalTV # > JOOX +# - USER-AGENT,WeMusic*,GlobalTV +# - USER-AGENT,JOOX*,GlobalTV - DOMAIN-SUFFIX,joox.com,GlobalTV # > MytvSUPER +# - USER-AGENT,mytv*,GlobalTV - DOMAIN-KEYWORD,nowtv100,GlobalTV - DOMAIN-KEYWORD,rthklive,GlobalTV - DOMAIN-SUFFIX,mytvsuper.com,GlobalTV - DOMAIN-SUFFIX,tvb.com,GlobalTV -# > Netflix -- DOMAIN-SUFFIX,netflix.com,GlobalTV -- DOMAIN-SUFFIX,netflix.net,GlobalTV -- DOMAIN-SUFFIX,nflxext.com,GlobalTV -- DOMAIN-SUFFIX,nflximg.com,GlobalTV -- DOMAIN-SUFFIX,nflximg.net,GlobalTV -- DOMAIN-SUFFIX,nflxso.net,GlobalTV -- DOMAIN-SUFFIX,nflxvideo.net,GlobalTV - # > Pandora - DOMAIN-SUFFIX,pandora.com,GlobalTV # > Sky GO +# - USER-AGENT,skygo*,GlobalTV - DOMAIN-SUFFIX,sky.com,GlobalTV - DOMAIN-SUFFIX,skygo.co.nz,GlobalTV -# > Spotify -- DOMAIN-KEYWORD,spotify,GlobalTV -- DOMAIN-SUFFIX,scdn.co,GlobalTV -- DOMAIN-SUFFIX,spoti.fi,GlobalTV +# > SoundCloud +# - USER-AGENT,SoundCloud*,GlobalTV # > viuTV - DOMAIN-SUFFIX,cloudfront.net,GlobalTV @@ -8611,6 +8608,21 @@ Rule: - DOMAIN-SUFFIX,gvt2.com,GlobalTV - DOMAIN-SUFFIX,youtu.be,GlobalTV +# > Netflix +- DOMAIN-SUFFIX,netflix.com,Netflix +- DOMAIN-SUFFIX,netflix.net,Netflix +- DOMAIN-SUFFIX,nflxext.com,Netflix +- DOMAIN-SUFFIX,nflximg.com,Netflix +- DOMAIN-SUFFIX,nflximg.net,Netflix +- DOMAIN-SUFFIX,nflxso.net,Netflix +- DOMAIN-SUFFIX,nflxvideo.net,Netflix + +# > Spotify +# - USER-AGENT,*Spotify*,Spotify +- DOMAIN-KEYWORD,spotify,Spotify +- DOMAIN-SUFFIX,scdn.co,Spotify +- DOMAIN-SUFFIX,spoti.fi,Spotify + # > Telegram - DOMAIN-SUFFIX,t.me,Telegram @@ -8642,27 +8654,60 @@ Rule: # > NeteaseMusic +# - USER-AGENT,%E7%BD%91%E6%98%93%E4%BA%91%E9%9F%B3%E4%B9%90,Netease Music +# - USER-AGENT,NeteaseMusic*,Netease Music - DOMAIN-SUFFIX,music.126.net,Netease Music - DOMAIN-SUFFIX,music.163.com,Netease Music -- IP-CIDR,39.105.63.80/32,Netease Music -- IP-CIDR,45.254.48.1/32,Netease Music -- IP-CIDR,47.100.127.239/32,Netease Music -- IP-CIDR,59.111.160.195/32,Netease Music -- IP-CIDR,59.111.160.197/32,Netease Music -- IP-CIDR,59.111.181.35/32,Netease Music -- IP-CIDR,59.111.181.38/32,Netease Music -- IP-CIDR,59.111.181.60/32,Netease Music -- IP-CIDR,101.71.154.241/32,Netease Music -- IP-CIDR,103.126.92.132/32,Netease Music -- IP-CIDR,103.126.92.133/32,Netease Music -- IP-CIDR,112.13.119.17/32,Netease Music -- IP-CIDR,112.13.122.1/32,Netease Music -- IP-CIDR,115.236.118.33/32,Netease Music -- IP-CIDR,115.236.121.1/32,Netease Music -- IP-CIDR,118.24.63.156/32,Netease Music -- IP-CIDR,193.112.159.225/32,Netease Music -- IP-CIDR,223.252.199.66/32,Netease Music -- IP-CIDR,223.252.199.67/32,Netease Music + + + +# > Dler Cloud +- DOMAIN,dler.cloud,DIRECT + +# > Google +- DOMAIN-KEYWORD,mtalk.google.com,DIRECT +- DOMAIN,safebrowsing.googleapis.com,DIRECT + +# > Steam +- DOMAIN-SUFFIX,steamcontent.com,DIRECT + +# > Private Tracker +- DOMAIN-SUFFIX,awesome-hd.me,DIRECT +- DOMAIN-SUFFIX,broadcasthe.net,DIRECT +- DOMAIN-SUFFIX,chdbits.co,DIRECT +- DOMAIN-SUFFIX,classix-unlimited.co.uk,DIRECT +- DOMAIN-SUFFIX,empornium.me,DIRECT +- DOMAIN-SUFFIX,gazellegames.net,DIRECT +- DOMAIN-SUFFIX,hdchina.org,DIRECT +- DOMAIN-SUFFIX,hdsky.me,DIRECT +- DOMAIN-SUFFIX,icetorrent.org,DIRECT +- DOMAIN-SUFFIX,jpopsuki.eu,DIRECT +- DOMAIN-SUFFIX,keepfrds.com,DIRECT +- DOMAIN-SUFFIX,madsrevolution.net,DIRECT +- DOMAIN-SUFFIX,m-team.cc,DIRECT +- DOMAIN-SUFFIX,nanyangpt.com,DIRECT +- DOMAIN-SUFFIX,ncore.cc,DIRECT +- DOMAIN-SUFFIX,open.cd,DIRECT +- DOMAIN-SUFFIX,ourbits.club,DIRECT +- DOMAIN-SUFFIX,passthepopcorn.me,DIRECT +- DOMAIN-SUFFIX,privatehd.to,DIRECT +- DOMAIN-SUFFIX,redacted.ch,DIRECT +- DOMAIN-SUFFIX,springsunday.net,DIRECT +- DOMAIN-SUFFIX,tjupt.org,DIRECT +- DOMAIN-SUFFIX,totheglory.im,DIRECT + +# > Accelerate direct sites +- DOMAIN-KEYWORD,announce,DIRECT +- DOMAIN-KEYWORD,torrent,DIRECT +- DOMAIN-KEYWORD,tracker,DIRECT +- DOMAIN-SUFFIX,smtp,DIRECT +# - URL-REGEX,(Subject|HELO|SMTP),DIRECT +# - URL-REGEX,(api|ps|sv|offnavi|newvector|ulog\.imap|newloc)(\.map|)\.(baidu|n\.shifen)\.com,DIRECT +# - URL-REGEX,(.+\.|^)(360|so|qihoo|360safe|qhimg|360totalsecurity|yunpan)\.(cn|com),DIRECT +# - URL-REGEX,(.+\.)?(torrent|announce\.php\?passkey=|tracker|BitTorrent|bt_key|ed2k|find_node|get_peers|info_hash|magnet:|peer_id=|sandai|Thunder|XLLiveUD|xunlei)(\..+)?,DIRECT + +- DOMAIN-SUFFIX,smtp,DIRECT,no-resolve +- DOMAIN-SUFFIX,local,DIRECT,no-resolve @@ -8676,14 +8721,9 @@ Rule: - DOMAIN-SUFFIX,nhncorp.jp,Proxy # > Microsoft -- DOMAIN-KEYWORD,microsoft,Proxy -- DOMAIN-SUFFIX,hotmail.com,Proxy -- DOMAIN-SUFFIX,live.com,Proxy -- DOMAIN-SUFFIX,live.net,Proxy -- DOMAIN-SUFFIX,msn.com,Proxy -- DOMAIN-SUFFIX,office.com,Proxy -- DOMAIN-SUFFIX,office.net,Proxy -- DOMAIN-SUFFIX,outlook.com,Proxy +# - USER-AGENT,OneDrive*,Proxy +- DOMAIN-SUFFIX,onedrive.live.com,Proxy +- DOMAIN-SUFFIX,skype.com,Proxy # > Spark - DOMAIN-SUFFIX,api.amplitude.com,Proxy @@ -8692,11 +8732,11 @@ Rule: - DOMAIN-SUFFIX,smartmailcloud.com,Proxy # > Steam -- DOMAIN-SUFFIX,fanatical.com,Proxy -- DOMAIN-SUFFIX,humblebundle.com,Proxy -- DOMAIN-SUFFIX,steamcommunity.com,Proxy -- DOMAIN-SUFFIX,steampowered.com,Proxy -- DOMAIN-SUFFIX,steamstatic.com,Proxy +- DOMAIN-SUFFIX,fanatical.com,Steam +- DOMAIN-SUFFIX,humblebundle.com,Steam +- DOMAIN-SUFFIX,steamcommunity.com,Steam +- DOMAIN-SUFFIX,steampowered.com,Steam +- DOMAIN-SUFFIX,steamstatic.com,Steam # > Top blocked sites - DOMAIN-SUFFIX,2o7.net,Proxy @@ -8729,6 +8769,7 @@ Rule: - DOMAIN-SUFFIX,aol.com,Proxy - DOMAIN-SUFFIX,aolcdn.com,Proxy - DOMAIN-SUFFIX,api.mixpanel.com,Proxy +- DOMAIN-SUFFIX,api.termius.com,Proxy - DOMAIN-SUFFIX,api.tiktokv.com,Proxy - DOMAIN-SUFFIX,api.urbandictionary.com,Proxy - DOMAIN-SUFFIX,apigee.com,Proxy @@ -9066,7 +9107,6 @@ Rule: - DOMAIN-SUFFIX,simp.ly,Proxy - DOMAIN-SUFFIX,simplenote.com,Proxy - DOMAIN-SUFFIX,sketchappsources.com,Proxy -- DOMAIN-SUFFIX,skype.com,Proxy - DOMAIN-SUFFIX,slack.com,Proxy - DOMAIN-SUFFIX,slack-edge.com,Proxy - DOMAIN-SUFFIX,slack-msgs.com,Proxy @@ -9185,6 +9225,7 @@ Rule: - DOMAIN-SUFFIX,ustream.tv,Proxy - DOMAIN-SUFFIX,v.gd,Proxy - DOMAIN-SUFFIX,v2ex.co,Proxy +- DOMAIN-SUFFIX,v2ex.com,Proxy - DOMAIN-SUFFIX,v2ray.com,Proxy - DOMAIN-SUFFIX,van001.com,Proxy - DOMAIN-SUFFIX,vanpeople.com,Proxy @@ -9227,6 +9268,7 @@ Rule: - DOMAIN-SUFFIX,westca.com,Proxy - DOMAIN-SUFFIX,westpoint.edu,Proxy - DOMAIN-SUFFIX,whatbrowser.org,Proxy +- DOMAIN-SUFFIX,wikiwand.com,Proxy - DOMAIN-SUFFIX,wikileaks.info,Proxy - DOMAIN-SUFFIX,wikileaks.org,Proxy - DOMAIN-SUFFIX,wikileaks-forum.com,Proxy @@ -9331,13 +9373,6 @@ Rule: - DOMAIN-SUFFIX,webmproject.org,Proxy - DOMAIN-SUFFIX,webrtc.org,Proxy -# > V2EX -- DOMAIN-SUFFIX,v2ex.com,Proxy - - -- DOMAIN-KEYWORD,dlercloud,Proxy - - # > Amazon - IP-CIDR,13.32.0.0/16,Proxy - IP-CIDR,13.33.0.0/16,Proxy @@ -9422,6 +9457,20 @@ Rule: - DOMAIN-SUFFIX,battlenet.com,Domestic - DOMAIN-SUFFIX,blizzard.com,Domestic +# > Microsoft +- DOMAIN-KEYWORD,microsoft,Domestic +- DOMAIN-SUFFIX,azure.com,Domestic +- DOMAIN-SUFFIX,hotmail.com,Domestic +- DOMAIN-SUFFIX,live.com,Domestic +- DOMAIN-SUFFIX,live.net,Domestic +- DOMAIN-SUFFIX,msn.com,Domestic +- DOMAIN-SUFFIX,office.com,Domestic +- DOMAIN-SUFFIX,office.net,Domestic +- DOMAIN-SUFFIX,outlook.com,Domestic +- DOMAIN-SUFFIX,windows.com,Domestic +- DOMAIN-SUFFIX,windows.net,Domestic +- DOMAIN-SUFFIX,windowsupdate.com,Domestic + # > Prior - DOMAIN,client.amplifi.com,Domestic - DOMAIN,ip.bjango.com,Domestic @@ -9435,9 +9484,6 @@ Rule: - DOMAIN-SUFFIX,sony.com,Domestic - DOMAIN-SUFFIX,sonyentertainmentnetwork.com,Domestic -# > Steam -- DOMAIN-SUFFIX,steamcontent.com,Domestic - # > TeamViewer - IP-CIDR,185.188.32.0/24,Domestic - IP-CIDR,185.188.33.0/24,Domestic @@ -9448,7 +9494,6 @@ Rule: - IP-CIDR6,2a0b:b582::/48,Domestic - IP-CIDR6,2a0b:b583::/48,Domestic -# Domestic - DOMAIN-SUFFIX,12306.cn,Domestic - DOMAIN-SUFFIX,12306.com,Domestic - DOMAIN-SUFFIX,126.net,Domestic @@ -9468,14 +9513,15 @@ Rule: - DOMAIN-SUFFIX,air-matters.io,Domestic - DOMAIN-SUFFIX,aixifan.com,Domestic - DOMAIN-SUFFIX,akadns.net,Domestic +- DOMAIN-SUFFIX,alibabacloud.com,Domestic - DOMAIN-SUFFIX,alicdn.com,Domestic - DOMAIN-SUFFIX,alipay.com,Domestic - DOMAIN-SUFFIX,alipayobjects.com,Domestic - DOMAIN-SUFFIX,aliyun.com,Domestic +- DOMAIN-SUFFIX,aliyuncs.com,Domestic - DOMAIN-SUFFIX,amap.com,Domestic - DOMAIN-SUFFIX,apache.org,Domestic - DOMAIN-SUFFIX,api.crisp.chat,Domestic -- DOMAIN-SUFFIX,api.termius.com,Domestic - DOMAIN-SUFFIX,appshike.com,Domestic - DOMAIN-SUFFIX,appstore.com,Domestic - DOMAIN-SUFFIX,autonavi.com,Domestic @@ -9581,7 +9627,6 @@ Rule: - DOMAIN-SUFFIX,mob.com,Domestic - DOMAIN-SUFFIX,moji.com,Domestic - DOMAIN-SUFFIX,moke.com,Domestic -- DOMAIN-SUFFIX,mtalk.google.com,Domestic - DOMAIN-SUFFIX,mxhichina.com,Domestic - DOMAIN-SUFFIX,myqcloud.com,Domestic - DOMAIN-SUFFIX,myunlu.com,Domestic @@ -9648,7 +9693,6 @@ Rule: - DOMAIN-SUFFIX,trello.com,Domestic - DOMAIN-SUFFIX,trellocdn.com,Domestic - DOMAIN-SUFFIX,totheglory.im,Domestic -- DOMAIN-SUFFIX,tp.m-team.cc,Domestic - DOMAIN-SUFFIX,ttmeiju.com,Domestic - DOMAIN-SUFFIX,tudou.com,Domestic - DOMAIN-SUFFIX,udache.com,Domestic @@ -9717,44 +9761,6 @@ Rule: -- DOMAIN,dler.cloud,DIRECT - -# > Private Tracker -- DOMAIN-SUFFIX,awesome-hd.me,DIRECT -- DOMAIN-SUFFIX,broadcasthe.net,DIRECT -- DOMAIN-SUFFIX,chdbits.co,DIRECT -- DOMAIN-SUFFIX,classix-unlimited.co.uk,DIRECT -- DOMAIN-SUFFIX,empornium.me,DIRECT -- DOMAIN-SUFFIX,gazellegames.net,DIRECT -- DOMAIN-SUFFIX,hdchina.org,DIRECT -- DOMAIN-SUFFIX,hdsky.me,DIRECT -- DOMAIN-SUFFIX,icetorrent.org,DIRECT -- DOMAIN-SUFFIX,jpopsuki.eu,DIRECT -- DOMAIN-SUFFIX,keepfrds.com,DIRECT -- DOMAIN-SUFFIX,madsrevolution.net,DIRECT -- DOMAIN-SUFFIX,m-team.cc,DIRECT -- DOMAIN-SUFFIX,nanyangpt.com,DIRECT -- DOMAIN-SUFFIX,ncore.cc,DIRECT -- DOMAIN-SUFFIX,open.cd,DIRECT -- DOMAIN-SUFFIX,ourbits.club,DIRECT -- DOMAIN-SUFFIX,passthepopcorn.me,DIRECT -- DOMAIN-SUFFIX,privatehd.to,DIRECT -- DOMAIN-SUFFIX,redacted.ch,DIRECT -- DOMAIN-SUFFIX,springsunday.net,DIRECT -- DOMAIN-SUFFIX,tjupt.org,DIRECT -- DOMAIN-SUFFIX,totheglory.im,DIRECT - -# > Accelerate direct sites -- DOMAIN-KEYWORD,announce,DIRECT -- DOMAIN-KEYWORD,torrent,DIRECT -- DOMAIN-KEYWORD,tracker,DIRECT -- DOMAIN-SUFFIX,smtp,DIRECT - - -- IP-CIDR,1.1.1.1/24,DIRECT - -- DOMAIN-SUFFIX,smtp,DIRECT -- DOMAIN-SUFFIX,local,DIRECT - IP-CIDR,10.0.0.0/8,DIRECT - IP-CIDR,100.64.0.0/10,DIRECT - IP-CIDR,127.0.0.0/8,DIRECT @@ -9762,4 +9768,4 @@ Rule: - IP-CIDR,192.168.0.0/16,DIRECT - GEOIP,CN,Domestic -- MATCH,Others \ No newline at end of file +- MATCH,Others diff --git a/package/ctcgfw/luci-app-openclash/files/etc/openclash/openclash_version b/package/ctcgfw/luci-app-openclash/files/etc/openclash/openclash_version index f5218f5ef8..bd02906973 100644 --- a/package/ctcgfw/luci-app-openclash/files/etc/openclash/openclash_version +++ b/package/ctcgfw/luci-app-openclash/files/etc/openclash/openclash_version @@ -1,2 +1,2 @@ -v0.36.6-beta -data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAXMAAAAqCAMAAAB2kksrAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ4IDc5LjE2NDAzNiwgMjAxOS8wOC8xMy0wMTowNjo1NyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIxLjAgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkNDRUNCQ0M2NEZFNzExRUE4NDJDOTRFQ0ZGRDg5MTcyIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkNDRUNCQ0M3NEZFNzExRUE4NDJDOTRFQ0ZGRDg5MTcyIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6Q0NFQ0JDQzQ0RkU3MTFFQTg0MkM5NEVDRkZEODkxNzIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6Q0NFQ0JDQzU0RkU3MTFFQTg0MkM5NEVDRkZEODkxNzIiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz5dn6TAAAADAFBMVEVtbW09PT2Gv9+EvN3R4eqEhIQGZp26urokhLvB1eAKaqGizOU6lcqTvdVFmspYpdIJeLgJdbSCgoJ3t9uStcmenp4GcKxilLHa2tqlpaVTiqqDs854eHgHX5Hf39/n5+c/Pz/GxsbR5vKhoaEla5LOzs5paWllnr2y1uoHXI2RkZFxcXG/v79GRkasrKy1tbUFYJUEXI4GbamTxeE0dJoEU4BmrNXKysoJca1iYmIFWooWaJcJZJhkq9MIYpVLS0tDQ0Pg4OCLi4ux0eOyytmixdh2dnYXgL3AwMCcnJyiwNEHdLLCwsJBQUEGVYJGirEFZZpFgKJFkb1CQkImcZy2traXl5eyzdwnicHQ3+eEtNDS0tIFaaLQ0NA2kcZHnM1lZWUahMGNjY0JWIXw9fejyN6kzuYFcrArjscYYo1zobsIbKWDrcWDqsE0fKVyn7ivr69gYGAchsODq8IZdapJns6UlJTB2ecEYph0dHSJweIwk8tDfqBKns90sdVGg6ZFiK01h7VortcRgsMCc7QBcrNRUVFUVFRVVVVSUlILfL1WVlYFdrcHeLkDdLUDdLQEdbYDdbUEdrYOgMAOf8ASg8MSg8RXV1cShMQKe7wThMUAcrIGd7gOf78Nfr8Nfr4Mfb4Mfb0IebkJeroJe7sJers6OjqqqqrU1NTV1dVISEirq6upqak7Ozt+fn6AgIDw9/sHVoRJSUnC3u6BgYHq6urz8/NMTEz19fXh7/f09PR/f3+DvNyErMLB3e3v9PeFvt6hv9CCqcDg6u8IaJ/B3u6JiYkHVoPA1N/B3e4UXono6Ojg6vBInc4EVYPD3++Evd3W1tYLerl0s9jg7vZGm8sFZ58IWYfC3+9Vos8Zg8AFa6YGdbRInc0LdK8EVYSDr8gLb6iButoKeLfv9vqSuc8FdLPg7/cJcKwEWIiyz+DP5PEHV4dkmbfB2+pTU1MPgMEQgcJZWVlaWlpfX19bW1tcXFxNTU1eXl5PT09QUFBYWFhdXV1OTk7///////9obPo/AAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAADGZJREFUeNrsVwlUVNcZfoOOihK3MCw6yIhgEB02HRW3ASTRiiAaV7RGDwa3Go1GozFmsa0ISLe0pbQmTQyySwaQNSLuu8aoMYuJ2Y22Sae1NiCGj/z3vveG9wYwnKb1nJnjdw73/v9////77/vum/ceQnNz1ZrBt5wBf3YAbH7G0twsNEdtuuUc+JNDYLNfs1A1tMFJ8EfHwGaLsMZZJG/4g4PgGWHod86CnzsINgvf3df8XsOJNP+Xo0D41mlwX/N7j386CoT/OA3ua37v8ZKjQPi30+D3joI2NdcGBwcH/R9OY5FWu8jmCFptR2r0Wn0H2V9uDy+5PejyoFur6NpeLi4uW+wDy1qVL9vq4vLgWnXMBS4v/9cQbtojYlYVOKJmR9z8kdAGa1V+FWbb7MkY1RGKt/F2B5u90g7WvsUv5621qugyMYrqXnJaMvdd7KrdxLwt6qhLq7wWbHHZ8spd0UpzfTngVajTBVAj7Y/VPBjBSjd9GKJsRwsE/W81/2s7eA+dH5r2UGe8p4quB+bV1k5ZAqznvpsFiKmtjTmgLt4KLJlSWztvvTp8AAfaa3fXNQ7hjhoRUagQNAxmXUXfOz8SpLnKHwrIDWejIrUjFEaNsYPNXm0bW3FmeVJS0vIl2KoMr5/in8TCZ5DM3MUWxLC0pO6qYjqZWhZNuqomJV1fbQ93W+MQWqlUEaGJLDWbjRpN+uCOaqvvqzqevn2FtjUv8MUgyczHrCYpWd82Y4Sd5oK6SYScIeO1thGIFT6fXv3UpxaByvDVpCSf7t3HvVuL95ibDNekpHEU6K4qribJ36Wwz1U1Ken62mvL1rspQutlj6/ZgqocEfaaV0Fn2MatdDMz8rGXe3uRL42zo4DCO4UojCikxxBbLWQvgKpCngdEcDc/gjsibOzbdCiXBKQ7PpOEm8zWy6PvqMjvDCrnYUZZCJE4mocmR0iZAi+cpdx6moReqJasavRKS7PghQtkX3geljQFro77nE0XvsTjNC0G/MddSLNH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 \ No newline at end of file +v0.36.7-beta +data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAXMAAAAqCAMAAAB2kksrAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ4IDc5LjE2NDAzNiwgMjAxOS8wOC8xMy0wMTowNjo1NyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIxLjAgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjYyQzhEQTY3NUE3RTExRUE4MEY4QTczODI5MjI3QzVGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjYyQzhEQTY4NUE3RTExRUE4MEY4QTczODI5MjI3QzVGIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJDOERBNjU1QTdFMTFFQTgwRjhBNzM4MjkyMjdDNUYiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjJDOERBNjY1QTdFMTFFQTgwRjhBNzM4MjkyMjdDNUYiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7qtytCAAADAFBMVEXL2+XT09MAN2hJm8uCvN2TxeEbe7MARneDg4Nzc3P09PRSUlLFxcVUVFQNf78Gd7gNfr4CVYrX4ujMzMyLi4tiYmKkpKS9vb1BQUEFYpfZ2dmsrKxISEgJfL08lcm0tLQzMzN7e3sBW5MTExMEdrZ1tdlYptJFRUVoaGgBcrONwuACfMIFdrd0qMX9/f1lrNQFer0IerpViafI4vEpg7YTgsFlmbkweaUXdau+3O0rKyuiw9Y8PDzL190Bdbnb7PX4+PgAXKdYWFjz+fzp6emWlpYOgMAOebYAbbbl5eWizeUJe7vk8vm1zNqZmZmenp6Xtsg4ODgVgL4gICADbKlqsdk5dprg4OBmkawHcKwAYazt9vpChasahsN2orzf7vcAcbgAZrFvb28AabEATo1YlrpopczV6PMyi8IKhczq8PWx1ekja5YGaKCq1OxLS0uQkJBUmsMpjMQAYqCnvMkoY4lCfZ/4/P/v7+8kicK10eHH3+wMbKMKgcREnM5Uos9WUE1bVVIZaZcAb7cDcLFeWFUAeb8IeLtTTUoMfb4AdrxRUVEAbbICc7QHfL/f6O0EdbbW6/cAarTz9fcAcLYGf8NXV1cLfL16r80LdbFKlMBhW1jY7vquzd8AcrfP5vMAK19PodAVU3wZYowIebkKf8IUXIe32exvmrIOfr6Fvt///voATn8wbJHk8PcAb7T++/jt+f/r7OzA094Wgr/6+/sucZeBpr7A1uMAc7gHgskfhsIIb6kFcq8AcbwDeLqIrsRNn84HdrcEdbVfj6sKe7z7+vgJdrcCcrcQergAcbUQfLsAPnAFdLIOfL8XhcQDdbUCdLQDdLUSg8MThMQgi8hSUlFVVVVTU1MYhMFcXFsEdLkKebgEc7URcKYNhMmFtNFOgqEFeLsykshHirG+2OZQjK8PYJHc8PuOu9S/3vALfr5mZmYTfbsGbLJ6uNxZWVkRgsMQgcJWVlYPgMFaWlpQUFBdXV1bW1tcXFxOTk5NTU1PT09eXl7///////89qcNJAAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAAFDxJREFUeNrsmw9YVGW+xwFTBg+HAfkzBzgDMwx6SAmH9JqOJ5IRbFCDhjFJaJNhKLsVDcWmlqkVbQbjYrHOUO1atDus2rJ513LbSY01pac1unvv7t47p7ttGd7au6HXuTvOCDPDz/t7z/yFzHruPvfehWe/PuL75/fnnM/7nvcPz2Pc5cuXZcqi6aDF//LXrx2rkXfc5dmS8emg74/P+vvf/fXrtzsakLlyfNow/+1U0I7LcbLx6cP8d1MC+uq4pGnE/L+mhM7GZV6aHvr+panC/NfTivmfp4S+FZc5Nj30/X/7G/P/B+ZvXZwSQuaj00PfGZ3azLVut1vr+V8A44kJ6nF9owzf0ExkvurKupja1dWVenFya4ocm0cuTmpIibVLSU2JKNb3z+r2xlUXV/3PhMw9EzU6GmD8tNMZ4FjtqOcv05gzQMfEGHOxnHAplGbMzPrHvj7BuJdlPd/kOb7jmfVWypV0cZWjUd2lbnQg1JjWkfb2zi5sbky5GELaqetEO/WqqNGfOxvbQ2p0XIxxlx+ddyKlY9WV83V1qlOupi8xH7UxmdXJFVsr0rOUZu/YX8ZcO16U6YpWqaL83KJAqOKX5Fa7bV8bAs1qPO5vwtz1FcxT2h+af9Pam+Y/1B4zaVPk8h2vfrF27ab5ee1yAvOiXHd07v7X1m7a8V7EpmN43vxXw1rYJY96N+6Eho6nr5xu5O8e+VZq6tWZu2LloZnWrRBSembA9ReJyZqdz7ojVV8mQC4fLFOW2ZDM2L42hCIZQPtNHuM7rqVvpV5BKe15K8W32TJDlxJt7p4bfsvbdCOpqat2tS8Mmr1qjFjJuxdBRJs61VHv9ldgbcdAypXypeoWNjwwoE79ak1mbmNqAOKVHsuoUgaQwXwztlqbewK9cFWfD8lclLmHz4UqihKLjAQgifN82TcSwq0l/7IZslwtHY6qjU0asggz91yZeVltA+xb/+T6fbCytizS2mF8AG694/77N/8C4GwjwXsBYDk2XJ8XxdWhfvG6oJYsh0VlE5lvHBnokMs7osbyQXl4NF8O26JFrE1QH8ZlamPkYpQAWQaDRqMxGM7VVXJahqFGsX3UzJjHtPgVMFqPj2HM4wGG9djMDGMZdXmwz29mfB6X1mNjGLcFqyxLqBiyIF/DM5zWJUYfZXCiKzlSsfEyiOeRpZkjvhaPNib4qMfCsH4zx3g92nMKlcqDT+ChxCYzRtWOUgwnOnLmUVf40Z/QLn2rgyilsbsxhRQOdui6O1NMF2BOYgL+mQMXTB0RqV9cnzCUmJjQvwdndkeHLg9gCWkYavskYpP6SVrCkKjeR+GMaSTqrUPm8u52h0NXlipaytuxslcnP5h6sHwn7K83dnfLUwZ1upccjkadI7UjVpOY02wOpBsUAYqm/IyBKaJdkowiChFZlBlJAa2QmdFq4c9lZCSxTRkSjmtqzTgnuJnMmuSc5EoP59E6R1szzJbq5Pj8JE7r1iYlQ7wko1WidQbDu/U5kM/bsBRwbYVWxSWBKcpKz5G10uxoTHCaFSpl8fG5GWOCVhhPaqJtWg9Ltcrik2vOMW6XlirKkDCZWenpWeOYM8zctdRK3ki+a8a8s8ViafiVeWffcyyCA0Mv3PzC0AFY5BiI4iwYyj72ws3rEm+B+cYO9d5FcGtCwbEXXmh5oS9Kp+/jFlFpd8HhP5alTGD+nOnoNcvum1u7F5tTytrzXl32xcwZpzvlu/JWw6ad8+bNO7hr5MSF1fv3r77tW7qRqzBnkwDOaUbHxEOaV8HRtiO4wOBYMOmQrxe7R7NW4EpvqIF4N64+UMMzGbPFBa+qCCcfTuSaKlI7ouR87vBa6PYFw48qWmGrO4AlJgNKbKyTqQ4a5IyzrmhwxXhOsDmesvBZUGWmXFxmvNgyO4OxEefZQceqTDZmnlvlPT09g6b58Jqjs6eno/0RgFeMHwJsNn2y/RPTZoAPHT1h9R07dnH7dmv34L0wQ9fTeBZKftzc/vbbb1tTemLUt50c7tRP/wcc6N8e047MN10ILvNHdR0dZe/NDD7w6sZGx9rQS39oPBsqrc3TyWOc34jLtMWIr4EK3usRy9pRWvC6K0DC2GxORoa7nw2xrKiAkvg6maISqo7A1viKag0uzDWZ2qZ0qPB6zePIDLKUGRWwlTa7JfGQU1mTVemmg+FdnBYwHi7hfDIkK7R8JUDruDapDnJYIRy8Kp+vg+QiT2ZGTsklP45KvF/w+eqgQpLZhBuqktFymBIOVyqryTYcCm17wrbUSt6o4703SmBHd0eP3HgBtpnakeZiHIGezsU/gbN7Iy8+OLK9o7TRcc8i+HaBtcc4F77dfHbhhYV5Ze0dPZM0YloIFWm7+yYyR9zXff5mA2xrH1DrVsNrd91ww5LvwTXGgQcfhZuef/7M8wd1eXuWL7njjiVzoOH9sonM3VHkTj4fZLw73OLS+ghzzmajReZuMhWhlVUwNgZpbVXyClagDoNEZdCoFFVQyRPmMs5gUNmA+KlaIRf7NFpXOAMeQ2SIyXxpBUgUvvESaCK+3GwciUhwRLpVocIdRZGUSfOEuTjbGZXBYMBN2GzB/bekRoFZJHDkkjmGuXxwcFBubf42rO4uHSwr2winCt4+Ae/O6sT2zlkr4IRuMEbvPbToZbj3VELL9lLTTLjlUXFO3ndUJx+coB7HrrVwqhmn+ZqXglrT030CttzdnzDUu34Ljq9pBmz8cW/iUO+nsOXvOoeuh1twG0i0bz//Y3Ev6L8XdnbHBHwjbtwdlcDJcL11Rht8TjLPsYMw17s5xDKu0ugVPE6/Ol6l0Cs0rZCswn1SocrASceOA5gNnJlR1EE179bU4B7KMKzbFornUUhgxZjZxrfCbLMZv6oslYLnFaosHNFQcF6DIbdyGp5j9RqnljA3m/1VOLBmn0/Dr8BNGJlXGTSsWeHDMWNDoZ9wL7WKr9TXthm2vNHYY9oBs/+4F2fkkfMObHacPwKvxL76oI58+w23FzSODOzdj8V9zz+/HBeC2tMTma/Bj2BP/7V9g6WDRx8hOjpYisz3DCW2PJY9hNtBffd98GlvW31989AceEXXvAQ+KyjIzl6z/an+5oI23A1uhNuMX8mcQrQyRrga8xI9b6G9FkSRrGFo2qvPBVlSNUqSi3A4ZD6Op24nk0yY49lQxuH+GYlnM/tnQysvkO1BQaNRLvGtSSJpw8Et3FgJVLUmjbNksETmHG4TbgZPSAJ+J7iDSKCO87tcgcARPG9GmS+QryF6Om0OvmSpcTXc2mztRua1L2Gro3YLMl8To65f3bD+023wcu3eAccy2PfHxKGhhPUNMNNUGms1ePp8A5nmJELDFqKGWgdhnu3o63ur+U64zzSwFu588DbUg3GYWHcbfNH5dN/IGvnudXjv+sHPyB3AGBMRmTujovFAnc5aog1+mjB3OimRuZNg0fq1NjzqVUI6J+DCzMii14Y6M3cJT92s0+ll43GlcZIBYaiYBE63AjMw3DmAJj1ljo/6pjNMOLhHn3QEWyrSW81+NyaKN2PXEYuPuOPil6tH5hXugNNpxsFJ4kKP/oRz6YJSokFr2gF4WXfo4EpYXz/SPQNKak9jcyMu8zO6S2PUdxwhJ8bhuaUMmR/oxblZ0HsnbNzliLVaU38NzOn/7ghGqA3emlbWNiLzjV2dpaVy0xLcMw6ujL7HXCOu/steKsPnaH//AdLys+dWwkJjTMSJzJ36SrL3XY05jIvdBIXfG+yQNUlEJTVRLGGOFLzmr2Cu1SO+TE01VDABrz8ecoO+yqQiSyS41qtx18ST27CMo8LMS7SkS2DCzGk/Mh+HCHPnE3SIealc9+S7cLZ8HtzYvKC0fTHAI4ew9dBDAIsbJ9C0HzvWknA73FR2evd9cKZ8zUjfSAGebt7YG2ulQ9LXN1uxpP7o/qA+UpuQuZ0MjXEhfGE6CHD3iw8Sff7p4mFjiPnA7v3wvTtveLIg8VFYaIqJWBt3iY4Rix+xRO8Wy0436/fRuEPiEmIRmdNcE8AYSzpFFAEsINYasrkRabTmMZzAHE0HROZCkHlsAqefOQytmhzI0mgFPLxIQr4qxWgkuNPNaQwaLjOXHFKCzPGxijgnLmVcOq5ZhLlgxqcNZRMDPy4sXWAPiuyir5Yvwx20z+64+V3IM9l3fWTKg3dvbrSXSh1l0tKgXWmfdXv5XbBW7Sj/EzygG7DvGux+EaB2r91e5igL2gzXz4Qb+38jt9t3yaWJeGlCvSMnzIcd2F0/F1bXD98L9/eGLk9t2wnzvei9+ywc+Xkv8Xgd57k9qknMBX06LpUMvh3t9vJFTZxQARl6p9OnIfNLmMTcRwp4yGA1ZpbFfZPRhin4ROZkQGT8BOa0W5MFyWh1jneTr6pOoRB99aw2ytzCcQxurIZ4qNGLiVi2DioVbtrN2MgKfiXm9OPOCPOu8s2w8SHcQQ/tsne2vQ5z65Fv+QV4vW3Abh8oK5MOI3rToSDS+bBtd1n9XdAwsLvUXooM51yLMMsKg8xLTUdLYHNzXzDwhuMbiOx2ZH5TMZo5jMvguvr6W2B5cxu5PLUVHJcbb4NlOvQ2zoM9iQUbju+u34/MP4plPibEyK3HzzXZr2cYBmfT4VYeNzuZhud55VbI0tOMiAXtxE+e9WHJx1RAMssjJLaykhEpMNjKBud5DdQxGEygIxmcfBEcToYcvVegWdwD8xni66vJ4CLBOUmNj2fw/JIDGbyYKIDXgQpBgQORj8clL2FOmQUhnE3U4/THYeb2zrQ62IQ76AK7dE35EnjtnXpT/TuvwZLyLrvplUWL8nbbv3t0bq3RZDKVP9IA15WrO7MPw8x6o6n8VxvhznK1Q7p60cxrCfWB+tVwY2JZ6MPoCgqZz4DXuuvRfSf8w5ONbXcAzDN263Tdv75w9pBxJzSUYR9+WLNn1bd3G080TJ7nE5jTtAHvGxVZSU3KatzgJLy+FSBfmZGOi2uuIspcEFH4sWBT4HdfVSORZMXjSSZIgRb8InOK7JUyZWuWzRdNEdCTS2YrLi2CTaPEK2g1+tZh9EhwjF1Xo2xSpuOZ3BdkzurJnagIzzdwTmGbyDw0no8LHy+QhmRtPoA5ft7WJZXuOpR2GBbNuGfGy7An7Q92KU5k2GmU7v4QGmaeuOfsmZ/BnLSnSq1pn+IlMu+eu2+COKyeljbAy4dekkrtRtwF1qdZ7dKJQuZwH7pfA3Cg2TrQfytWF86YN3MlrmMvLf0J7J8x79WDbXvgB3fvuHsZPspCY4xzbdwoFSsbZ8BbYVCHa3CN0CeL5axkPNxRuJfBJY7Y4Qyu4sxYoL2Gc6GbepWEF88tDEWZuSpcFygB5ycRxUYzuDWkjWZoLJoNSVWhI08SEwnOnQs9QTqrtwUTuTRs8IyzQmKw0PoMAAuGDGcT9Tj18dPht1KbfgS4g4r17c0P7xFd9zycZpWGmZ9+Jy70lq//sNkqHfzD0O0lYvUWUj0kXQnP7T4tlV77n8/B64llw5OQF+NcDunNoXVdXW1Db64IRTu/V11wu1j8dfNPvycWzmzC1S3G+/wk5pSNMeiVWek56blKxsC7tHpNRnJOfpHBLSkyU36PREIHiJn5nDIp4BUdzHhfrJHJapIUelfAKZF4/BTlDSRJMs2UG0cwKzlL4vNGE9CsH484jBAaYUwmk1U3KXhbJLiN0TdVy5JzlRqNIAQT0bRGIZHlpFcHDJyNMo9LlBSGDGcLMv/XKHPpgoLNp35Kpjnylw798MCjix498MNELEt/v/jUqVm/l6qf6t98575tn916fWLiR9hsbUv46ZufbVv++RCxKpZ+furfny2WSv+wauGphwusxZOYS38/69TmG84s23br5oQCq9TelZbwoyV/2rd8yc8T16m7nhpa/8t9f7rLPjz08C9/8dmZGxLWn1r83tWY4yqrwROIQmNQaRhcc2m9SoPXbAYv92PIV6UKuImZh1dpnHRw4rIK8stfg0GBV8KASsXaEKzNoOI92Mdgl8FA0TEZ0FVl8LuDyTiFKuhrdkaCO33hgAFnKJHF7VWoyEMZOLRwMSoxZDhbhHlxWOoPEnr7u6SkWNh1LDEhsR//bugqLpZaC3p726zFw9L+BNI6lNB/vIuYdWXjWb0fqx+o0V061JuoHi4uHlYn9vZbh4snqdDa0kuu92hfgGaF6mL0Jr8ZTkj7YFjalY2hh4autW7AkFjITuzFYYvqfJzHMlEUHeB4vULPsz6aslgEC6fX82anmTELFirA4SdNrAQ/w3nDDl6O0esZLoBlPHIERAOW8QtoJnC4AbNUbALBx3FcTDKG1zOsl4oJTgVYBt04Lx1NhNdTXqFnzE5KbGNFu0g21OOWGObFwy3Z69ThATiendafln1crA9vyM7+ACFKP2ghrQXZhUGzYfWxAqy3nCRVaXFLdgshLT2Znb1BXfwlDR/Pbtkg2quHny0ufnZYvSG7IC0te10hjrNU3VKAgfET21CAGVq61mUfG74qc3wlWhB/0qSCU53CsoVyUuKr00EbL+UUog5OXCmEYEPYQBDtvRQtUIIwIbyXHB4n+dITfMONVGwisSrQoQihkDGBCPPCqNTqgZPRcvhHYeHJAbW6mPQMqIdJrStiRuoDYa9hUpscJ6qTxWq1upTYF5+M2Ekx9ECwcxgDFJ4sRJOTWBiYGOP9OJf3ywqyial5v0aWr7b5Wu8rG1yh9eqRnvF+/PSzMSqMLZP14NnJmtxaeCWjq2iSPcEZ7Sr86pBXZj4VRZj/05TQ+3G2wPTQM4GPO38zJfSrOGG6MPc+1vnPU0LvxBX5poee8T3W+d0poUfi8v/G/P9WH8yMu9zknxZ6xvxY57VTQfeQ/6uYND2Y+x8rmwrI88j/Vbx8OT/JPfX1hHvpP978V697ZiLv/xZgAGkqD0EP9jK8AAAAAElFTkSuQmCC \ No newline at end of file diff --git a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua index 8455fea940..0dcc62014e 100644 --- a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua +++ b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua @@ -210,7 +210,19 @@ o:depends("rule_source", "ConnersHua") o:value(l) end file:seek("set") -o = s:taboption("rules", ListValue, "Netease_Music", translate("Netease Music")) +o = s:taboption("rules", ListValue, "Netflix", translate("Netflix")) +o:depends("rule_source", "lhie1") + for l in file:lines() do + o:value(l) + end + file:seek("set") +o = s:taboption("rules", ListValue, "Spotify", translate("Spotify")) +o:depends("rule_source", "lhie1") + for l in file:lines() do + o:value(l) + end + file:seek("set") +o = s:taboption("rules", ListValue, "Steam", translate("Steam")) o:depends("rule_source", "lhie1") for l in file:lines() do o:value(l) @@ -223,6 +235,12 @@ o:depends("rule_source", "lhie1") end file:seek("set") o = s:taboption("rules", ListValue, "Telegram", translate("Telegram")) +o:depends("rule_source", "lhie1") + for l in file:lines() do + o:value(l) + end + file:seek("set") +o = s:taboption("rules", ListValue, "Netease_Music", translate("Netease Music")) o:depends("rule_source", "lhie1") for l in file:lines() do o:value(l) diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_proxys_set.sh b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_proxys_set.sh index aed3070306..0968b00d9b 100755 --- a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_proxys_set.sh +++ b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_proxys_set.sh @@ -474,6 +474,48 @@ cat >> "$SERVER_FILE" <<-EOF proxies: - DIRECT - Proxy +- name: Netflix + type: select + proxies: + - GlobalTV + - DIRECT +EOF +cat /tmp/Proxy_Server >> $SERVER_FILE 2>/dev/null +if [ -f "/tmp/Proxy_Provider" ]; then +cat >> "$SERVER_FILE" <<-EOF + use: +EOF +fi +cat /tmp/Proxy_Provider >> $SERVER_FILE 2>/dev/null +cat >> "$SERVER_FILE" <<-EOF +- name: Spotify + type: select + proxies: + - GlobalTV + - DIRECT +EOF +cat /tmp/Proxy_Server >> $SERVER_FILE 2>/dev/null +if [ -f "/tmp/Proxy_Provider" ]; then +cat >> "$SERVER_FILE" <<-EOF + use: +EOF +fi +cat /tmp/Proxy_Provider >> $SERVER_FILE 2>/dev/null +cat >> "$SERVER_FILE" <<-EOF +- name: Steam + type: select + proxies: + - Proxy + - DIRECT +EOF +cat /tmp/Proxy_Server >> $SERVER_FILE 2>/dev/null +if [ -f "/tmp/Proxy_Provider" ]; then +cat >> "$SERVER_FILE" <<-EOF + use: +EOF +fi +cat /tmp/Proxy_Provider >> $SERVER_FILE 2>/dev/null +cat >> "$SERVER_FILE" <<-EOF - name: AdBlock type: select proxies: @@ -554,6 +596,9 @@ uci set openclash.config.GlobalTV="GlobalTV" uci set openclash.config.AsianTV="AsianTV" uci set openclash.config.Proxy="Proxy" uci set openclash.config.Apple="Apple" +uci set openclash.config.Netflix="Netflix" +uci set openclash.config.Spotify="Spotify" +uci set openclash.config.Steam="Steam" uci set openclash.config.AdBlock="AdBlock" uci set openclash.config.Netease_Music="Netease Music" uci set openclash.config.Speedtest="Speedtest" @@ -567,6 +612,9 @@ uci set openclash.config.Others="Others" uci add_list openclash.config.new_servers_group="Proxy" uci add_list openclash.config.new_servers_group="AsianTV" uci add_list openclash.config.new_servers_group="GlobalTV" + uci add_list openclash.config.new_servers_group="Netflix" + uci add_list openclash.config.new_servers_group="Spotify" + uci add_list openclash.config.new_servers_group="Steam" uci add_list openclash.config.new_servers_group="Telegram" uci add_list openclash.config.new_servers_group="Speedtest" uci add_list openclash.config.new_servers_group="Netease Music" diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_rules_change.sh b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_rules_change.sh index cbff8071e1..d2eef83159 100755 --- a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_rules_change.sh +++ b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_rules_change.sh @@ -24,6 +24,9 @@ if [ "$2" != 0 ]; then AsianTV=$(grep '##AsianTV:' "$4" |awk -F ':' '{print $2}') Proxy=$(grep '##Proxy:' "$4" |awk -F ':' '{print $2}') Apple=$(grep '##Apple:' "$4" |awk -F ':' '{print $2}') + Netflix=$(grep '##Netflix:' "$4" |awk -F ':' '{print $2}') + Spotify=$(grep '##Spotify:' "$4" |awk -F ':' '{print $2}') + Steam=$(grep '##Steam:' "$4" |awk -F ':' '{print $2}') AdBlock=$(grep '##AdBlock:' "$4" |awk -F ':' '{print $2}') Others=$(grep '##Others:' "$4" |awk -F ':' '{print $2}') Domestic=$(grep '##Domestic:' "$4" |awk -F ':' '{print $2}') @@ -51,6 +54,9 @@ if [ "$2" != 0 ]; then || [ "$(uci get openclash.config.AsianTV)" != "$AsianTV" ]\ || [ "$(uci get openclash.config.Proxy)" != "$Proxy" ]\ || [ "$(uci get openclash.config.Apple)" != "$Apple" ]\ + || [ "$(uci get openclash.config.Netflix)" != "$Netflix" ]\ + || [ "$(uci get openclash.config.Spotify)" != "$Spotify" ]\ + || [ "$(uci get openclash.config.Steam)" != "$Steam" ]\ || [ "$(uci get openclash.config.AdBlock)" != "$AdBlock" ]\ || [ "$(uci get openclash.config.Netease_Music)" != "$Netease_Music" ]\ || [ "$(uci get openclash.config.Speedtest)" != "$Speedtest" ]\ @@ -67,6 +73,9 @@ if [ "$2" != 0 ]; then AsianTV=$(uci get openclash.config.AsianTV 2>/dev/null) Proxy=$(uci get openclash.config.Proxy 2>/dev/null) Apple=$(uci get openclash.config.Apple 2>/dev/null) + Netflix=$(uci get openclash.config.Netflix 2>/dev/null) + Spotify=$(uci get openclash.config.Spotify 2>/dev/null) + Steam=$(uci get openclash.config.Steam 2>/dev/null) AdBlock=$(uci get openclash.config.AdBlock 2>/dev/null) Netease_Music=$(uci get openclash.config.Netease_Music 2>/dev/null) Speedtest=$(uci get openclash.config.Speedtest 2>/dev/null) @@ -80,6 +89,9 @@ if [ "$2" != 0 ]; then -e "s/,AsianTV/,${AsianTV}#d/g" -e "/Rule:/a\##AsianTV:${AsianTV}"\ -e "s/,Proxy/,${Proxy}#d/g" -e "/Rule:/a\##Proxy:${Proxy}"\ -e "s/,Apple/,${Apple}#d/g" -e "/Rule:/a\##Apple:${Apple}"\ + -e "s/,Netflix/,${Netflix}#d/g" -e "/Rule:/a\##Netflix:${Netflix}"\ + -e "s/,Spotify/,${Spotify}#d/g" -e "/Rule:/a\##Spotify:${Spotify}"\ + -e "s/,Steam/,${Steam}#d/g" -e "/Rule:/a\##Steam:${Steam}"\ -e "s/,AdBlock/,${AdBlock}#d/g" -e "/Rule:/a\##AdBlock:${AdBlock}"\ -e "s/,Netease Music/,${Netease_Music}#d/g" -e "/Rule:/a\##Netease_Music:${Netease_Music}"\ -e "s/,Speedtest/,${Speedtest}#d/g" -e "/Rule:/a\##Speedtest:${Speedtest}"\ diff --git a/package/ctcgfw/luci-app-openclash/i18n/zh_Hans/openclash.zh-cn.po b/package/ctcgfw/luci-app-openclash/i18n/zh_Hans/openclash.zh-cn.po index 4dcbb33983..9d12fdea94 100644 --- a/package/ctcgfw/luci-app-openclash/i18n/zh_Hans/openclash.zh-cn.po +++ b/package/ctcgfw/luci-app-openclash/i18n/zh_Hans/openclash.zh-cn.po @@ -412,6 +412,15 @@ msgstr "必须代理的流量" msgid "Apple" msgstr "苹果服务流量" +msgid "Netflix" +msgstr "Netflix流量" + +msgid "Spotify" +msgstr "Spotify流量" + +msgid "Steam" +msgstr "Steam流量（非下载流量）" + msgid "Netease Music" msgstr "网易云音乐流量"