diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile index f6358a532..f679ee007 100644 --- a/package/lean/luci-app-ssr-plus/Makefile +++ b/package/lean/luci-app-ssr-plus/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ssr-plus -PKG_VERSION:=153 +PKG_VERSION:=154 PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua index bedf07c33..bf30d3daf 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua +++ b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua @@ -55,21 +55,17 @@ o = s:option(Button,"subscribe", translate("Update All Subscribe Severs")) o.rawhtml = true o.template = "shadowsocksr/subscribe" - --- o.inputstyle = "apply" --- o.write = function() --- luci.sys.call("lua /root/subscribe.lua >>/tmp/ssrplus.log 2>&1") --- -- luci.sys.call("echo 123 >>/tmp/ssrplus.log 2>&1") --- -- luci.sys.exec("bash /usr/share/shadowsocksr/subscribe.sh >>/tmp/ssrplus.log 2>&1") --- luci.http.redirect(luci.dispatcher.build_url("admin", "services", "shadowsocksr", "servers")) --- end - - -o = s:option(Button,"delete",translate("Delete all severs")) +o = s:option(Button,"delete",translate("Delete All Subscribe Severs")) o.inputstyle = "reset" o.description = string.format(translate("Server Count") .. ": %d", server_count) o.write = function() -uci:delete_all("shadowsocksr", "servers", function(s) return true end) +uci:delete_all("shadowsocksr", "servers", function(s) + if s["hashkey"] then + return true + else + return false + end +end) uci:save("shadowsocksr") luci.sys.call("uci commit shadowsocksr && /etc/init.d/shadowsocksr stop") luci.http.redirect(luci.dispatcher.build_url("admin", "services", "shadowsocksr", "servers")) @@ -112,15 +108,6 @@ function o.cfgvalue(...) return Value.cfgvalue(...) or "?" end -if nixio.fs.access("/usr/bin/kcptun-client") then - -o = s:option(DummyValue, "kcp_enable", translate("KcpTun")) -function o.cfgvalue(...) - return Value.cfgvalue(...) or "?" -end - -end - o = s:option(DummyValue, "switch_enable", translate("Auto Switch")) function o.cfgvalue(...) return Value.cfgvalue(...) or "1" diff --git a/package/lean/luci-app-ssr-plus/po/zh-cn/ssr-plus.po b/package/lean/luci-app-ssr-plus/po/zh-cn/ssr-plus.po index 61c69e06f..a97fd1db7 100644 --- a/package/lean/luci-app-ssr-plus/po/zh-cn/ssr-plus.po +++ b/package/lean/luci-app-ssr-plus/po/zh-cn/ssr-plus.po @@ -493,6 +493,9 @@ msgstr "服务器节点故障自动切换设置" msgid "Delete all severs" msgstr "删除所有服务器节点" +msgid "Delete All Subscribe Severs" +msgstr "删除所有订阅服务器节点" + msgid "Severs Nodes" msgstr "服务器节点"