Compare commits

...

2 Commits

Author SHA1 Message Date
loyalsoldier
6961566065 Update config examples 2021-04-20 17:27:55 +08:00
Loyalsoldier
2af1272d91 Chore: change Git user
Reference: https://github.com/Loyalsoldier/geoip/pull/9
2021-03-19 12:38:09 +08:00
2 changed files with 57 additions and 73 deletions

View File

@@ -192,8 +192,8 @@ jobs:
run: |
cd publish || exit 1
git init
git config --local user.name "actions"
git config --local user.email "action@github.com"
git config --local user.name "github-actions[bot]"
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
git checkout -b release
git add .
git commit -m "${{ env.RELEASE_NAME }}"

126
README.md
View File

@@ -168,9 +168,7 @@ steamstatic.com.8686c.com @cn
{
"type": "field",
"outboundTag": "Reject",
"domain": [
"geosite:category-ads-all"
]
"domain": ["geosite:category-ads-all"]
},
{
"type": "field",
@@ -186,21 +184,17 @@ steamstatic.com.8686c.com @cn
{
"type": "field",
"outboundTag": "Proxy",
"domain": [
"geosite:geolocation-!cn"
]
"domain": ["geosite:geolocation-!cn"]
},
{
"type": "field",
"outboundTag": "Direct",
"domain": [
"geosite:cn"
]
"domain": ["geosite:cn"]
},
{
"type": "field",
"outboundTag": "Proxy",
"network": "tcp,udp"
"type": "field",
"outboundTag": "Proxy",
"network": "tcp,udp"
}
]
}
@@ -214,30 +208,22 @@ steamstatic.com.8686c.com @cn
{
"type": "field",
"outboundTag": "Reject",
"domain": [
"geosite:category-ads-all"
]
"domain": ["geosite:category-ads-all"]
},
{
"type": "field",
"outboundTag": "Proxy",
"domain": [
"geosite:tld-!cn",
"geosite:gfw",
"geosite:greatfire"
]
"domain": ["geosite:tld-!cn", "geosite:gfw", "geosite:greatfire"]
},
{
"type": "field",
"outboundTag": "Proxy",
"ip": [
"geoip:telegram"
]
"ip": ["geoip:telegram"]
},
{
"type": "field",
"outboundTag": "Direct",
"network": "tcp,udp"
"type": "field",
"outboundTag": "Direct",
"network": "tcp,udp"
}
]
}
@@ -247,26 +233,30 @@ steamstatic.com.8686c.com @cn
```json
"dns": {
"hosts": {
"dns.google": "8.8.8.8",
"dns.pub": "119.29.29.29",
"dns.alidns.com": "223.5.5.5",
"geosite:category-ads-all": "127.0.0.1"
},
"servers": [
{
"address": "https://1.1.1.1/dns-query",
"domains": ["geosite:geolocation-!cn"],
"expectIPs": ["geoip:!cn"]
},
"8.8.8.8",
{
"address": "114.114.114.114",
"port": 53,
"domains": [
"geosite:cn",
"geosite:category-games@cn"
],
"expectIPs": [
"geoip:cn"
]
"domains": ["geosite:cn", "geosite:category-games@cn"],
"expectIPs": ["geoip:cn"],
"skipFallback": true
},
{
"address": "https://1.1.1.1/dns-query",
"domains": [
"geosite:geolocation-!cn"
]
},
"https+local://223.5.5.5/dns-query",
"119.29.29.29"
"address": "localhost",
"skipFallback": true
}
]
}
```
@@ -275,9 +265,9 @@ steamstatic.com.8686c.com @cn
注意事项:
- 由于下面客户端配置使用了 DoH (DNS over HTTPS) 功能,所以必须使用 v4.22.0 或更新版本的 [V2Ray](https://github.com/v2fly/v2ray-core/releases)
- 由于下面客户端配置的 DNS 使用了 `skipFallback` 选项,所以必须使用 v4.37.2 或更新版本的 [V2Ray](https://github.com/v2fly/v2ray-core/releases)
- 下面客户端配置使 V2Ray 在本机开启 SOCKS 代理(监听 1080 端口)和 HTTP 代理(监听 2080 端口),允许局域网内其他设备连接并使用代理
- BT 流量统统直连(实测依然会有部分 BT 流量走代理,尚不清楚是不是 V2Ray 的 bug。如果服务商禁止 BT 下载的话,请不要为下载软件设置代理)
- BT 流量统统直连(实测依然会有部分 BT 流量走代理,如果服务商禁止 BT 下载,请不要为下载软件设置代理)
- 最后,不命中任何路由规则的请求和流量,统统走代理
- `outbounds` 里的第一个大括号内的配置,即为 V2Ray 代理服务的配置。请根据自身需求进行修改,并参照 V2Ray 官网配置文档中的 [配置 > Outbounds > OutboundObject](https://www.v2fly.org/config/outbounds.html#outboundobject) 部分进行补全
@@ -289,26 +279,31 @@ steamstatic.com.8686c.com @cn
"dns": {
"hosts": {
"dns.google": "8.8.8.8",
"doh.pub": "119.29.29.29"
"dns.pub": "119.29.29.29",
"dns.alidns.com": "223.5.5.5",
"geosite:category-ads-all": "127.0.0.1"
},
"servers": [
"https://dns.google/dns-query",
{
"address": "https+local://223.5.5.5/dns-query",
"address": "https://1.1.1.1/dns-query",
"domains": ["geosite:geolocation-!cn", "geosite:google@cn"],
"expectIPs": ["geoip:!cn"]
},
"8.8.8.8",
{
"address": "114.114.114.114",
"port": 53,
"domains": [
"geosite:cn",
"geosite:icloud",
"geosite:category-games@cn"
],
"expectIPs": [
"geoip:cn"
]
"expectIPs": ["geoip:cn"],
"skipFallback": true
},
{
"address": "https://1.1.1.1/dns-query",
"domains": [
"geosite:geolocation-!cn"
]
"address": "localhost",
"skipFallback": true
}
]
},
@@ -372,6 +367,7 @@ steamstatic.com.8686c.com @cn
],
"routing": {
"domainStrategy": "IPIfNonMatch",
"domainMatcher": "mph",
"rules": [
{
"type": "field",
@@ -381,26 +377,22 @@ steamstatic.com.8686c.com @cn
{
"type": "field",
"outboundTag": "Dns-Out",
"inboundTag": [
"Socks-In",
"Http-In"
],
"inboundTag": ["Socks-In", "Http-In"],
"network": "udp",
"port": 53
},
{
"type": "field",
"outboundTag": "Reject",
"domain": [
"geosite:category-ads-all"
]
"domain": ["geosite:category-ads-all"]
},
{
"type": "field",
"outboundTag": "Proxy",
"domain": [
"full:www.icloud.com",
"domain:icloud-content.com"
"domain:icloud-content.com",
"geosite:google"
]
},
{
@@ -415,25 +407,17 @@ steamstatic.com.8686c.com @cn
{
"type": "field",
"outboundTag": "Proxy",
"domain": [
"geosite:geolocation-!cn"
]
"domain": ["geosite:geolocation-!cn"]
},
{
"type": "field",
"outboundTag": "Direct",
"domain": [
"geosite:cn",
"geosite:private"
]
"domain": ["geosite:cn", "geosite:private"]
},
{
"type": "field",
"outboundTag": "Direct",
"ip": [
"geoip:cn",
"geoip:private"
]
"ip": ["geoip:cn", "geoip:private"]
},
{
"type": "field",