From e5ebe796ad38ac4e29cfe5899dfb0250c7ef3094 Mon Sep 17 00:00:00 2001 From: Conners Hua Date: Thu, 1 Apr 2021 00:17:09 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Clash/Outbound.yaml | 4 ++++ Quantumult/Rewrite/Block/Advertising.conf | 2 +- Quantumult/Rewrite/General.conf | 3 --- Surge/Module/Block/Advertising.sgmodule | 2 +- Surge/Module/Game-Console-SNAT.sgmodule | 6 ------ Surge/Module/General.sgmodule | 5 +---- Surge/Outbound.conf | 5 +---- Surge/Shortcuts/reject.txt | 2 +- 8 files changed, 9 insertions(+), 20 deletions(-) delete mode 100644 Surge/Module/Game-Console-SNAT.sgmodule diff --git a/Clash/Outbound.yaml b/Clash/Outbound.yaml index eb961db..b03a98a 100644 --- a/Clash/Outbound.yaml +++ b/Clash/Outbound.yaml @@ -103,6 +103,10 @@ dns: - '+.xboxlive.com' - 'msftconnecttest.com' - 'xbox.*.microsoft.com' + - '*.battlenet.com.cn' + - '*.battlenet.com' + - '*.blzstatic.cn' + - '*.battle.net' # Supports UDP, TCP, DoT, DoH. You can specify the port to connect to. # All DNS questions are sent directly to the nameserver, without proxies diff --git a/Quantumult/Rewrite/Block/Advertising.conf b/Quantumult/Rewrite/Block/Advertising.conf index b8e971e..da52669 100644 --- a/Quantumult/Rewrite/Block/Advertising.conf +++ b/Quantumult/Rewrite/Block/Advertising.conf @@ -272,7 +272,7 @@ hostname = -lark-frontier-hl.snssdk.com,api.21jingji.com,service.4gtv.tv,app.58. # > ManHuaRen ^https?:\/\/mangaapi\.manhuaren\.com\/v\d\/public\/getStartPageAds url reject # > Meituan-Dianping - img.meituan.net,p*.meituan.net,s3plus.meituan.net,flowplus.meituan.net -^https?:\/\/img\.meituan\.net\/(adunion|display|midas)\/\w+\.(gif|jpg|jpg\.webp)$ url reject +^https?:\/\/img\.meituan\.net\/(adunion|display|dpmobile|midas)\/\w+\.(gif|jpg|jpg\.webp)$ url reject ^https?:\/\/(s3plus|flowplus)\.meituan\.net\/v\d\/\w+\/linglong\/\w+\.(gif|jpg|mp4) url reject ^https?:\/\/p\d\.meituan\.net\/(bizad|wmbanner)\/\w+\.jpg url reject ^https?:\/\/p\d\.meituan\.net\/movie\/\w+\.jpg\?may_covertWebp url reject diff --git a/Quantumult/Rewrite/General.conf b/Quantumult/Rewrite/General.conf index 105510d..79080e3 100644 --- a/Quantumult/Rewrite/General.conf +++ b/Quantumult/Rewrite/General.conf @@ -14,9 +14,6 @@ hostname = www.google.cn,api.abema.io ^(http|https):\/\/(www.)?suning\.com\/ url 302 https://suning.com/ ^(http|https):\/\/(www.)?yhd\.com\/ url 302 https://yhd.com/ -# Weibo Short URL -# ^http:\/\/t\.cn url 302 http://sinaurl.cn - # Redirect False to True # > IGN China to IGN Global ^(http|https):\/\/(www.)?ign\.xn--fiqs8s\/ url 302 http://cn.ign.com/ccpref/us diff --git a/Surge/Module/Block/Advertising.sgmodule b/Surge/Module/Block/Advertising.sgmodule index 57962bc..e1b3cca 100644 --- a/Surge/Module/Block/Advertising.sgmodule +++ b/Surge/Module/Block/Advertising.sgmodule @@ -274,7 +274,7 @@ URL-REGEX,^https?:\/\/api\.m\.jd.com\/client\.action\?functionId=start,REJECT-TI # > ManHuaRen ^https?:\/\/mangaapi\.manhuaren\.com\/v\d\/public\/getStartPageAds - reject # > Meituan-Dianping - img.meituan.net,p*.meituan.net,s3plus.meituan.net,flowplus.meituan.net -^https?:\/\/img\.meituan\.net\/(adunion|display|midas)\/\w+\.(gif|jpg|jpg\.webp)$ - reject +^https?:\/\/img\.meituan\.net\/(adunion|display|dpmobile|midas)\/\w+\.(gif|jpg|jpg\.webp)$ - reject ^https?:\/\/(s3plus|flowplus)\.meituan\.net\/v\d\/\w+\/linglong\/\w+\.(gif|jpg|mp4) - reject ^https?:\/\/p\d\.meituan\.net\/(bizad|wmbanner)\/\w+\.jpg - reject ^https?:\/\/p\d\.meituan\.net\/movie\/\w+\.jpg\?may_covertWebp - reject diff --git a/Surge/Module/Game-Console-SNAT.sgmodule b/Surge/Module/Game-Console-SNAT.sgmodule deleted file mode 100644 index 72a0e85..0000000 --- a/Surge/Module/Game-Console-SNAT.sgmodule +++ /dev/null @@ -1,6 +0,0 @@ -#!name=Game Console SNAT -#!desc=让 Surge 为 PlayStation、Xbox 和 Nintendo Switch 正确处理 SNAT 对话。只有当 Surge Mac 作为这些设备的路由器（Surge Mac 开启「增强模式」，修改游戏机的网络配置：1.IP 地址及子网掩码保持不变。2.网关设置成 Mac 的 IP 地址.3.DNS 设置为「198.18.0.2」）时才会有用（https://nssurge.zendesk.com/hc/zh-cn/articles/900000208886-Surge-Mac-路由模式特殊设备兼容说明） -#!system=mac - -[General] -always-real-ip = %APPEND% *.srv.nintendo.net, *.stun.playstation.net, xbox.*.microsoft.com, *.xboxlive.com \ No newline at end of file diff --git a/Surge/Module/General.sgmodule b/Surge/Module/General.sgmodule index 5f9cacc..d378d34 100644 --- a/Surge/Module/General.sgmodule +++ b/Surge/Module/General.sgmodule @@ -18,7 +18,7 @@ skip-proxy = %APPEND% passenger.t3go.cn exclude-simple-hostnames = true # > Always Real IP Hosts -always-real-ip = %APPEND% msftconnecttest.com, msftncsi.com, *.msftconnecttest.com, *.msftncsi.com, *.srv.nintendo.net, *.stun.playstation.net, xbox.*.microsoft.com, *.xboxlive.com +always-real-ip = %APPEND% msftconnecttest.com, msftncsi.com, *.msftconnecttest.com, *.msftncsi.com, *.srv.nintendo.net, *.stun.playstation.net, xbox.*.microsoft.com, *.xboxlive.com, *.battlenet.com.cn, *.battlenet.com, *.blzstatic.cn, *.battle.net # > VIF Excluded Routes tun-excluded-routes = %APPEND% 239.255.255.250/32 @@ -38,9 +38,6 @@ tun-excluded-routes = %APPEND% 239.255.255.250/32 ^(http|https):\/\/(www.)?suning\.com\/ https://suning.com/ 302 ^(http|https):\/\/(www.)?yhd\.com\/ https://yhd.com/ 302 -# Weibo Short URL -^http:\/\/t\.cn http://sinaurl.cn 302 - # Redirect False to True # > IGN China to IGN Global ^(http|https):\/\/(www.)?ign\.xn--fiqs8s\/ http://cn.ign.com/ccpref/us 302 diff --git a/Surge/Outbound.conf b/Surge/Outbound.conf index 2e9c189..f0f7057 100644 --- a/Surge/Outbound.conf +++ b/Surge/Outbound.conf @@ -58,7 +58,7 @@ loglevel = notify show-error-page-for-reject = true # > Always Real IP Hosts -always-real-ip = msftconnecttest.com, msftncsi.com, *.msftconnecttest.com, *.msftncsi.com, *.srv.nintendo.net, *.stun.playstation.net, xbox.*.microsoft.com, *.xboxlive.com +always-real-ip = msftconnecttest.com, msftncsi.com, *.msftconnecttest.com, *.msftncsi.com, *.srv.nintendo.net, *.stun.playstation.net, xbox.*.microsoft.com, *.xboxlive.com, *.battlenet.com.cn, *.battlenet.com, *.blzstatic.cn, *.battle.net # > TCP Force HTTP Hosts force-http-engine-hosts = *.ott.cibntv.net,123.59.31.1,119.18.193.135,122.14.246.33,175.102.178.52 @@ -187,9 +187,6 @@ dl.l.google.com = server:119.29.29.29 ^(http|https):\/\/(www.)?suning\.com\/ https://suning.com/ 302 ^(http|https):\/\/(www.)?yhd\.com\/ https://yhd.com/ 302 -# Weibo Short URL -^http:\/\/t\.cn http://sinaurl.cn 302 - # Redirect False to True # > IGN China to IGN Global ^(http|https):\/\/(www.)?ign\.xn--fiqs8s\/ http://cn.ign.com/ccpref/us 302 diff --git a/Surge/Shortcuts/reject.txt b/Surge/Shortcuts/reject.txt index 8a72e28..4edf958 100644 --- a/Surge/Shortcuts/reject.txt +++ b/Surge/Shortcuts/reject.txt @@ -265,7 +265,7 @@ # > ManHuaRen ^https?:\/\/mangaapi\.manhuaren\.com\/v\d\/public\/getStartPageAds - reject # > Meituan-Dianping - img.meituan.net,p*.meituan.net,s3plus.meituan.net,flowplus.meituan.net -^https?:\/\/img\.meituan\.net\/(adunion|display|midas)\/\w+\.(gif|jpg|jpg\.webp)$ - reject +^https?:\/\/img\.meituan\.net\/(adunion|display|dpmobile|midas)\/\w+\.(gif|jpg|jpg\.webp)$ - reject ^https?:\/\/(s3plus|flowplus)\.meituan\.net\/v\d\/\w+\/linglong\/\w+\.(gif|jpg|mp4) - reject ^https?:\/\/p\d\.meituan\.net\/(bizad|wmbanner)\/\w+\.jpg - reject ^https?:\/\/p\d\.meituan\.net\/movie\/\w+\.jpg\?may_covertWebp - reject