From 45fb918f28808c7fc47d00cbedbf02afbd24afc4 Mon Sep 17 00:00:00 2001 From: Conners Hua Date: Sat, 22 Aug 2020 13:11:18 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=F0=9F=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Quantumult/Global.conf | 4 +--- Surge/Global.conf | 12 ++---------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/Quantumult/Global.conf b/Quantumult/Global.conf index 3090886..01522b6 100644 --- a/Quantumult/Global.conf +++ b/Quantumult/Global.conf @@ -117,8 +117,6 @@ static=Guard, reject, direct, img-url=https://raw.githubusercontent.com/Koolson/ # 当有强制策略时，远程资源的过滤器中的策略将被忽略，并使用强制策略。 # -https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Filter/Extra/Apple/BlockiOSUpdate.list, tag=⛔️Block iOS Update, enabled=false - # Unbreak 后续规则修正 https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Filter/Unbreak.list, tag=🔂Unbreak, enabled=true @@ -155,7 +153,7 @@ https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Filter https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Rewrite/General.conf, tag=🔀General, enabled=true # Advertising 广告 -https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Rewrite/Advertising.conf, tag=🛡在「重写规则」搜「script」缓存脚本, enabled=true +https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Rewrite/Advertising.conf, tag=🛡「重写规则」搜「script」缓存脚本, enabled=true # YouTube 广告 https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Rewrite/YouTube.conf, tag=🛡YouTube Premium 禁用, enabled=false diff --git a/Surge/Global.conf b/Surge/Global.conf index 5c4ef97..5cd2949 100644 --- a/Surge/Global.conf +++ b/Surge/Global.conf @@ -124,7 +124,6 @@ hide-udp=0 🦆DuckDuckGo = select, policy-path=https://duckduckgo.security/user/sub.php?token=DivineEngine [Rule] -# CUSTOM RULE # https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Filter/Extra/Apple/BlockiOSUpdate.list,⛔️Reject # Client @@ -189,14 +188,12 @@ FINAL,🧭Final,dns-failed [Host] mtalk.google.com = 108.177.125.188 -# CUSTOM HOST [Header Rewrite] -# CUSTOM HEADER +# 据粗略统计，有大概三分之二的本项目使用者停留在了 Surge 2、3 时期故而保留了 Rewrite 及 MitM，所以如果你解锁了「模块」功能可以使用 sgmodule 后清空 [URL Rewrite] 及 [MITM] 部分，MitM 证书重新生成配置。 -# 如果你解锁了「模块」功能可以使用 sgmodule 后删除以下 Rewrite 几 MitM 部分 -# 建议必选使用 General.sgmodule +# 建议必选使用 General.sgmodule，其他 .sgmodule 按需加入 [URL Rewrite] # Redirect Google Search Service @@ -747,15 +744,10 @@ mtalk.google.com = 108.177.125.188 ^(http|https):\/\/webboot\.zhangyue\.com\/zycl\/api\/ad\/ - reject ^(http|https):\/\/saad\.ms\.zhangyue\.net\/ad - reject -# CUSTOM URL - [Script] -# CUSTOM SCRIPT [SSID Setting] -# CUSTOM SSID -# MitM 主要用于去广告，如不需要 [URL Rewrite] 中的去广告以下皆可删除 [MITM] skip-server-cert-verify = true hostname = www.google.cn,api.abema.io,api.21jingji.com,service.4gtv.tv,app.58.com,pic?.ajkimg.com,gw.alicdn.com,heic.alicdn.com,acs.m.taobao.com,m*.amap.com,api-new.app.acfun.cn,api.bjxkhc.com,*.amemv.com,*.snssdk.com,issuecdn.baidupcs.com,newclient.map.baidu.com,mime.baidu.com,app.bilibili.com,manga.bilibili.com,channel.beitaichufang.com,iapi.bishijie.com,app.api.ke.com,www.bodivis.com.cn,yxyapi*.drcuiyutao.com,clientaccess.10086.cn,m.client.10010.com,cloud.189.cn,api.chelaile.net.cn,web.chelaile.net.cn,cap.caocaokeji.cn,api.caijingmobile.com,gw.csdn.net,app.poizon.com,api.douban.com,rtbapi.douyucdn.cn,e.dangdang.com,daoyu.sdo.com,*.daydaycook.com,maicai.api.ddxq.mobi,mobile-api2011.elong.com,123.59.31.1,119.18.193.135,cube.elemecdn.com,i.ys7.com,www.flyertea.com,dsa-mfp.fengshows.cn,api.feng.com,*-release.wuta-cam.com,*.youtube.com,gateway.shouqiev.com,dl.app.gtja.com,prom.mobile.gome.com.cn,smkmp.96225.com,api.huomao.com,imeclient.openspeech.cn,api.intsig.net,ih2.ireader.com,nnapp.cloudbae.cn,ib-soft.net,api.m.jd.com,ms.jr.jd.com,img*.360buyimg.com,api.jxedt.com,richmanapi.jxedt.com,*.kakamobi.cn,app-api.jinse.com,ios.wps.cn,*.kingsoft-office-service.com,api.gotokeep.com,api.kkmh.com,122.14.246.33,175.102.178.52,api.jr.mi.com,api-mifit*.huami.com,api.mgzf.com,cdn.moji.com,img.meituan.net,p*.meituan.net,s3plus.meituan.net,flowplus.meituan.net,capi.mwee.cn,mapi.mafengwo.cn,app.mixcapp.com,appconf.mail.163.com,c.m.163.com,client.mail.163.com,interface*.music.163.com,59.111.181.*,sp.kaola.com,support.you.163.com,p.du.163.com,app-api.niu.com,slapi.oray.net,pss.txffp.com,api.yangkeduo.com,mrobot.pconline.com.cn,mrobot.pcauto.com.cn,open.qyer.com,media.qyer.com,api.qbb6.com,mage.if.qidian.com,msspjh.emarbox.com,api.rr.tv,*.uve.weibo.com,weibointl.api.weibo.cn,api.weibo.cn,mapi.weibo.com,tqt.weibo.cn,*.k.sohu.com,*.tv.sohu.com,ap*.smzdm.com,gw-passenger.01zhuanche.com,mpcs.suning.com,ccsp-egmas.sf-express.com,consumer.fcbox.com,g.cdn.pengpengla.com,snailsleep.net,api*.futunn.com,ssl.kohsocialapp.qq.com,4gimg.map.qq.com,r.inews.qq.com,news.ssp.qq.com,mp.weixin.qq.com,m.tuniu.com,mob.mddcloud.com,img*.10101111cdn.com,api.vuevideo.net,app.variflight.com,api.cdmcaac.com,api.vistopia.com.cn,app.wy.guahao.com,thor.weidian.com,api.xiachufang.com,api.psy-1.com,portal-xunyou.qingcdn.com,api.xueqiu.com,promo.xueqiu.com,182.92.251.113,app.yinxiang.com,restapi.iyunmai.com,api.zhihu.com,118.89.204.198,a.qiumibao.com,*.zhuishushenqi.com,www.zybang.com,api.izuiyou.com,tiku.zhan.com,webboot.zhangyue.com,saad.ms.zhangyue.net From ad6cda7d2ea12f477ae89b2ee967d4fb11370e09 Mon Sep 17 00:00:00 2001 From: Conners Hua Date: Sat, 22 Aug 2020 14:28:17 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=F0=9F=90=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Surge/Module/Unlock/TikTokJP.sgmodule | 2 +- Surge/Module/Unlock/TikTokKR.sgmodule | 2 +- Surge/Module/Unlock/TikTokTW.sgmodule | 2 +- Surge/Module/Unlock/TikTokUK.sgmodule | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Surge/Module/Unlock/TikTokJP.sgmodule b/Surge/Module/Unlock/TikTokJP.sgmodule index 3e0dc6e..00169ac 100644 --- a/Surge/Module/Unlock/TikTokJP.sgmodule +++ b/Surge/Module/Unlock/TikTokJP.sgmodule @@ -5,7 +5,7 @@ [URL Rewrite] (?<=_region=)CN(?=&) JP 307 (?<=&app_version=)1[6-9]..(?=.?.?&) 1 307 -(?<=&app_version=)1[6-9]..(?=.?.?&) 1 307 +(?<=\?version_code=)1[6-9]..(?=.?.?&) 1 307 [MITM] hostname = %INSERT% *.tiktokv.com, *.byteoversea.com, *.musical.ly, *.snssdk.com \ No newline at end of file diff --git a/Surge/Module/Unlock/TikTokKR.sgmodule b/Surge/Module/Unlock/TikTokKR.sgmodule index 4e7cf07..73b9ba4 100644 --- a/Surge/Module/Unlock/TikTokKR.sgmodule +++ b/Surge/Module/Unlock/TikTokKR.sgmodule @@ -5,7 +5,7 @@ [URL Rewrite] (?<=_region=)CN(?=&) KR 307 (?<=&app_version=)1[6-9]..(?=.?.?&) 1 307 -(?<=&app_version=)1[6-9]..(?=.?.?&) 1 307 +(?<=\?version_code=)1[6-9]..(?=.?.?&) 1 307 [MITM] hostname = %INSERT% *.tiktokv.com, *.byteoversea.com, *.musical.ly, *.snssdk.com \ No newline at end of file diff --git a/Surge/Module/Unlock/TikTokTW.sgmodule b/Surge/Module/Unlock/TikTokTW.sgmodule index 1843616..58c71b6 100644 --- a/Surge/Module/Unlock/TikTokTW.sgmodule +++ b/Surge/Module/Unlock/TikTokTW.sgmodule @@ -5,7 +5,7 @@ [URL Rewrite] (?<=_region=)CN(?=&) TW 307 (?<=&app_version=)1[6-9]..(?=.?.?&) 1 307 -(?<=&app_version=)1[6-9]..(?=.?.?&) 1 307 +(?<=\?version_code=)1[6-9]..(?=.?.?&) 1 307 [MITM] hostname = %INSERT% *.tiktokv.com, *.byteoversea.com, *.musical.ly, *.snssdk.com \ No newline at end of file diff --git a/Surge/Module/Unlock/TikTokUK.sgmodule b/Surge/Module/Unlock/TikTokUK.sgmodule index c8327f8..76abaf5 100644 --- a/Surge/Module/Unlock/TikTokUK.sgmodule +++ b/Surge/Module/Unlock/TikTokUK.sgmodule @@ -5,7 +5,7 @@ [URL Rewrite] (?<=_region=)CN(?=&) UK 307 (?<=&app_version=)1[6-9]..(?=.?.?&) 1 307 -(?<=&app_version=)1[6-9]..(?=.?.?&) 1 307 +(?<=\?version_code=)1[6-9]..(?=.?.?&) 1 307 [MITM] hostname = %INSERT% *.tiktokv.com, *.byteoversea.com, *.musical.ly, *.snssdk.com \ No newline at end of file From c728f386ac4d11c9cd0a56d15070b930f0dda3e7 Mon Sep 17 00:00:00 2001 From: Conners Hua Date: Sat, 22 Aug 2020 19:05:43 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=F0=9F=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Quantumult/Filter/Guard/Advertising.list | 1 - Surge/Ruleset/Guard/Advertising.list | 1 - 2 files changed, 2 deletions(-) diff --git a/Quantumult/Filter/Guard/Advertising.list b/Quantumult/Filter/Guard/Advertising.list index efe4fcc..d183f68 100644 --- a/Quantumult/Filter/Guard/Advertising.list +++ b/Quantumult/Filter/Guard/Advertising.list @@ -532,7 +532,6 @@ DOMAIN,ads.yahoo.de,REJECT USER-AGENT,AVOS*,REJECT DOMAIN,appcloud2.zhihu.com,REJECT DOMAIN,sugar.zhihu.com,REJECT -IP-CIDR,118.89.204.198/32,REJECT # > ZOL DOMAIN,apppv.zol.com.cn,REJECT DOMAIN,pvnapp.zol.com.cn,REJECT \ No newline at end of file diff --git a/Surge/Ruleset/Guard/Advertising.list b/Surge/Ruleset/Guard/Advertising.list index 69863a8..30f85d0 100644 --- a/Surge/Ruleset/Guard/Advertising.list +++ b/Surge/Ruleset/Guard/Advertising.list @@ -532,7 +532,6 @@ DOMAIN,ads.yahoo.de USER-AGENT,AVOS* DOMAIN,appcloud2.zhihu.com DOMAIN,sugar.zhihu.com -IP-CIDR,118.89.204.198/32,no-resolve # > ZOL DOMAIN,apppv.zol.com.cn DOMAIN,pvnapp.zol.com.cn \ No newline at end of file From 2f4fb4b8a83bc7ef6891307bfe03a2129865013a Mon Sep 17 00:00:00 2001 From: Conners Hua Date: Sat, 22 Aug 2020 20:50:03 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=F0=9F=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Quantumult/Global.conf | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/Quantumult/Global.conf b/Quantumult/Global.conf index 01522b6..dbdb14f 100644 --- a/Quantumult/Global.conf +++ b/Quantumult/Global.conf @@ -21,10 +21,10 @@ server_check_url=http://www.gstatic.com/generate_204 # DNS 排除列表 # dns_exclusion_list 包含了禁用占位符 IP (240.*) 的域，不在 dns_exclusion_list 中的域都启用了占位符 IP，并打开了 resolve-on-remote 设置。 -dns_exclusion_list = *.cmpassport.com, *.jegotrip.com.cn, *.icitymobile.mobi, id6.me, *.icitymobile.mobi, *.pingan.com.cn, *.cmbchina.com, *.localnetwork.uop, mfs.ykimg.com*.ttf +dns_exclusion_list=*.cmpassport.com, *.jegotrip.com.cn, *.icitymobile.mobi, id6.me, *.icitymobile.mobi, *.pingan.com.cn, *.cmbchina.com, *.localnetwork.uop, mfs.ykimg.com*.ttf # Quantumult 将不会处理到 excluded_routes 的流量。修改后最好重新启动您的设备。 -;excluded_routes= 192.168.0.0/16, 172.16.0.0/12, 100.64.0.0/10, 10.0.0.0/8 +;excluded_routes=192.168.0.0/16, 172.16.0.0/12, 100.64.0.0/10, 10.0.0.0/8 # 在网络环境切换时出发运行模式变更 # filter - 规则分流，all_proxy - 全部代理，all_direct - 全部直连 @@ -118,31 +118,31 @@ static=Guard, reject, direct, img-url=https://raw.githubusercontent.com/Koolson/ # # Unbreak 后续规则修正 -https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Filter/Unbreak.list, tag=🔂Unbreak, enabled=true +https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Filter/Unbreak.list, tag=🔂Unbreak, update-interval=86400, enabled=true # Advertising 广告 -https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Filter/Guard/Advertising.list, tag=🛡Advertising, force-policy=Guard, enabled=true +https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Filter/Guard/Advertising.list, tag=🛡Advertising, update-interval=86400, force-policy=Guard, enabled=true # Privacy 隐私 -https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Filter/Guard/Privacy.list, tag=🛡️Privacy, force-policy=Guard, enabled=false +https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Filter/Guard/Privacy.list, tag=🛡️Privacy, update-interval=86400, force-policy=Guard, enabled=false # Hijacking 运营商劫持或恶意网站 -https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Filter/Guard/Hijacking.list, tag=🛡️Hijacking, force-policy=Guard, enabled=true +https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Filter/Guard/Hijacking.list, tag=🛡️Hijacking, update-interval=86400, force-policy=Guard, enabled=true # Streaming 国际流媒体服务 -https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Filter/StreamingMedia/Streaming.list, tag=🎞Streaming, enabled=true +https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Filter/StreamingMedia/Streaming.list, tag=🎞Streaming, update-interval=86400, enabled=true # StreamingSE 中国流媒体服务(面向海外版本) -https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Filter/StreamingMedia/StreamingSE.list, tag=🎞StreamingSE, enabled=true +https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Filter/StreamingMedia/StreamingSE.list, tag=🎞StreamingSE, update-interval=86400, enabled=true # Global 全球加速 -https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Filter/Global.list, tag=🇺🇳Global, enabled=true +https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Filter/Global.list, tag=🇺🇳Global, update-interval=86400, enabled=true # China 中国直连 -https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Filter/China.list, tag=🇨🇳China, enabled=true +https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Filter/China.list, tag=🇨🇳China, update-interval=86400, enabled=true # 使用来自 ipipdotnet 的 ChinaIP 以解决数据不准确的问题，使用 ChinaIP.list 时禁用「GEOIP,CN」规则 -https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Filter/Extra/ChinaIP.list, tag=🇨🇳ChinaIP(与「geoip, cn, direct」二选一), enabled=true +https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Filter/Extra/ChinaIP.list, tag=🇨🇳ChinaIP(与「geoip, cn, direct」二选一), update-interval=86400, enabled=true [rewrite_remote] # @@ -150,22 +150,22 @@ https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Filter # # 通用 -https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Rewrite/General.conf, tag=🔀General, enabled=true +https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Rewrite/General.conf, tag=🔀General, update-interval=86400, enabled=true # Advertising 广告 -https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Rewrite/Advertising.conf, tag=🛡「重写规则」搜「script」缓存脚本, enabled=true +https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Rewrite/Advertising.conf, tag=🛡「重写规则」搜「script」缓存脚本, update-interval=86400, enabled=true # YouTube 广告 -https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Rewrite/YouTube.conf, tag=🛡YouTube Premium 禁用, enabled=false +https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Rewrite/YouTube.conf, tag=🛡YouTube Premium 禁用, update-interval=86400, enabled=false # TikTok -https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Rewrite/Unlock/TikTokJP.conf, tag=🔓TikTokJP(多选一不可共用), enabled=false -https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Rewrite/Unlock/TikTokKR.conf, tag=🔓TikTokKR(多选一不可共用), enabled=false -https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Rewrite/Unlock/TikTokTW.conf, tag=🔓TikTokTW(多选一不可共用), enabled=false -https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Rewrite/Unlock/TikTokUK.conf, tag=🔓TikTokUK(多选一不可共用), enabled=false +https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Rewrite/Unlock/TikTokJP.conf, tag=🔓TikTokJP(多选一不可共用), update-interval=86400, enabled=false +https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Rewrite/Unlock/TikTokKR.conf, tag=🔓TikTokKR(多选一不可共用), update-interval=86400, enabled=false +https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Rewrite/Unlock/TikTokTW.conf, tag=🔓TikTokTW(多选一不可共用), update-interval=86400, enabled=false +https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Rewrite/Unlock/TikTokUK.conf, tag=🔓TikTokUK(多选一不可共用), update-interval=86400, enabled=false # Resso -https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Rewrite/Resso.conf, tag=🔓Resso, enabled=false +https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Rewrite/Resso.conf, tag=🔓Resso, update-interval=86400, enabled=false [server_local] # @@ -209,7 +209,7 @@ final, Final # [task_local] 完整示例请查看「示例」 -[http_backend] +# [http_backend] # # 部署一个本地 HTTP 服务器，并使用 JavaScript 进行数据处理。 # 输入变量为：$reqeust.url、$reqeust.path、$reqeust.headers、$reqeust.body。 From d0e3994aa1eb00bb2818333e4ae7615dacdc6458 Mon Sep 17 00:00:00 2001 From: Conners Hua Date: Mon, 24 Aug 2020 17:33:07 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=F0=9F=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Clash/ProxyList/ALL.yaml | 30 ++++++++++++++++++++++++++++++ Clash/ProxyList/US.yaml | 30 ++++++++++++++++++++++++++++++ Surge/Module/General.sgmodule | 2 +- 3 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 Clash/ProxyList/ALL.yaml create mode 100644 Clash/ProxyList/US.yaml diff --git a/Clash/ProxyList/ALL.yaml b/Clash/ProxyList/ALL.yaml new file mode 100644 index 0000000..9798c18 --- /dev/null +++ b/Clash/ProxyList/ALL.yaml @@ -0,0 +1,30 @@ +proxies: + - name: "1" + type: socks5 + server: server + port: 443 + # username: username + # password: password + # tls: true + # skip-cert-verify: true + # udp: true + + - name: "2" + type: socks5 + server: server + port: 443 + # username: username + # password: password + # tls: true + # skip-cert-verify: true + # udp: true + + - name: "3" + type: socks5 + server: server + port: 443 + # username: username + # password: password + # tls: true + # skip-cert-verify: true + # udp: true \ No newline at end of file diff --git a/Clash/ProxyList/US.yaml b/Clash/ProxyList/US.yaml new file mode 100644 index 0000000..7891442 --- /dev/null +++ b/Clash/ProxyList/US.yaml @@ -0,0 +1,30 @@ +proxies: + - name: "US1" + type: socks5 + server: server + port: 443 + # username: username + # password: password + # tls: true + # skip-cert-verify: true + # udp: true + + - name: "US2" + type: socks5 + server: server + port: 443 + # username: username + # password: password + # tls: true + # skip-cert-verify: true + # udp: true + + - name: "US3" + type: socks5 + server: server + port: 443 + # username: username + # password: password + # tls: true + # skip-cert-verify: true + # udp: true \ No newline at end of file diff --git a/Surge/Module/General.sgmodule b/Surge/Module/General.sgmodule index c6f2e74..22617b7 100644 --- a/Surge/Module/General.sgmodule +++ b/Surge/Module/General.sgmodule @@ -1,5 +1,5 @@ #!name=URL Optimization -#!desc=Google 搜索及地图、微博短链接白名单、AbeamTV 区域限制的解锁几一些体验增强 +#!desc=通用的 URL 优化，包含 Google 搜索及地图、微博短链接白名单、AbeamTV 区域限制等体验增强 [URL Rewrite] # Redirect Google Search Service From 09ffa2d837ec34f104dcff5a7d286fa2fedc512e Mon Sep 17 00:00:00 2001 From: Conners Hua Date: Mon, 24 Aug 2020 17:59:25 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=F0=9F=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Clash/Global.yaml | 80 ++++++++++++++++++------- Clash/ProxyList/{ALL.yaml => List.yaml} | 0 Clash/README.md | 9 +++ 3 files changed, 66 insertions(+), 23 deletions(-) rename Clash/ProxyList/{ALL.yaml => List.yaml} (100%) create mode 100644 Clash/README.md diff --git a/Clash/Global.yaml b/Clash/Global.yaml index 7a40a09..a34f246 100644 --- a/Clash/Global.yaml +++ b/Clash/Global.yaml @@ -125,7 +125,7 @@ proxies: # 支持的协议及加密算法示例请查阅 Clash 项目 README 以使用最新格式：https://github.com/Dreamacro/clash/blob/master/README.md # Shadowsocks(Websocket + TLS) - - name: "HK" + - name: "1" type: ss server: server port: 443 @@ -143,7 +143,7 @@ proxies: # custom: value # VMess(Websocket + TLS) - - name: "US" + - name: "2" type: vmess server: v2ray.cool port: 443 @@ -159,7 +159,7 @@ proxies: # Host: v2ray.com # Trojan - - name: "SG" + - name: "3" type: trojan server: server port: 443 @@ -191,16 +191,28 @@ proxy-providers: # 1.模式选择「进阶模式」 2.填写订阅链接 3.勾选「输出为 Node List」 4.「生成订阅链接」 # - DuckDuckGo-Sub: # 冲鸭机场订阅链接 + # 此处只是订阅示例，如果没有订阅链接的使用需求，此处及 proxy-groups 的相关内容可删除 + + DuckDuckGoList: #「冲鸭机场」订阅 type: http - url: "https://duckduckgo.security/user/sub.php?token=DivineEngine" + url: "https://raw.githubusercontent.com/DivineEngine/Profiles/master/Clash/ProxyList/List.yaml" # 放机场订阅链接 interval: 3600 - path: ./Proxy/ProxyList.yaml # 不同机场不同命名 + path: ./Proxy/ALL.yaml # 注意此处文件名不可相同 health-check: enable: true interval: 600 url: http://www.gstatic.com/generate_204 + # DuckDuckGoUS: #「冲鸭机场」订阅美国地区节点 + # type: http + # url: "https://raw.githubusercontent.com/DivineEngine/Profiles/master/Clash/ProxyList/US.yaml" # 放机场订阅链接 + # interval: 3600 + # path: ./Proxy/US.yaml # 注意此处文件名不可相同 + # health-check: + # enable: true + # interval: 600 + # url: http://www.gstatic.com/generate_204 + proxy-groups: # 策略组示例请查阅 Clash 项目 README 以使用最新格式：https://github.com/Dreamacro/clash/blob/master/README.md @@ -214,13 +226,39 @@ proxy-groups: # 「PROXY」是代理规则策略，它可以指定为某个节点或嵌套一个其他策略组，如：「自动测试」、「Fallback」或「负载均衡」的策略组，关于这 3 个策略组的具体示例可以看官方示例：https://github.com/Dreamacro/clash # + # 注意此处的「use」而不是「proxies」，当然也可以不用在此先嵌套一个策略组进行选择，可以直接使用，如 + # + # # 代理节点选择 + # - name: "PROXY" + # type: select + # use: + # - DuckDuckGo # 嵌套使用订阅节点策略组 + # proxies: + # - Fallback + # - 1 + # - 2 + # - 3 + # + # 但如果订阅节点很多选起来就很麻烦，不如先嵌套一个策略组进行手动或自动的选择。 + + # 手动选择订阅节点 + - name: "DuckDuckGo" + type: select # 亦可使用 fallback 或 load-balance + use: # 注意此处是「use」 + - DuckDuckGoList # 这是上面「proxy-providers」的名称 + + # - name: "US" + # type: select # 亦可使用 fallback 或 load-balance + # use: # 注意此处是「use」 + # - DuckDuckGoUS # 这是上面「proxy-providers」的名称 + # Fallback 比较实用的策略组类型，用于测试服务器节点的可用性，当第一个节点不可用时切换到第二个，以此类推。 - name: "Fallback" type: fallback proxies: - - HK - - US - - SG + - 1 + - 2 + - 3 url: 'http://www.gstatic.com/generate_204' interval: 300 @@ -229,10 +267,10 @@ proxy-groups: type: select proxies: - Fallback - - HK - - US - - SG - - DuckDuckGo + - 1 + - 2 + - 3 + - DuckDuckGo # 嵌套使用订阅节点策略组 # 白名单模式 PROXY, 黑名单模式 DIRECT, 不知道别动 - name: "MATCH" @@ -246,22 +284,18 @@ proxy-groups: type: select proxies: - PROXY - - HK - - US - - SG + - 1 + - 2 + - 3 + # - US # 中国流媒体服务（面向海外版本） + # 用于观看部分国内流媒体面向港澳台的地区的限定内容，此处应放港澳台节点，如果没有此需求可删除此处策略组及相关规则 - name: "StreamingSE" type: select proxies: - DIRECT - - HK - - # 手动选择节点订阅 - - name: "DuckDuckGo" - type: select # 亦可使用 fallback 或 load-balance - use: - - DuckDuckGo-Sub + - 2 # 关于 Rule Provider 请查阅：https://lancellc.gitbook.io/clash/clash-config-file/rule-provider diff --git a/Clash/ProxyList/ALL.yaml b/Clash/ProxyList/List.yaml similarity index 100% rename from Clash/ProxyList/ALL.yaml rename to Clash/ProxyList/List.yaml diff --git a/Clash/README.md b/Clash/README.md new file mode 100644 index 0000000..ecb3c46 --- /dev/null +++ b/Clash/README.md @@ -0,0 +1,9 @@ +## 使用须知 + +1. `raw.githubusercontent.com` 已被污染，需自行在系统的 hosts 解决污染问题或使用其他 CDN 域名，在 Clash 配置内无效。 + +2. 一般来说，只需要配置节点信息即可使用。 +自建用户：直接修改预设的 `1`、`2`、`3` 节点信息即可（更多协议配置示例参考官方 [Wiki](https://github.com/Dreamacro/clash/wiki/configuration)）。注意！如果修改了节点名，则策略组 `proxy-groups` 部分的名字也需要修改。 +订阅用户：参照修改 `proxy-providers` 的订阅配置示例及策略组 `proxy-groups` 部分的引用配置即可。 + +虽然直接配置好后即可使用，但建议阅读 [Wiki](https://github.com/Dreamacro/clash/wiki/configuration)。 \ No newline at end of file From 215816718dbb732364581b527bb5fd117e376e00 Mon Sep 17 00:00:00 2001 From: Conners Hua Date: Mon, 24 Aug 2020 18:04:21 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=F0=9F=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Clash/Global.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Clash/Global.yaml b/Clash/Global.yaml index a34f246..ca6fc4d 100644 --- a/Clash/Global.yaml +++ b/Clash/Global.yaml @@ -197,7 +197,7 @@ proxy-providers: type: http url: "https://raw.githubusercontent.com/DivineEngine/Profiles/master/Clash/ProxyList/List.yaml" # 放机场订阅链接 interval: 3600 - path: ./Proxy/ALL.yaml # 注意此处文件名不可相同 + path: ./Proxy/List.yaml # 注意此处文件名不可相同 health-check: enable: true interval: 600