From 129af6a0e312383ba938a818739d5d490eee928d Mon Sep 17 00:00:00 2001 From: lmq8267 <119713693+lmq8267@users.noreply.github.com> Date: Fri, 7 Feb 2025 12:23:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=98=E7=BD=91=E5=9C=B0?= =?UTF-8?q?=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../luasrc/model/cbi/easytier.lua | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/luci-app-easytier/luasrc/model/cbi/easytier.lua b/luci-app-easytier/luasrc/model/cbi/easytier.lua index 5c05fe9..90fa98f 100644 --- a/luci-app-easytier/luasrc/model/cbi/easytier.lua +++ b/luci-app-easytier/luasrc/model/cbi/easytier.lua @@ -2,7 +2,7 @@ local http = luci.http local nixio = require "nixio" m = Map("easytier") -m.description = translate('一个简单、安全、去中心化的内网穿透 VPN 组网方案，使用 Rust 语言和 Tokio 框架实现。 项目地址：github.com/EasyTier/EasyTier  官网文档  QQ群  菜鸟教程') +m.description = translate('一个简单、安全、去中心化的内网穿透 VPN 组网方案，使用 Rust 语言和 Tokio 框架实现。 项目地址：github.com/EasyTier/EasyTier  官网文档  QQ群  菜鸟教程') -- easytier m:section(SimpleSection).template = "easytier/easytier_status" @@ -118,11 +118,11 @@ proxy_network:depends("etcmd", "etcmd") mapped_listeners = s:taboption("privacy",DynamicList, "mapped_listeners", translate("指定监听器的公网地址"), translate("手动指定本机的公网地址，其他节点可以使用该地址连接到本节点（不支持域名）。
例如：tcp://123.123.123.123:11223，可以指定多个。（--mapped-listeners 参数）")) -mapped_listeners:depends("etcmd", "etcmd") +mapped_listeners:depends("listenermode", "ON") rpc_portal = s:taboption("privacy", Value, "rpc_portal", translate("门户地址端口"), translate("用于管理的 RPC 门户地址。0 表示随机端口，12345 表示监听本地主机的 12345 端口，0.0.0.0:12345 表示在所有接口上监听 12345 端口。默认值为 0，首选 15888 （-r 参数）")) -rpc_portal.placeholder = "0" +rpc_portal.placeholder = "15888" rpc_portal.datatype = "range(1,65535)" rpc_portal:depends("etcmd", "etcmd") @@ -345,7 +345,7 @@ btn0.description = translate("点击按钮刷新，查看本机信息") btn0.inputstyle = "apply" btn0.write = function() if process_status ~= "" then - luci.sys.call("$(dirname $(uci -q get easytier.@easytier[0].easytierbin))/easytier-cli node >/tmp/easytier-cli_node") + luci.sys.call("$(dirname $(uci -q get easytier.@easytier[0].easytierbin))/easytier-cli node >/tmp/easytier-cli_node 2>&1") else luci.sys.call("echo '错误：程序未运行！请启动程序后重新点击刷新' >/tmp/easytier-cli_node") end @@ -364,7 +364,7 @@ btn1.description = translate("点击按钮刷新，查看对端信息") btn1.inputstyle = "apply" btn1.write = function() if process_status ~= "" then - luci.sys.call("$(dirname $(uci -q get easytier.@easytier[0].easytierbin))/easytier-cli peer >/tmp/easytier-cli_peer") + luci.sys.call("$(dirname $(uci -q get easytier.@easytier[0].easytierbin))/easytier-cli peer >/tmp/easytier-cli_peer 2>&1") else luci.sys.call("echo '错误：程序未运行！请启动程序后重新点击刷新' >/tmp/easytier-cli_peer") end @@ -383,7 +383,7 @@ btn2.description = translate("点击按钮刷新，查看connector信息") btn2.inputstyle = "apply" btn2.write = function() if process_status ~= "" then - luci.sys.call("$(dirname $(uci -q get easytier.@easytier[0].easytierbin))/easytier-cli connector >/tmp/easytier-cli_connector") + luci.sys.call("$(dirname $(uci -q get easytier.@easytier[0].easytierbin))/easytier-cli connector >/tmp/easytier-cli_connector 2>&1") else luci.sys.call("echo '错误：程序未运行！请启动程序后重新点击刷新' >/tmp/easytier-cli_connector") end @@ -402,7 +402,7 @@ btn3.description = translate("点击按钮刷新，查看stun信息") btn3.inputstyle = "apply" btn3.write = function() if process_status ~= "" then - luci.sys.call("$(dirname $(uci -q get easytier.@easytier[0].easytierbin))/easytier-cli stun >/tmp/easytier-cli_stun") + luci.sys.call("$(dirname $(uci -q get easytier.@easytier[0].easytierbin))/easytier-cli stun >/tmp/easytier-cli_stun 2>&1") else luci.sys.call("echo '错误：程序未运行！请启动程序后重新点击刷新' >/tmp/easytier-cli_stun") end @@ -422,7 +422,7 @@ btn4.description = translate("点击按钮刷新，查看route信息") btn4.inputstyle = "apply" btn4.write = function() if process_status ~= "" then - luci.sys.call("$(dirname $(uci -q get easytier.@easytier[0].easytierbin))/easytier-cli route >/tmp/easytier-cli_route") + luci.sys.call("$(dirname $(uci -q get easytier.@easytier[0].easytierbin))/easytier-cli route >/tmp/easytier-cli_route 2>&1") else luci.sys.call("echo '错误：程序未运行！请启动程序后重新点击刷新' >/tmp/easytier-cli_route") end @@ -441,7 +441,7 @@ btn6.description = translate("点击按钮刷新，查看peer-center信息") btn6.inputstyle = "apply" btn6.write = function() if process_status ~= "" then - luci.sys.call("$(dirname $(uci -q get easytier.@easytier[0].easytierbin))/easytier-cli peer-center >/tmp/easytier-cli_peer-center") + luci.sys.call("$(dirname $(uci -q get easytier.@easytier[0].easytierbin))/easytier-cli peer-center >/tmp/easytier-cli_peer-center 2>&1") else luci.sys.call("echo '错误：程序未运行！请启动程序后重新点击刷新' >/tmp/easytier-cli_peer-center") end @@ -460,7 +460,7 @@ btn7.description = translate("点击按钮刷新，查看vpn-portal信息") btn7.inputstyle = "apply" btn7.write = function() if process_status ~= "" then - luci.sys.call("$(dirname $(uci -q get easytier.@easytier[0].easytierbin))/easytier-cli vpn-portal >/tmp/easytier-cli_vpn-portal") + luci.sys.call("$(dirname $(uci -q get easytier.@easytier[0].easytierbin))/easytier-cli vpn-portal >/tmp/easytier-cli_vpn-portal 2>&1") else luci.sys.call("echo '错误：程序未运行！请启动程序后重新点击刷新' >/tmp/easytier-cli_vpn-portal") end @@ -494,7 +494,7 @@ end btnrm = s:taboption("infos", Button, "btnrm") btnrm.inputtitle = translate("检测更新") -btnrm.description = translate("点击按钮开始检测更新，上方状态栏显示") +btnrm.description = translate("点击按钮开始检测更新，刷新上方状态栏显示") btnrm.inputstyle = "apply" btnrm.write = function() os.execute("rm -rf /tmp/easytier*.tag /tmp/easytier*.newtag /tmp/easytier-core_*")