Merge Lean's source

package/lean/luci-app-ssr-plus/Makefile

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-ssr-plus
 PKG_VERSION:=159
-PKG_RELEASE:=2
+PKG_RELEASE:=5
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 

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

@@ -74,11 +74,7 @@ local set =luci.http.formvalue("set")
 local icount =0
 
 if set == "gfw_data" then
-if nixio.fs.access("/usr/bin/wget-ssl") then
 	refresh_cmd="wget-ssl --no-check-certificate https://cdn.jsdelivr.net/gh/gfwlist/gfwlist/gfwlist.txt -O /tmp/gfw.b64"
-	else
-		refresh_cmd="wget -O /tmp/gfw.b64 http://iytc.net/tools/list.b64"
-	end
 	sret=luci.sys.call(refresh_cmd .. " 2>/dev/null")
 	if sret== 0 then
 	luci.sys.call("/usr/bin/ssr-gfw")
@@ -87,6 +83,8 @@ if nixio.fs.access("/usr/bin/wget-ssl") then
 	oldcount=luci.sys.exec("cat /etc/dnsmasq.ssr/gfw_list.conf | wc -l")
 	if tonumber(icount) ~= tonumber(oldcount) then
 		luci.sys.exec("cp -f /tmp/gfwnew.txt /etc/dnsmasq.ssr/gfw_list.conf")
+		luci.sys.exec("cp -f /etc/dnsmasq.ssr/gfw_list.conf /tmp/dnsmasq.ssr/gfw_list.conf")
+		luci.sys.call("/etc/init.d/dnsmasq restart")
 		retstring=tostring(math.ceil(tonumber(icount)/2))
 	else
 		retstring ="0"

package/lean/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po

@@ -407,7 +407,7 @@ msgid "Anti-pollution DNS Server"
 msgstr "访问国外域名DNS服务器"
 
 msgid "Custom DNS Server format as IP:PORT (default: 8.8.4.4:53)"
-msgstr "自定义国外域名DNS服务器，格式为 IP:PORT (默认: 8.8.4.4:53)"
+msgstr "格式为 IP:PORT (默认: 8.8.4.4:53)"
 
 msgid "Use Pdnsd tcp query and cache"
 msgstr "使用PDNSD TCP查询并缓存"

package/lean/luci-app-ssr-plus/root/etc/china_ssr.txt

@@ -3991,6 +3991,8 @@
 103.147.198.0/23
 103.147.206.0/23
 103.147.211.0/24
+103.148.174.0/23
+103.149.6.0/23
 103.192.0.0/22
 103.192.4.0/22
 103.192.8.0/22

package/lean/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/api/genv2rayconfig.lua

@@ -36,10 +36,10 @@ elseif server.protocol == "http" then
         allowTransparent = false,
         accounts = {
             {
-                user = (server.socks_username == nil) and "" or
+                user = (server.http_username == nil) and "" or
-                    server.socks_username,
+                    server.http_username,
-                pass = (server.socks_password == nil) and "" or
+                pass = (server.http_password == nil) and "" or
-                    server.socks_password
+                    server.http_password
             }
         }
     }

package/lean/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/index.lua

@@ -87,6 +87,8 @@ e.cfgvalue = function(self, section)
         e = "ss_password"
     elseif protocol == "socks" then
         e = "socks_password"
+    elseif protocol == "http" then
+        e = "http_password"
     end
     local e = m:get(section, e) or ""
     local t = ""

package/lean/luci-app-v2ray-server/po/zh_Hans/v2ray_server.po

@@ -22,6 +22,9 @@ msgstr "当勾选时，只能由本机访问此端口，当开启反向代理时
 msgid "Port"
 msgstr "端口"
 
+msgid "User name"
+msgstr "用户名"
+
 msgid "Password"
 msgstr "密码"