Merge branch 'dev' into gateway

public/fake_ip_filter.list

@@ -114,8 +114,6 @@ swdist.apple.com
 #Google
 lens.l.google.com
 na.b.g-tun.com
-#Netflix
-+.nflxvideo.net
 #FinalFantasy XIV Worldwide Server & CN Server
 *.square-enix.com
 *.finalfantasyxiv.com

scripts/start.sh

@@ -391,6 +391,7 @@ get_core_config() { #下载内核配置文件
     if [ -z "$Https" ]; then
         #Urlencord转码处理保留字符
         if ckcmd hexdump;then
+			Url=$(echo $Url | sed 's/%26/\&/g')   #处理分隔符
 			urlencodeUrl="exclude=$(urlencode "$exclude")&include=$(urlencode "$include")&url=$(urlencode "$Url")&config=$(urlencode "$Config")"
 		else
 			urlencodeUrl="exclude=$exclude&include=$include&url=$Url&config=$Config"

scripts/webget.sh

@@ -934,7 +934,7 @@ gen_core_config_link(){ #在线生成工具
 		echo -e " 0 \033[31m撤销输入并返回上级菜单\033[0m"
 		echo "-----------------------------------------------"
 		read -p "请直接输入第${i}个链接或对应数字选项 > " link
-		link=$(echo $link | sed 's/\&/\\&/g')   #处理分隔符
+		link=$(echo $link | sed 's/\&/%26/g')   #处理分隔符
 		test=$(echo $link | grep "://")
 		link=`echo ${link/\#*/''}`   #删除链接附带的注释内容
 		link=`echo ${link/\ \(*\)/''}`   #删除恶心的超链接内容