Fixes Trojan URL

luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm

@@ -220,8 +220,7 @@ function import_ssr_url(btn, urlname, sid) {
 			document.getElementsByName('cbid.shadowsocksr.' + sid + '.password')[0].value = password;
 			document.getElementsByName('cbid.shadowsocksr.' + sid + '.tls')[0].checked = true;
 			document.getElementsByName('cbid.shadowsocksr.' + sid + '.tls')[0].dispatchEvent(event);
-			document.getElementsByName('cbid.shadowsocksr.' + sid + '.tls_host')[0].value = queryParam.peer || '';
-			document.getElementsByName('cbid.shadowsocksr.' + sid + '.insecure')[0].checked = queryParam.allowInsecure == '1';
+			document.getElementsByName('cbid.shadowsocksr.' + sid + '.tls_host')[0].value = queryParam.sni || '';
 			if (param != undefined) {
 				document.getElementsByName('cbid.shadowsocksr.' + sid + '.alias')[0].value = decodeURI(param);
 			}

luci-app-ssr-plus/root/etc/init.d/shadowsocksr

@@ -37,7 +37,6 @@ server_count=0
 redir_tcp=0
 redir_udp=0
 local_enable=0
-ss_protocol=
 kcp_enable_flag=0
 pdnsd_enable_flag=0
 switch_server=$1
@@ -843,7 +842,7 @@ stop() {
 	ps -w | grep -v "grep" | grep ssr-monitor | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 &
 	ps -w | grep -v "grep" | grep "sleep 0000" | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 &
 	ps -w | grep -v "grep" | grep "$TMP_PATH" | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 &
-	killall -q -9 v2ray-plugin obfs-local
+	killall -q -9 v2ray-plugin obfs-local xray-plugin
 	rm -f /var/lock/ssr-monitor.lock
 	if [ -f "/var/dnsmasq.d/dnsmasq-ssrplus.conf" ]; then
 		rm -rf /var/dnsmasq.d/dnsmasq-ssrplus.conf $TMP_DNSMASQ_PATH $TMP_PATH/*-ssr-*.json

luci-app-ssr-plus/root/etc/ssrplus/china_ssr.txt

@@ -3639,7 +3639,6 @@
 103.107.216.0/22
 103.107.220.0/22
 103.108.52.0/22
-103.108.64.0/22
 103.108.160.0/22
 103.108.164.0/22
 103.108.184.0/23
@@ -4139,6 +4138,13 @@
 103.164.178.0/23
 103.164.226.0/23
 103.165.44.0/23
+103.165.52.0/23
+103.165.82.0/23
+103.165.110.0/23
+103.166.20.0/23
+103.166.50.0/23
+103.166.52.0/23
+103.166.54.0/23
 103.192.0.0/22
 103.192.4.0/22
 103.192.8.0/22
@@ -5103,7 +5109,6 @@
 103.248.168.0/22
 103.248.192.0/22
 103.248.212.0/22
-103.248.220.0/22
 103.248.224.0/22
 103.249.8.0/22
 103.249.12.0/22
@@ -6753,7 +6758,6 @@
 202.74.42.0/24
 202.74.52.0/24
 202.74.80.0/20
-202.74.232.0/22
 202.74.254.0/23
 202.75.208.0/20
 202.75.252.0/22

luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua

@@ -247,14 +247,9 @@ local function processData(szType, content)
 				local t = split(v, '=')
 				params[t[1]] = t[2]
 			end
-			if params.peer then
+			if params.sni then
 				-- 未指定peer（sni）默认使用remote addr
-				result.tls_host = params.peer
-			end
-			if params.allowInsecure == "1" then
-				result.insecure = "1"
-			else
-				result.insecure = "0"
+				result.tls_host = params.sni
 			end
 		else
 			result.server_port = host[2]