From 7ba3e70f100b0657f6d397e1af2cf26f5834812e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A3=8E=E6=89=87=E6=BB=91=E7=BF=94=E7=BF=BC?= Date: Mon, 6 Oct 2025 15:26:43 +0000 Subject: [PATCH] Add or renamed to json in codeblock (#748) and sth Co-authored-by: Meow <197331664+Meo597@users.noreply.github.com> --- docs/config/observatory.md | 2 +- docs/config/reverse.md | 22 +++++++++---------- docs/config/routing.md | 6 ++--- .../level-2/nginx_or_haproxy_tls_tunnel.md | 4 ++-- docs/en/config/dns.md | 4 ++-- docs/en/config/outbounds/loopback.md | 2 +- docs/en/config/outbounds/wireguard.md | 2 +- .../level-2/nginx_or_haproxy_tls_tunnel.md | 4 ++-- docs/ru/config/README.md | 2 +- docs/ru/config/reverse.md | 22 +++++++++---------- 10 files changed, 35 insertions(+), 35 deletions(-) diff --git a/docs/config/observatory.md b/docs/config/observatory.md index 7d464b7b..9ca4a32f 100644 --- a/docs/config/observatory.md +++ b/docs/config/observatory.md @@ -49,7 +49,7 @@ ### PingConfigObject -```jsonc +```json { // 针对每个出站，在 10 分钟内探测 2 次，具体的探测时间点随机 // 如果它们全部失败，那么将在 10 ~ 20 分钟内被标记为故障节点 diff --git a/docs/config/reverse.md b/docs/config/reverse.md index 9ebba052..fe0243ce 100644 --- a/docs/config/reverse.md +++ b/docs/config/reverse.md @@ -33,7 +33,7 @@ `ReverseObject` 对应配置文件的 `reverse` 项。 -```jsonc +```json { "reverse": { "bridges": [ @@ -62,7 +62,7 @@ ### BridgeObject -```jsonc +```json { "tag": "bridge", "domain": "reverse-proxy.xray.internal" @@ -80,7 +80,7 @@ ### PortalObject -```jsonc +```json { "tag": "portal", "domain": "reverse-proxy.xray.internal" @@ -111,7 +111,7 @@ 反向代理配置: -```jsonc +```json "reverse": { "bridges": [ { @@ -124,7 +124,7 @@ outbound: -```jsonc +```json { // 转发到网页服务器 "tag": "out", @@ -135,7 +135,7 @@ outbound: } ``` -```jsonc +```json { // 连接到 portal "protocol": "vmess", @@ -158,7 +158,7 @@ outbound: 路由配置: -```jsonc +```json { "rules": [ { @@ -186,7 +186,7 @@ outbound: 反向代理配置: -```jsonc +```json "reverse": { "portals": [ { @@ -199,7 +199,7 @@ outbound: inbound: -```jsonc +```json { // 直接接收来自公网的请求 "tag": "external", @@ -213,7 +213,7 @@ inbound: } ``` -```jsonc +```json { // 接收来自 bridge 尝试建立反向隧道的请求 "tag": "interconn", @@ -231,7 +231,7 @@ inbound: 路由配置: -```jsonc +```json { "rules": [ { diff --git a/docs/config/routing.md b/docs/config/routing.md index 75d9c53d..2f717a37 100644 --- a/docs/config/routing.md +++ b/docs/config/routing.md @@ -24,11 +24,11 @@ 域名解析策略，根据不同的设置使用不同的策略。 -- `"AsIs"`：不进行额外操作，使用目标地址里的域名或者 sniff 到的域名。默认值。 +- `"AsIs"`：不进行额外操作，使用目标地址里的域名或者 sniff 到的域名。默认值； - `"IPIfNonMatch"`：一整轮匹配结束后，当没有命中任何规则时，将域名解析成 IP 再次进行二次匹配； - `"IPOnDemand"`：在开始进行匹配前，直接先将域名解析为 IP 进行匹配； -解析将同时包含 IPv4 与 IPv6(你可以在内置 DNS 的 `queryStrategy` 进行二次限制) 域名解析出多条 IP 时每条规则将依次尝试全部 IP 然后再匹配下一条路由(如果该条未命中)。 +实际解析行为会被推迟到第一次遇到 IP 规则以降低延迟。结果将同时包含 IPv4 与 IPv6(你可以在内置 DNS 的 `queryStrategy` 进行二次限制) 域名解析出多条 IP 时每条规则将依次尝试全部 IP 然后再匹配下一条路由(如果该条未命中)。 当开启 sniff + routeOnly 使路由系统可以同时看见 IP 和域名时，如果发生上述的解析，路由系统只能看到由域名解析出的 IP 而无法看见原始目标 IP, 除非解析失败。 @@ -40,7 +40,7 @@ 对应一个数组，数组中每一项是一个规则。 -对于每一个连接，路由将根据这些规则从上到下依次进行判断，当遇到第一个生效规则时，即将这个连接转发至它所指定的 `outboundTag`或 `balancerTag`。 +对于每一个连接，路由将根据这些规则从上到下依次进行判断，当遇到第一个生效规则时，即将这个连接转发至它所指定的 `outboundTag` 或 `balancerTag`。 ::: tip 当没有匹配到任何规则时，流量默认由第一个 outbound 发出。 diff --git a/docs/document/level-2/nginx_or_haproxy_tls_tunnel.md b/docs/document/level-2/nginx_or_haproxy_tls_tunnel.md index 12349174..9debee8d 100644 --- a/docs/document/level-2/nginx_or_haproxy_tls_tunnel.md +++ b/docs/document/level-2/nginx_or_haproxy_tls_tunnel.md @@ -104,7 +104,7 @@ WantedBy=multi-user.target 服务端 xray 配置 -``` +```json { "log": { "loglevel": "none" @@ -143,7 +143,7 @@ WantedBy=multi-user.target 客户端 xray 配置，此处以旁路由透明代理为例 -``` +```json { "log": { "loglevel": "none" diff --git a/docs/en/config/dns.md b/docs/en/config/dns.md index 87d2a70a..24452aec 100644 --- a/docs/en/config/dns.md +++ b/docs/en/config/dns.md @@ -150,7 +150,7 @@ You can specify `clientIp` for all DNS servers in [DnsObject](#dnsobject), or sp Xray-core v1.8.6 New feature: `queryStrategy` can be set separately for each `DNS` server. -```jsonc +```json "dns": { "servers": [ "https://1.1.1.1/dns-query", @@ -178,7 +178,7 @@ Xray-core v1.8.6 New feature: `queryStrategy` can be set separately for each `DN **NOTE：**
When the `"queryStrategy"` value in the child item conflicts with the global `"queryStrategy"` value, the query for the child item will respond null. -```jsonc +```json "dns": { "servers": [ "https://1.1.1.1/dns-query", diff --git a/docs/en/config/outbounds/loopback.md b/docs/en/config/outbounds/loopback.md index d53e1f65..1a6bf55d 100644 --- a/docs/en/config/outbounds/loopback.md +++ b/docs/en/config/outbounds/loopback.md @@ -20,7 +20,7 @@ This tag can be used as `inboundTag` in routing rules, all traffics going throug If you need to do some more detailed routing for traffics that have been routed by routing rules, like splitting routed traffics to TCP traffics and UDP traffics and send them to different outbounds, this can be done with `loopback` outbound. -```jsonc +```json { "outbounds": [ { diff --git a/docs/en/config/outbounds/wireguard.md b/docs/en/config/outbounds/wireguard.md index c015a691..5039fde4 100644 --- a/docs/en/config/outbounds/wireguard.md +++ b/docs/en/config/outbounds/wireguard.md @@ -84,7 +84,7 @@ When the destination address is a domain name, use the Xray-core [built-in DNS s - Conflicts with `"queryStrategy"` may cause the site to fail to open. - For example when `domainStrategy: "ForceIPv4"` is used, geosite:openai's site with `"queryStrategy": "UseIPv6"` will fail to open. -```jsonc +```json "dns": { "servers": [ "https://1.1.1.1/dns-query", diff --git a/docs/en/document/level-2/nginx_or_haproxy_tls_tunnel.md b/docs/en/document/level-2/nginx_or_haproxy_tls_tunnel.md index 12349174..9debee8d 100644 --- a/docs/en/document/level-2/nginx_or_haproxy_tls_tunnel.md +++ b/docs/en/document/level-2/nginx_or_haproxy_tls_tunnel.md @@ -104,7 +104,7 @@ WantedBy=multi-user.target 服务端 xray 配置 -``` +```json { "log": { "loglevel": "none" @@ -143,7 +143,7 @@ WantedBy=multi-user.target 客户端 xray 配置，此处以旁路由透明代理为例 -``` +```json { "log": { "loglevel": "none" diff --git a/docs/ru/config/README.md b/docs/ru/config/README.md index 127044bf..02f352bf 100644 --- a/docs/ru/config/README.md +++ b/docs/ru/config/README.md @@ -40,7 +40,7 @@ lang: ru-RU Опционально, контролирует версию, на которой может работать данный `config`. При обмене `config`-файлами это предотвращает случайный запуск на нежелательных версиях клиента. Во время выполнения клиент будет проверять, соответствует ли его текущая версия данному требованию. -``` +```json "version": { "min": "25.8.3", "max": "" diff --git a/docs/ru/config/reverse.md b/docs/ru/config/reverse.md index 087a4761..94599d6d 100644 --- a/docs/ru/config/reverse.md +++ b/docs/ru/config/reverse.md @@ -33,7 +33,7 @@ `ReverseObject` соответствует параметру `reverse` в файле конфигурации. -```jsonc +```json { "reverse": { "bridges": [ @@ -62,7 +62,7 @@ ### BridgeObject -```jsonc +```json { "tag": "bridge", "domain": "reverse-proxy.xray.internal" @@ -80,7 +80,7 @@ ### PortalObject -```jsonc +```json { "tag": "portal", "domain": "reverse-proxy.xray.internal" @@ -111,7 +111,7 @@ Конфигурация обратного прокси: -```jsonc +```json "reverse": { "bridges": [ { @@ -124,7 +124,7 @@ outbound: -```jsonc +```json { // Переадресация на веб-сервер "tag": "out", @@ -135,7 +135,7 @@ outbound: } ``` -```jsonc +```json { // Подключение к portal "protocol": "vmess", @@ -158,7 +158,7 @@ outbound: Конфигурация маршрутизации: -```jsonc +```json { "rules": [ { @@ -187,7 +187,7 @@ outbound: Конфигурация обратного прокси: -```jsonc +```json "reverse": { "portals": [ { @@ -200,7 +200,7 @@ outbound: inbound: -```jsonc +```json { // Прямой прием запросов из Интернета "tag": "external", @@ -214,7 +214,7 @@ inbound: } ``` -```jsonc +```json { // Прием запросов от bridge для установления обратного туннеля "tag": "interconn", @@ -232,7 +232,7 @@ inbound: Конфигурация маршрутизации: -```jsonc +```json { "rules": [ {