update 2024-08-02 00:22:25
This commit is contained in:
kenzok8
parent
d519880da8
commit
578b7b4833
|
|
@ -432,11 +432,11 @@ return view.extend({
|
|||
ss.sectiontitle = L.bind(hp.loadDefaultLabel, this, data[0]);
|
||||
ss.renderSectionAdd = L.bind(hp.renderSectionAdd, this, ss);
|
||||
|
||||
ss.tab('field_other', _('Other Fields'));
|
||||
ss.tab('field_host', _('Host Fields'));
|
||||
ss.tab('field_port', _('Port Fields'));
|
||||
ss.tab('field_source_ip', _('SRC-IP Fields'));
|
||||
ss.tab('field_source_port', _('SRC-Port Fields'));
|
||||
ss.tab('field_other', _('Other fields'));
|
||||
ss.tab('field_host', _('Host fields'));
|
||||
ss.tab('field_port', _('Port fields'));
|
||||
ss.tab('field_source_ip', _('SRC-IP fields'));
|
||||
ss.tab('field_source_port', _('SRC-Port fields'));
|
||||
|
||||
so = ss.taboption('field_other', form.Value, 'label', _('Label'));
|
||||
so.load = L.bind(hp.loadDefaultLabel, this, data[0]);
|
||||
|
|
@ -764,11 +764,11 @@ return view.extend({
|
|||
ss.sectiontitle = L.bind(hp.loadDefaultLabel, this, data[0]);
|
||||
ss.renderSectionAdd = L.bind(hp.renderSectionAdd, this, ss);
|
||||
|
||||
ss.tab('field_other', _('Other Fields'));
|
||||
ss.tab('field_host', _('Host Fields'));
|
||||
ss.tab('field_port', _('Port Fields'));
|
||||
ss.tab('field_source_ip', _('SRC-IP Fields'));
|
||||
ss.tab('field_source_port', _('SRC-Port Fields'));
|
||||
ss.tab('field_other', _('Other fields'));
|
||||
ss.tab('field_host', _('Host fields'));
|
||||
ss.tab('field_port', _('Port fields'));
|
||||
ss.tab('field_source_ip', _('SRC-IP fields'));
|
||||
ss.tab('field_source_port', _('SRC-Port fields'));
|
||||
|
||||
so = ss.taboption('field_other', form.Value, 'label', _('Label'));
|
||||
so.load = L.bind(hp.loadDefaultLabel, this, data[0]);
|
||||
|
|
|
|||
|
|
@ -869,7 +869,7 @@ msgstr ""
|
|||
|
||||
#: htdocs/luci-static/resources/view/homeproxy/client.js:436
|
||||
#: htdocs/luci-static/resources/view/homeproxy/client.js:768
|
||||
msgid "Host Fields"
|
||||
msgid "Host fields"
|
||||
msgstr ""
|
||||
|
||||
#: htdocs/luci-static/resources/view/homeproxy/node.js:709
|
||||
|
|
@ -1391,7 +1391,7 @@ msgstr ""
|
|||
|
||||
#: htdocs/luci-static/resources/view/homeproxy/client.js:435
|
||||
#: htdocs/luci-static/resources/view/homeproxy/client.js:767
|
||||
msgid "Other Fields"
|
||||
msgid "Other fields"
|
||||
msgstr ""
|
||||
|
||||
#: htdocs/luci-static/resources/view/homeproxy/client.js:389
|
||||
|
|
@ -1488,7 +1488,7 @@ msgstr ""
|
|||
|
||||
#: htdocs/luci-static/resources/view/homeproxy/client.js:437
|
||||
#: htdocs/luci-static/resources/view/homeproxy/client.js:769
|
||||
msgid "Port Fields"
|
||||
msgid "Port fields"
|
||||
msgstr ""
|
||||
|
||||
#: htdocs/luci-static/resources/view/homeproxy/client.js:537
|
||||
|
|
@ -1756,12 +1756,12 @@ msgstr ""
|
|||
|
||||
#: htdocs/luci-static/resources/view/homeproxy/client.js:438
|
||||
#: htdocs/luci-static/resources/view/homeproxy/client.js:770
|
||||
msgid "SRC-IP Fields"
|
||||
msgid "SRC-IP fields"
|
||||
msgstr ""
|
||||
|
||||
#: htdocs/luci-static/resources/view/homeproxy/client.js:439
|
||||
#: htdocs/luci-static/resources/view/homeproxy/client.js:771
|
||||
msgid "SRC-Port Fields"
|
||||
msgid "SRC-Port fields"
|
||||
msgstr ""
|
||||
|
||||
#: htdocs/luci-static/resources/view/homeproxy/node.js:515
|
||||
|
|
|
|||
|
|
@ -890,7 +890,7 @@ msgstr "主机名"
|
|||
|
||||
#: htdocs/luci-static/resources/view/homeproxy/client.js:436
|
||||
#: htdocs/luci-static/resources/view/homeproxy/client.js:768
|
||||
msgid "Host Fields"
|
||||
msgid "Host fields"
|
||||
msgstr "主机字段"
|
||||
|
||||
#: htdocs/luci-static/resources/view/homeproxy/node.js:709
|
||||
|
|
@ -1419,7 +1419,7 @@ msgstr "仅代理中国大陆"
|
|||
|
||||
#: htdocs/luci-static/resources/view/homeproxy/client.js:435
|
||||
#: htdocs/luci-static/resources/view/homeproxy/client.js:767
|
||||
msgid "Other Fields"
|
||||
msgid "Other fields"
|
||||
msgstr "其他字段"
|
||||
|
||||
#: htdocs/luci-static/resources/view/homeproxy/client.js:389
|
||||
|
|
@ -1516,7 +1516,7 @@ msgstr "端口 %s 已存在！"
|
|||
|
||||
#: htdocs/luci-static/resources/view/homeproxy/client.js:437
|
||||
#: htdocs/luci-static/resources/view/homeproxy/client.js:769
|
||||
msgid "Port Fields"
|
||||
msgid "Port fields"
|
||||
msgstr "端口字段"
|
||||
|
||||
#: htdocs/luci-static/resources/view/homeproxy/client.js:537
|
||||
|
|
@ -1784,13 +1784,13 @@ msgstr "规则集 URL"
|
|||
|
||||
#: htdocs/luci-static/resources/view/homeproxy/client.js:438
|
||||
#: htdocs/luci-static/resources/view/homeproxy/client.js:770
|
||||
msgid "SRC-IP Fields"
|
||||
msgid "SRC-IP fields"
|
||||
msgstr "源 IP 字段"
|
||||
|
||||
#: htdocs/luci-static/resources/view/homeproxy/client.js:439
|
||||
#: htdocs/luci-static/resources/view/homeproxy/client.js:771
|
||||
msgid "SRC-Port Fields"
|
||||
msgstr "源端口 字段"
|
||||
msgid "SRC-Port fields"
|
||||
msgstr "源端口字段"
|
||||
|
||||
#: htdocs/luci-static/resources/view/homeproxy/node.js:515
|
||||
msgid "SSH"
|
||||
|
|
|
|||
|
|
@ -926,6 +926,16 @@ run_redir() {
|
|||
_args="${_args} udp_redir_port=${UDP_REDIR_PORT}"
|
||||
config_file=$(echo $config_file | sed "s/TCP/TCP_UDP/g")
|
||||
}
|
||||
|
||||
local protocol=$(config_n_get $node protocol)
|
||||
local default_node=$(config_n_get $node default_node)
|
||||
local v2ray_dns_mode=$(config_t_get global v2ray_dns_mode tcp)
|
||||
[ "${DNS_MODE}" != "sing-box" ] && [ "${DNS_MODE}" != "udp" ] && [ "$protocol" = "_shunt" ] && [ "$default_node" = "_direct" ] && {
|
||||
DNS_MODE="sing-box"
|
||||
v2ray_dns_mode="tcp"
|
||||
echolog "* 当前TCP节点采用Sing-Box分流且默认节点为直连，远程DNS过滤模式将默认使用Sing-Box(TCP)，防止环回！"
|
||||
}
|
||||
|
||||
[ "${DNS_MODE}" = "sing-box" ] && {
|
||||
resolve_dns=1
|
||||
config_file=$(echo $config_file | sed "s/.json/_DNS.json/g")
|
||||
|
|
@ -934,11 +944,8 @@ run_redir() {
|
|||
[ "${DNS_CACHE}" == "0" ] && _args="${_args} dns_cache=0"
|
||||
resolve_dns_port=${dns_listen_port}
|
||||
_args="${_args} dns_listen_port=${resolve_dns_port}"
|
||||
|
||||
local local_dns=$(echo "${LOCAL_DNS}" | sed "s/,/\n/g" | head -n1)
|
||||
_args="${_args} direct_dns_udp_server=${local_dns}"
|
||||
|
||||
local v2ray_dns_mode=$(config_t_get global v2ray_dns_mode tcp)
|
||||
_args="${_args} remote_dns_protocol=${v2ray_dns_mode}"
|
||||
case "$v2ray_dns_mode" in
|
||||
tcp)
|
||||
|
|
@ -981,6 +988,16 @@ run_redir() {
|
|||
_args="${_args} udp_redir_port=${UDP_REDIR_PORT}"
|
||||
config_file=$(echo $config_file | sed "s/TCP/TCP_UDP/g")
|
||||
}
|
||||
|
||||
local protocol=$(config_n_get $node protocol)
|
||||
local default_node=$(config_n_get $node default_node)
|
||||
local v2ray_dns_mode=$(config_t_get global v2ray_dns_mode tcp)
|
||||
[ "${DNS_MODE}" != "xray" ] && [ "${DNS_MODE}" != "udp" ] && [ "$protocol" = "_shunt" ] && [ "$default_node" = "_direct" ] && {
|
||||
DNS_MODE="xray"
|
||||
v2ray_dns_mode="tcp"
|
||||
echolog "* 当前TCP节点采用Xray分流且默认节点为直连，远程DNS过滤模式将默认使用Xray(TCP)，防止环回！"
|
||||
}
|
||||
|
||||
[ "${DNS_MODE}" = "xray" ] && {
|
||||
resolve_dns=1
|
||||
config_file=$(echo $config_file | sed "s/.json/_DNS.json/g")
|
||||
|
|
@ -992,7 +1009,6 @@ run_redir() {
|
|||
resolve_dns_port=${dns_listen_port}
|
||||
_args="${_args} dns_listen_port=${resolve_dns_port}"
|
||||
_args="${_args} remote_dns_tcp_server=${REMOTE_DNS}"
|
||||
local v2ray_dns_mode=$(config_t_get global v2ray_dns_mode tcp)
|
||||
if [ "$v2ray_dns_mode" = "tcp+doh" ]; then
|
||||
remote_dns_doh=$(config_t_get global remote_dns_doh "https://1.1.1.1/dns-query")
|
||||
_args="${_args} remote_dns_doh=${remote_dns_doh}"
|
||||
|
|
|
|||
|
|
@ -3439,7 +3439,9 @@ table>tbody>tr>td, table>tfoot>tr>td, table>thead>tr>td {
|
|||
width: 4rem;
|
||||
padding-right: 0.2rem;
|
||||
}
|
||||
|
||||
#maincontent > .container {
|
||||
padding: 1rem 1.25rem 5rem 1.25rem !important;
|
||||
}
|
||||
.cbi-value-description {
|
||||
width: 100%;
|
||||
display: block;
|
||||
|
|
|
|||
Loading…
Reference in New Issue