fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-ssr-plus: bump to 182-5

Browse Source 
Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
This commit is contained in:
Mattraks 2021-01-14 12:20:41 +08:00 committed by CN_SZTL
parent b69c2f01d0
commit c13edd736e
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
6 changed files with 6558 additions and 6492 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/lean/luci-app-ssr-plus/Makefile
View File

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-ssr-plus
PKG_VERSION:=182
PKG_RELEASE:=4
PKG_RELEASE:=5
define Package/$(PKG_NAME)/conffiles
/etc/config/shadowsocksr

17
package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua
View File

@ -21,6 +21,8 @@ function index()
entry({"admin", "services", "shadowsocksr", "run"}, call("act_status")).leaf = true
entry({"admin", "services", "shadowsocksr", "ping"}, call("act_ping")).leaf = true
entry({"admin", "services", "shadowsocksr", "reset"}, call("act_reset"))
entry({"admin", "services", "shadowsocksr", "restart"}, call("act_restart"))
entry({"admin", "services", "shadowsocksr", "delete"}, call("act_delete"))
end
function subscribe()
@ -109,7 +111,16 @@ function check_port()
end
function act_reset()
nixio.exec("/etc/init.d/shadowsocksr", "reset")
http.redirect(luci.dispatcher.build_url('admin/services/shadowsocksr'))
return
luci.sys.call("/etc/init.d/shadowsocksr reset &")
luci.http.redirect(luci.dispatcher.build_url("admin", "services", "shadowsocksr"))
end
function act_restart()
luci.sys.call("/etc/init.d/shadowsocksr restart &")
luci.http.redirect(luci.dispatcher.build_url("admin", "services", "shadowsocksr"))
end
function act_delete()
luci.sys.call("/etc/init.d/shadowsocksr restart &")
luci.http.redirect(luci.dispatcher.build_url("admin", "services", "shadowsocksr", "servers"))
end

6
package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua
View File

@ -66,7 +66,8 @@ o.write = function()
end
end)
uci:save("shadowsocksr")
m.uci:commit("shadowsocksr")
uci:commit("shadowsocksr")
luci.http.redirect(luci.dispatcher.build_url("admin", "services", "shadowsocksr", "delete"))
return
end
@ -113,7 +114,8 @@ node.inputstyle = "apply"
node.write = function(self, section)
uci:set("shadowsocksr", '@global[0]', 'global_server', section)
uci:save("shadowsocksr")
m.uci:commit("shadowsocksr")
uci:commit("shadowsocksr")
luci.http.redirect(luci.dispatcher.build_url("admin", "services", "shadowsocksr", "restart"))
end
o = s:option(Flag, "switch_enable", translate("Auto Switch"))

1
package/lean/luci-app-ssr-plus/root/etc/ssrplus/china_ssr.txt
View File

@ -4114,6 +4114,7 @@
103.160.244.0/23
103.160.254.0/23
103.161.14.0/23
103.161.102.0/23
103.192.0.0/22
103.192.4.0/22
103.192.8.0/22

13014
package/lean/luci-app-ssr-plus/root/etc/ssrplus/gfw_list.conf
View File

File diff suppressed because it is too large Load Diff

10
package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua
View File

@ -457,9 +457,15 @@ local execute = function()
end
else
if not old.alias then
old.alias = old.server .. ':' .. old.server_port
if not old.server or old.server_port then
ucic:delete(name, old['.name'])
else
old.alias = old.server .. ':' .. old.server_port
log('忽略手动添加的节点: ' .. old.alias)
end
else
log('忽略手动添加的节点: ' .. old.alias)
end
log('忽略手动添加的节点: ' .. old.alias)
end
end)
for k, v in ipairs(nodeResult) do