Compare commits

...

2 Commits

2 changed files with 31 additions and 38 deletions

View File

@@ -24,7 +24,7 @@ jobs:
echo "::set-env name=RELEASE_NAME::Released on $(date +%Y%m%d%H%M)"
echo "::set-env name=TAG_NAME::$(date +%Y%m%d%H%M)"
echo "::set-env name=GEOIP_REPO::github.com/Loyalsoldier/geoip"
echo "::set-env name=GEOSITE_REPO::github.com/v2ray/domain-list-community"
echo "::set-env name=GEOSITE_REPO::github.com/v2fly/domain-list-community"
echo "::set-env name=CHINA_DOMAINS_URL::https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/accelerated-domains.china.conf"
echo "::set-env name=GOOGLE_DOMAINS_URL::https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/google.china.conf"
echo "::set-env name=APPLE_DOMAINS_URL::https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/apple.china.conf"

View File

@@ -15,7 +15,7 @@
### geosite.dat
- 通过仓库 [@v2ray/domain-list-community](https://github.com/v2ray/domain-list-community) 生成
- 通过仓库 [@v2fly/domain-list-community](https://github.com/v2fly/domain-list-community) 生成
- **加入大量中国大陆域名、Apple 域名和 Google 域名**
- [@felixonmars/dnsmasq-china-list/accelerated-domains.china.conf](https://github.com/felixonmars/dnsmasq-china-list/blob/master/accelerated-domains.china.conf) 加入到 `geosite:cn` 类别中
- [@felixonmars/dnsmasq-china-list/apple.china.conf](https://github.com/felixonmars/dnsmasq-china-list/blob/master/apple.china.conf) 加入到 `geosite:geolocation-!cn` 类别中(如希望本文件中的 Apple 域名直连,请参考下面 [geosite 的 Routing 配置方式](https://github.com/Loyalsoldier/v2ray-rules-dat#geositedat-1)
@@ -167,10 +167,10 @@ scoop install v2ray-rules-dat
下面为自用 V2Ray 客户端完整配置,注意事项:
- 由于下面客户端配置使用了 DoH DNS 功能,所以必须使用 v4.22.0 或更新版本的 [V2Ray](https://github.com/v2fly/v2ray-core/releases)
- 下面客户端配置使 V2Ray 在本机开启 SOCKS 代理(监听 1080 端口)和 HTTP 代理(监听 2080 端口)
- 下面客户端配置使 V2Ray 在本机开启 SOCKS 代理(监听 1080 端口)和 HTTP 代理(监听 2080 端口),允许局域网内其他设备连接并使用代理
- BT 流量统统直连(实测依然会有部分 BT 流量走代理,尚不清楚是不是 V2Ray 的 bug。如果服务商禁止 BT 下载的话,请不要为下载软件设置代理)
- 最后,不命中任何路由规则的请求和流量,统统走代理
- `outbounds` 里的第一个大括号内的配置,即为 V2Ray 代理服务的配置。请根据自身需求进行修改,并参照 V2Ray 官网配置说明中的 [配置文件 > 文件格式 > OutboundObject](https://www.v2fly.org/chapter_02/01_overview.html#outboundobject) 部分进行补全
- `outbounds` 里的第一个大括号内的配置,即为 V2Ray 代理服务的配置。请根据自身需求进行修改,并参照 V2Ray 官网配置说明中的 [配置 > Outbounds > OutboundObject](https://www.v2fly.org/chapter_02/outbounds.html#outboundobject) 部分进行补全
```json
{
@@ -179,25 +179,29 @@ scoop install v2ray-rules-dat
},
"dns": {
"hosts": {
"dns.google": "8.8.8.8"
"dns.google": "8.8.8.8",
"doh.pub": "119.29.29.29"
},
"servers": [
{
"address": "https+local://doh.pub/dns-query",
"domains": [
"geosite:cn"
],
"expectIPs": [
"geoip:cn"
]
},
{
"address": "https://1.1.1.1/dns-query",
"domains": [
"geosite:geolocation-!cn"
]
},
"https://1.1.1.1/dns-query",
"https://dns.google/dns-query",
{
"address": "114.114.114.114",
"port": 53,
"address": "https+local://223.5.5.5/dns-query",
"domains": [
"geosite:cn"
],
"expectIPs": [
"geoip:cn"
"geosite:tld-cn"
]
}
]
@@ -205,7 +209,7 @@ scoop install v2ray-rules-dat
"inbounds": [
{
"protocol": "socks",
"listen": "127.0.0.1",
"listen": "0.0.0.0",
"port": 1080,
"tag": "Socks-In",
"settings": {
@@ -220,7 +224,7 @@ scoop install v2ray-rules-dat
},
{
"protocol": "http",
"listen": "127.0.0.1",
"listen": "0.0.0.0",
"port": 2080,
"tag": "Http-In",
"sniffing": {
@@ -261,7 +265,7 @@ scoop install v2ray-rules-dat
}
],
"routing": {
"domainStrategy": "AsIs",
"domainStrategy": "IPIfNonMatch",
"rules": [
{
"type": "field",
@@ -285,11 +289,20 @@ scoop install v2ray-rules-dat
"geosite:category-ads-all"
]
},
{
"type": "field",
"outboundTag": "Proxy",
"domain": [
"full:www.icloud.com",
"domain:icloud-content.com"
]
},
{
"type": "field",
"outboundTag": "Direct",
"domain": [
"geosite:tld-cn"
"geosite:tld-cn",
"geosite:icloud"
]
},
{
@@ -306,26 +319,6 @@ scoop install v2ray-rules-dat
"geosite:cn"
]
},
{
"type": "field",
"outboundTag": "Direct",
"ip": [
"223.5.5.5/32",
"119.29.29.29/32",
"180.76.76.76/32",
"114.114.114.114/32"
]
},
{
"type": "field",
"outboundTag": "Proxy",
"ip": [
"1.1.1.1/32",
"1.0.0.1/32",
"8.8.8.8/32",
"8.8.4.4/32"
]
},
{
"type": "field",
"outboundTag": "Direct",
@@ -351,7 +344,7 @@ scoop install v2ray-rules-dat
- [MaxMind GeoLite2 Free IP Database](https://dev.maxmind.com/geoip/geoip2/geolite2/)
- [@v2ray/geoip](https://github.com/v2ray/geoip)
- [@Loyalsoldier/geoip](https://github.com/Loyalsoldier/geoip)
- [@v2ray/domain-list-community](https://github.com/v2ray/domain-list-community)
- [@v2fly/domain-list-community](https://github.com/v2fly/domain-list-community)
- [@felixonmars/dnsmasq-china-list](https://github.com/felixonmars/dnsmasq-china-list)
- [@gfwlist/gfwlist](https://github.com/gfwlist/gfwlist)
- [@pexcn/gfwlist-extras](https://github.com/pexcn/gfwlist-extras)