mirror of
https://github.com/v2board/v2board.git
synced 2024-09-20 12:54:48 +08:00
Merge branch 'dev' of https://github.com/v2board/v2board into dev
This commit is contained in:
tokumeikoi
commit
cdd55eae4c
@ -23,7 +23,7 @@ class Clash
|
||||
$appName = config('v2board.app_name', 'V2Board');
|
||||
header("subscription-userinfo: upload={$user['u']}; download={$user['d']}; total={$user['transfer_enable']}; expire={$user['expired_at']}");
|
||||
header('profile-update-interval: 24');
|
||||
header("content-disposition:attachment;filename={$appName}");
|
||||
header("content-disposition:attachment;filename*=UTF-8''".rawurlencode($appName));
|
||||
$defaultConfig = base_path() . '/resources/rules/default.clash.yaml';
|
||||
$customConfig = base_path() . '/resources/rules/custom.clash.yaml';
|
||||
if (\File::exists($customConfig)) {
|
||||
|
||||
@ -23,7 +23,7 @@ class Stash
|
||||
$appName = config('v2board.app_name', 'V2Board');
|
||||
header("subscription-userinfo: upload={$user['u']}; download={$user['d']}; total={$user['transfer_enable']}; expire={$user['expired_at']}");
|
||||
header('profile-update-interval: 24');
|
||||
header("content-disposition: filename={$appName}");
|
||||
header("content-disposition: filename*=UTF-8''".rawurlencode($appName));
|
||||
// 暂时使用clash配置文件，后续根据Stash更新情况更新
|
||||
$defaultConfig = base_path() . '/resources/rules/default.clash.yaml';
|
||||
$customConfig = base_path() . '/resources/rules/custom.clash.yaml';
|
||||
|
||||
@ -60,9 +60,6 @@ rules:
|
||||
# - DOMAIN,e.crashlytics.com,REJECT //注释此选项有助于大多数App开发者分析崩溃信息；如果您拒绝一切崩溃数据统计、搜集，请取消 # 注释。
|
||||
|
||||
# 国内网站
|
||||
- DOMAIN-SUFFIX,cn,DIRECT
|
||||
- DOMAIN-KEYWORD,-cn,DIRECT
|
||||
|
||||
- DOMAIN-SUFFIX,126.com,DIRECT
|
||||
- DOMAIN-SUFFIX,126.net,DIRECT
|
||||
- DOMAIN-SUFFIX,127.net,DIRECT
|
||||
@ -366,6 +363,7 @@ rules:
|
||||
- DOMAIN-SUFFIX,klip.me,SELECT
|
||||
- DOMAIN-SUFFIX,libsyn.com,SELECT
|
||||
- DOMAIN-SUFFIX,linkedin.com,SELECT
|
||||
- DOMAIN-SUFFIX,line-apps.com,SELECT
|
||||
- DOMAIN-SUFFIX,linode.com,SELECT
|
||||
- DOMAIN-SUFFIX,lithium.com,SELECT
|
||||
- DOMAIN-SUFFIX,littlehj.com,SELECT
|
||||
@ -550,6 +548,10 @@ rules:
|
||||
- IP-CIDR,224.0.0.0/4,DIRECT
|
||||
- IP-CIDR6,fe80::/10,DIRECT
|
||||
|
||||
# 剩余未匹配的国内网站
|
||||
- DOMAIN-SUFFIX,cn,DIRECT
|
||||
- DOMAIN-KEYWORD,-cn,DIRECT
|
||||
|
||||
# 最终规则
|
||||
- GEOIP,CN,DIRECT
|
||||
- MATCH,SELECT
|
||||
|
||||
@ -24,9 +24,10 @@ dns:
|
||||
- https://doh.pub/dns-query
|
||||
- https://dns.alidns.com/dns-query
|
||||
fallback:
|
||||
- tls://1.0.0.1:853
|
||||
- https://cloudflare-dns.com/dns-query
|
||||
- https://dns.google/dns-query
|
||||
- https://doh.dns.sb/dns-query
|
||||
- https://dns.cloudflare.com/dns-query
|
||||
- https://dns.twnic.tw/dns-query
|
||||
- tls://8.8.4.4:853
|
||||
fallback-filter:
|
||||
geoip: true
|
||||
ipcidr:
|
||||
@ -84,9 +85,6 @@ rules:
|
||||
# - DOMAIN,e.crashlytics.com,REJECT //注释此选项有助于大多数App开发者分析崩溃信息；如果您拒绝一切崩溃数据统计、搜集，请取消 # 注释。
|
||||
|
||||
# 国内网站
|
||||
- DOMAIN-SUFFIX,cn,DIRECT
|
||||
- DOMAIN-KEYWORD,-cn,DIRECT
|
||||
|
||||
- DOMAIN-SUFFIX,126.com,DIRECT
|
||||
- DOMAIN-SUFFIX,126.net,DIRECT
|
||||
- DOMAIN-SUFFIX,127.net,DIRECT
|
||||
@ -390,6 +388,7 @@ rules:
|
||||
- DOMAIN-SUFFIX,klip.me,$app_name
|
||||
- DOMAIN-SUFFIX,libsyn.com,$app_name
|
||||
- DOMAIN-SUFFIX,linkedin.com,$app_name
|
||||
- DOMAIN-SUFFIX,line-apps.com,$app_name
|
||||
- DOMAIN-SUFFIX,linode.com,$app_name
|
||||
- DOMAIN-SUFFIX,lithium.com,$app_name
|
||||
- DOMAIN-SUFFIX,littlehj.com,$app_name
|
||||
@ -574,6 +573,10 @@ rules:
|
||||
- IP-CIDR,224.0.0.0/4,DIRECT
|
||||
- IP-CIDR6,fe80::/10,DIRECT
|
||||
|
||||
# 剩余未匹配的国内网站
|
||||
- DOMAIN-SUFFIX,cn,DIRECT
|
||||
- DOMAIN-KEYWORD,-cn,DIRECT
|
||||
|
||||
# 最终规则
|
||||
- GEOIP,CN,DIRECT
|
||||
- MATCH,$app_name
|
||||
|
||||
@ -78,8 +78,6 @@ DOMAIN-SUFFIX,apple-mapkit.com,DIRECT
|
||||
USER-AGENT,MicroMessenger Client*,DIRECT
|
||||
USER-AGENT,WeChat*,DIRECT
|
||||
|
||||
DOMAIN-SUFFIX,cn,DIRECT
|
||||
DOMAIN-KEYWORD,-cn,DIRECT
|
||||
DOMAIN-SUFFIX,126.com,DIRECT
|
||||
DOMAIN-SUFFIX,126.net,DIRECT
|
||||
DOMAIN-SUFFIX,127.net,DIRECT
|
||||
@ -382,6 +380,7 @@ DOMAIN-SUFFIX,kat.cr,Proxy
|
||||
DOMAIN-SUFFIX,klip.me,Proxy
|
||||
DOMAIN-SUFFIX,libsyn.com,Proxy
|
||||
DOMAIN-SUFFIX,linkedin.com,Proxy
|
||||
DOMAIN-SUFFIX,line-apps.com,Proxy
|
||||
DOMAIN-SUFFIX,linode.com,Proxy
|
||||
DOMAIN-SUFFIX,lithium.com,Proxy
|
||||
DOMAIN-SUFFIX,littlehj.com,Proxy
|
||||
@ -565,6 +564,10 @@ IP-CIDR,100.64.0.0/10,DIRECT
|
||||
IP-CIDR,224.0.0.0/4,DIRECT
|
||||
IP-CIDR6,fe80::/10,DIRECT
|
||||
|
||||
# 剩余未匹配的国内网站
|
||||
DOMAIN-SUFFIX,cn,DIRECT
|
||||
DOMAIN-KEYWORD,-cn,DIRECT
|
||||
|
||||
# 最终规则
|
||||
GEOIP,CN,DIRECT
|
||||
FINAL,Proxy
|
||||
@ -103,8 +103,6 @@ DOMAIN-SUFFIX,apple-mapkit.com,DIRECT
|
||||
USER-AGENT,MicroMessenger Client*,DIRECT
|
||||
USER-AGENT,WeChat*,DIRECT
|
||||
|
||||
DOMAIN-SUFFIX,cn,DIRECT
|
||||
DOMAIN-KEYWORD,-cn,DIRECT
|
||||
DOMAIN-SUFFIX,126.com,DIRECT
|
||||
DOMAIN-SUFFIX,126.net,DIRECT
|
||||
DOMAIN-SUFFIX,127.net,DIRECT
|
||||
@ -407,6 +405,7 @@ DOMAIN-SUFFIX,kat.cr,Proxy
|
||||
DOMAIN-SUFFIX,klip.me,Proxy
|
||||
DOMAIN-SUFFIX,libsyn.com,Proxy
|
||||
DOMAIN-SUFFIX,linkedin.com,Proxy
|
||||
DOMAIN-SUFFIX,line-apps.com,Proxy
|
||||
DOMAIN-SUFFIX,linode.com,Proxy
|
||||
DOMAIN-SUFFIX,lithium.com,Proxy
|
||||
DOMAIN-SUFFIX,littlehj.com,Proxy
|
||||
@ -581,6 +580,10 @@ IP-CIDR,220.181.174.34/32,Proxy,no-resolve
|
||||
|
||||
RULE-SET,LAN,DIRECT
|
||||
|
||||
# 剩余未匹配的国内网站
|
||||
DOMAIN-SUFFIX,cn,DIRECT
|
||||
DOMAIN-KEYWORD,-cn,DIRECT
|
||||
|
||||
# 最终规则
|
||||
GEOIP,CN,DIRECT
|
||||
FINAL,Proxy,dns-failed
|
||||
|
||||
Loading…
Reference in New Issue
Block a user