From a0d47ad3d46559177b53d643e7e15f6eda54f946 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 1 Apr 2023 18:08:15 +0800 Subject: [PATCH] update 2023-04-01 18:08:15 --- luci-app-passwall/Makefile | 2 +- .../luasrc/model/cbi/passwall/client/rule_list.lua | 7 +++++++ luci-app-passwall/luasrc/passwall/api.lua | 2 +- luci-app-passwall/luasrc/passwall/util_xray.lua | 2 +- .../luasrc/view/passwall/app_update/app_version.htm | 8 ++++---- luci-app-passwall/po/zh-cn/passwall.po | 6 ++++++ 6 files changed, 20 insertions(+), 7 deletions(-) diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile index cf9f5527f..722e5820d 100644 --- a/luci-app-passwall/Makefile +++ b/luci-app-passwall/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall PKG_VERSION:=4.62 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy \ diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/rule_list.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/rule_list.lua index 2ac0f2314..452d9bb35 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/rule_list.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/rule_list.lua @@ -261,4 +261,11 @@ o.remove = function(self, section, value) fs.writefile(hosts, "") end +if sys.call('[ -f "/www/luci-static/resources/uci.js" ]') == 0 then + m.apply_on_parse = true + function m.on_apply(self) + luci.sys.call("/etc/init.d/passwall reload > /dev/null 2>&1 &") + end +end + return m diff --git a/luci-app-passwall/luasrc/passwall/api.lua b/luci-app-passwall/luasrc/passwall/api.lua index ba57a276e..2a2155f05 100644 --- a/luci-app-passwall/luasrc/passwall/api.lua +++ b/luci-app-passwall/luasrc/passwall/api.lua @@ -876,6 +876,6 @@ function to_check_self() has_update = true, local_version = local_version, remote_version = remote_version, - error = remote_version + error = i18n.translatef("The latest version: %s, currently does not support automatic update, if you need to update, please compile or download the ipk and then manually install.", remote_version) } end diff --git a/luci-app-passwall/luasrc/passwall/util_xray.lua b/luci-app-passwall/luasrc/passwall/util_xray.lua index 7d06540df..8c067f2ee 100644 --- a/luci-app-passwall/luasrc/passwall/util_xray.lua +++ b/luci-app-passwall/luasrc/passwall/util_xray.lua @@ -636,7 +636,7 @@ function gen_config(var) if not observatory then observatory = { subjectSelector = { "blc-" }, - probeUrl = _node.useCustomProbeUrl == true and _node.probeUrl or nil, + probeUrl = _node.useCustomProbeUrl and _node.probeUrl or nil, probeInterval = _node.probeInterval or "1m", enableConcurrency = node.type == "Xray" and true or nil --这里只判断顶层节点(分流总节点/单独的负载均衡节点)类型为Xray，就可以启用并发 } diff --git a/luci-app-passwall/luasrc/view/passwall/app_update/app_version.htm b/luci-app-passwall/luasrc/view/passwall/app_update/app_version.htm index 982e9dc99..c49ab6fee 100644 --- a/luci-app-passwall/luasrc/view/passwall/app_update/app_version.htm +++ b/luci-app-passwall/luasrc/view/passwall/app_update/app_version.htm @@ -9,7 +9,7 @@ local version = {} var appInfoList = new Array(); var inProgressCount = 0; var tokenStr = '<%=token%>'; - var manuallyUpdateText = '<%:Manually update%>'; + var checkUpdateText = '<%:Check update%>'; var noUpdateText = '<%:It is the latest version%>'; var updateSuccessText = '<%:Update successful%>'; var clickToUpdateText = '<%:Click to update%>'; @@ -55,7 +55,7 @@ local version = {} function onRequestError(btn, errorMessage) { btn.disabled = false; - btn.value = manuallyUpdateText; + btn.value = checkUpdateText; var ckeckDetailElm = document.getElementById(btn.id + '-detail'); if (errorMessage && ckeckDetailElm) { @@ -180,7 +180,7 @@ local version = {}
【 <%=api.get_version()%> 】 + onclick="onBtnClick(this,'passwall');" value="<%:Check update%>" />
@@ -196,7 +196,7 @@ local version = {}
【 <%=version[k] ~="" and version[k] or translate("Null") %> 】 + onclick="onBtnClick(this,'<%=k%>');" value="<%:Check update%>" />
diff --git a/luci-app-passwall/po/zh-cn/passwall.po b/luci-app-passwall/po/zh-cn/passwall.po index dabe953ba..6ca22d87f 100644 --- a/luci-app-passwall/po/zh-cn/passwall.po +++ b/luci-app-passwall/po/zh-cn/passwall.po @@ -757,9 +757,15 @@ msgstr "主要" msgid "Standby" msgstr "备用" +msgid "Check update" +msgstr "检查更新" + msgid "Manually update" msgstr "手动更新" +msgid "The latest version: %s, currently does not support automatic update, if you need to update, please compile or download the ipk and then manually install." +msgstr "最新版本：%s，目前暂不支持自动更新，如需更新，请自行编译或下载ipk然后手动安装。" + msgid "Enable custom URL" msgstr "启用自定义规则地址"