diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile index c4861adc2..5961fc1aa 100644 --- a/package/lean/luci-app-ssr-plus/Makefile +++ b/package/lean/luci-app-ssr-plus/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ssr-plus PKG_VERSION:=1 -PKG_RELEASE:=120 +PKG_RELEASE:=121 PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray \ diff --git a/package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua b/package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua index 524bf67d3..29a4551a2 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua +++ b/package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua @@ -13,7 +13,8 @@ function index() entry({"admin", "services", "shadowsocksr", "client"},cbi("shadowsocksr/client"),_("SSR Client"), 10).leaf = true - entry({"admin", "services", "shadowsocksr", "servers"}, arcombine(cbi("shadowsocksr/servers"), cbi("shadowsocksr/client-config")),_("Severs Nodes"), 20).leaf = true + entry({"admin", "services", "shadowsocksr", "servers"}, arcombine(cbi("shadowsocksr/servers", { +autoapply=true}), cbi("shadowsocksr/client-config")),_("Severs Nodes"), 20).leaf = true entry({"admin", "services", "shadowsocksr", "control"},cbi("shadowsocksr/control"),_("Access Control"), 30).leaf = true 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 c2d8a70df..fa0c336fa 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 @@ -9,6 +9,9 @@ uci:foreach("shadowsocksr", "servers", function(s) server_count = server_count + 1 end) +local fs = require "nixio.fs" +local sys = require "luci.sys" + m = Map(shadowsocksr, translate("Servers subscription and manage")) -- Server Subscribe @@ -31,17 +34,25 @@ o.rmempty = false o = s:option(DynamicList, "subscribe_url", translate("Subscribe URL")) o.rmempty = true +o = s:option(Button,"update_Sub",translate("Update Subscribe List")) +o.inputstyle = "reload" +o.description = translate("Update subscribe url list first") +o.write = function() + luci.http.redirect(luci.dispatcher.build_url("admin", "services", "shadowsocksr", "servers")) +end + o = s:option(Flag, "proxy", translate("Through proxy update")) o.rmempty = false o.description = translate("Through proxy update list, Not Recommended ") -o = s:option(Button,"update",translate("Update")) -o.inputstyle = "reload" -o.write = function() - luci.sys.call("bash /usr/share/shadowsocksr/subscribe.sh >>/tmp/ssrplus.log 2>&1") +o = s:option(Button,"update",translate("Update All Subscribe Severs")) +o.inputstyle = "apply" +o.write = function() + 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.inputstyle = "reset" o.description = string.format(translate("Server Count") .. ": %d", server_count) @@ -50,6 +61,7 @@ o.write = function() 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")) + return end -- [[ Servers Manage ]]-- @@ -106,4 +118,5 @@ o.template="shadowsocksr/ping" o.width="10%" m:append(Template("shadowsocksr/server_list")) + return m 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 28fd353d0..9824640b2 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 @@ -450,7 +450,7 @@ msgid "Servers subscription and manage" msgstr "服务器节点订阅与管理(支持订阅和手动导入SSR链接)" msgid "Through proxy update list, Not Recommended" -msgstr "通过路由器自身代理更新订阅(不推荐)" +msgstr "通过路由器自身代理更新订阅" msgid "LAN IP AC" msgstr "LAN IP访问控制" @@ -465,7 +465,7 @@ msgid "Server failsafe auto swith settings" msgstr "服务器节点故障自动切换设置" msgid "Delete all severs" -msgstr "删除所有服务器" +msgstr "删除所有服务器节点" msgid "Severs Nodes" msgstr "服务器节点" @@ -517,3 +517,12 @@ msgstr "域名白名单" msgid "Black Domain List" msgstr "域名黑名单" + +msgid "Update Subscribe List" +msgstr "更新订阅URL列表" + +msgid "Update subscribe url list first" +msgstr "订阅服务器节点前,请先更新订阅URL列表" + +msgid "Update All Subscribe Severs" +msgstr "更新所有订阅服务器节点" diff --git a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr index d45d4578a..6e962106a 100755 --- a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr +++ b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr @@ -44,10 +44,10 @@ uci_get_by_type() { add_cron() { sed -i '/ssrplus.log/d' $CRON_FILE - echo '0 1 * * 0 echo "" > /tmp/ssrplus.log' >> $CRON_FILE + echo '0 1 * * * echo "" > /tmp/ssrplus.log' >> $CRON_FILE [ -n "$(grep -w "/usr/share/shadowsocksr/subscribe.sh" $CRON_FILE)" ] && sed -i '/\/usr\/share\/shadowsocksr\/subscribe.sh/d' $CRON_FILE [ $(uci_get_by_type server_subscribe auto_update 0) -eq 1 ] && echo "0 $(uci_get_by_type server_subscribe auto_update_time) * * * /usr/share/shadowsocksr/subscribe.sh" >> $CRON_FILE - [ -z "$(grep -w "/usr/share/shadowsocksr/update.sh" $CRON_FILE)" ] && echo "0 5 * * 0 /usr/share/shadowsocksr/update.sh" >> $CRON_FILE + [ -z "$(grep -w "/usr/share/shadowsocksr/update.sh" $CRON_FILE)" ] && echo "0 5 * * * /usr/share/shadowsocksr/update.sh" >> $CRON_FILE crontab $CRON_FILE }