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 684e7a1678..bedf07c33c 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 @@ -82,6 +82,7 @@ s.anonymous = true s.addremove = true s.sortable = false s.template = "cbi/tblsection" +s.sortable = true s.extedit = luci.dispatcher.build_url("admin/services/shadowsocksr/servers/%s") function s.create(...) local sid = TypedSection.create(...) diff --git a/package/lean/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/api/genv2rayconfig.lua b/package/lean/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/api/genv2rayconfig.lua index 54655ef483..1ed2305f71 100644 --- a/package/lean/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/api/genv2rayconfig.lua +++ b/package/lean/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/api/genv2rayconfig.lua @@ -20,18 +20,18 @@ elseif server.protocol == "http" then allowTransparent = false, accounts = { { - user = (server.Http_user == nil) and "lean" or server.Http_user, - pass = (server.Http_pass == nil) and "password" or server.Http_pass + user = (server.Http_user == nil) and "" or server.Http_user, + pass = (server.Http_pass == nil) and "" or server.Http_pass } } } else proset = { - auth = "password", + auth = (server.Socks_user == nil) and "noauth" or "password", accounts = { { - user = (server.Socks_user == nil) and "lean" or server.Socks_user, - pass = (server.Socks_pass == nil) and "password" or server.Socks_pass + user = (server.Socks_user == nil) and "" or server.Socks_user, + pass = (server.Socks_pass == nil) and "" or server.Socks_pass } } } diff --git a/package/lean/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/config.lua b/package/lean/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/config.lua index 3c7d8a595a..18c04b64ac 100644 --- a/package/lean/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/config.lua +++ b/package/lean/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/config.lua @@ -45,23 +45,23 @@ e.rmempty=true e:depends("protocol","vmess") e=t:option(Value,"Socks_user",translate("User name")) -e.default="lean" +e.default="" e.rmempty=true e:depends("protocol","socks") e=t:option(Value,"Socks_pass",translate("Password")) -e.default="password" +e.default="" e.rmempty=true e.password=true e:depends("protocol","socks") e=t:option(Value,"Http_user",translate("User name")) -e.default="lean" +e.default="" e.rmempty=true e:depends("protocol","http") e=t:option(Value,"Http_pass",translate("Password")) -e.default="password" +e.default="" e.rmempty=true e.password=true e:depends("protocol","http")