v0.9.10

~新增了导入订阅时通过关键字过滤节点的功能 ~优化了导入节点/订阅流程 ~优化了跳过证书验证的方式 ~调整了部分前后端规则地址 ~修复了保守模式下定时任务无法生效的bug
v0.9.9fix
2020-08-24 19:39:50 +08:00 · 2020-08-23 00:35:48 +08:00 · 2020-08-22 23:57:28 +08:00 · 2020-08-22 22:54:31 +08:00 · 2020-08-22 22:22:24 +08:00 · 2020-08-22 22:01:58 +08:00
8 changed files with 705 additions and 429 deletions
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
 # clash-for-Miwifi
-在小米AX3600/AX1800/AX5等路由器上使用clash做透明代理
+在小米等基于openwrt系统的路由器上使用clash做透明代理
 =====

 功能简介：
 --
-~支持小米全系列路由器设备使用clash做透明代理，更多的设备支持可以前往TG群报名参与测试<br>
+~支持小米全系列路由器设备使用clash做透明代理，理论支持各种基于openwrt框架的路由器系统<br>
 ~支持SS、SSR、v2ray、trojan、sock5等协议<br>
 ~支持批量导入节点链接及订阅链接<br>
 ~支持使用网页面板管理规则组<br>
@@ -17,6 +17,10 @@
 ~路由器或设备已经开启SSH并获取root权限<br>
 ~SSH连接工具，例如putty，bitvise，JuiceSSH（支持安卓手机）等<br>

+更新日志：
+--
+https://github.com/juewuy/clash-for-Miwifi/releases
+
 一键安装：
 --
 ```Shell
--- a/bin/Country.mmdb
+++ b/bin/Country.mmdb
--- a/bin/clashfm.tar.gz
+++ b/bin/clashfm.tar.gz
--- a/bin/version
+++ b/bin/version
@@ -1 +1,2 @@
-versionsh=0.9.5
+GeoIP_v=20200824
+versionsh=0.9.10
--- a/scripts/clash.sh
+++ b/scripts/clash.sh
@@ -14,7 +14,7 @@ fi
 ccfg=$clashdir/mark
 yaml=$clashdir/config.yaml
 #检查标识文件
-if [ ! -f "$ccfg" ]; then
+if [ ! -f $ccfg ]; then
 	echo mark文件不存在，正在创建！
 	cat >$ccfg<<EOF
 #标识clash运行状态的文件，不明勿动！
@@ -22,9 +22,12 @@ EOF
 fi
 source $ccfg
 #检查mac地址记录
-[ ! -f "$clashdir/mac" ] && touch $clashdir/mac
+[ ! -f $clashdir/mac ] && touch $clashdir/mac
 #获取自启状态
-if [ -f /etc/rc.d/*clash ]; then 
+if [ "$start_old" = "已开启" ];then
+	auto="\033[33m已设置保守模式！\033[0m"
+	auto1="\033[36m设为\033[0m常规模式启动"
+elif [ -f /etc/rc.d/*clash ];then
 	auto="\033[32m已设置开机启动！\033[0m"
 	auto1="\033[36m禁用\033[0mclash开机启动"
 else
@@ -37,10 +40,10 @@ if [ -z "$redir_mod" ]; then
 	redir_mod=Redir模式
 fi
 #获取运行状态
-status=`ps |grep -w 'clash -d'|grep -v grep|wc -l`
+status=`ps |grep -w 'clash'|grep -v grep|grep -v clash.sh|wc -l`
 if [[ $status -gt 0 ]];then
 	run="\033[32m正在运行（$redir_mod）\033[0m"
-	uid=`ps |grep -w 'clash -d'|grep -v grep|awk '{print $1}'`
+	uid=`ps |grep -w 'clash'|grep -v grep|grep -v clash.sh|awk '{print $1}'`
 	VmRSS=`cat /proc/$uid/status|grep -w VmRSS|awk '{print $2,$3}'`
 	#获取运行时长
 	if [ -n "$start_time" ]; then 
@@ -82,6 +85,10 @@ if [ ! -f $clashdir/Country.mmdb ];then
 	clashstart
 fi
 }
+clashstop(){
+	source $clashdir/start.sh && stop_old
+	/etc/init.d/clash stop > /dev/null 2>&1
+}
 clashstart(){
 	if [ ! -f "$yaml" ];then
 		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -90,24 +97,42 @@ clashstart(){
 	fi
 	if [ $status -gt 0 ];then
 		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		/etc/init.d/clash stop > /dev/null 2>&1
+		clashstop
 		echo -e "\033[31mClash服务已停止！\033[0m"
 	fi
 	echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	if [ "$start_old" = "已开启" ];then
+		source $clashdir/start.sh && start_old
+		sleep 1
+		status=`ps |grep -w 'clash'|grep -v grep|grep -v clash.sh`
+		if [ -z "$status" ];then
+			echo -e "\033[31mclash启动失败！\033[0m" 
+			sed -i /start_old=*/d $ccfg
+			exit
+		fi
+	else
 		/etc/init.d/clash start
 		sleep 1
-		status=`ps |grep -w 'clash -d'|grep -v grep|wc -l`
-	if [[ $status -gt 0 ]];then
+		status=`ps |grep -w 'clash'|grep -v grep|grep -v clash.sh`
+		if [ -z "$status" ];then
+			echo -e "\033[31mclash启动失败！尝试使用保守方式启动！\033[0m"
+			source $clashdir/start.sh && start_old
+			sleep 1
+			status=`ps |grep -w 'clash'|grep -v grep|grep -v clash.sh`
+			if [ -z "$status" ];then
+				echo -e "\033[31mclash启动失败！\033[0m" 
+				sed -i /start_old=*/d $ccfg
+				exit
+			fi
+		fi
+	fi
+
 	host=$(ubus call network.interface.lan status | grep \"address\" | grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}';)
 	echo -e "\033[32mclash服务已启动！\033[0m"
 	echo -e "可以使用\033[30;47m http://clash.razord.top \033[0m管理内置规则"
 	echo -e "Host地址:\033[36m $host \033[0m 端口:\033[36m 9999 \033[0m"
 	echo -e "也可前往更新菜单安装本地Dashboard面板，连接更稳定！\033[0m"
 	echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	else
-		echo -e "\033[31mclash服务启动失败！请检查配置文件！\033[0m"
-		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	fi
 }
 clashlink(){
 #获取订阅规则
@@ -125,12 +150,14 @@ fi
 echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 echo -e "\033[30;47m 欢迎使用订阅功能！\033[0m"
 echo -----------------------------------------------
-echo -e " 1 输入\033[36m节点/订阅\033[0m链接"
-echo -e " 2 输入完整clash规则链接"
-echo -e " 3 选取\033[33m代理规则\033[0m模版"
-echo -e " 4 选择配置生成服务器"
-echo -e " 5 \033[36m还原\033[0m配置文件"
-echo -e " 6 \033[32m手动更新\033[0m订阅"
+echo -e " 1 导入\033[36m节点/订阅\033[0m链接"
+echo -e " 2 使用完整clash规则链接"
+echo -e " 3 添加/修改\033[32m节点过滤\033[0m关键字 \033[47;30m$exclude\033[0m"
+echo -e " 4 选取\033[33m配置规则\033[0m模版"
+echo -e " 5 选择在线生成服务器"
+echo -e " 6 \033[36m还原\033[0m配置文件"
+echo -e " 7 \033[32m手动更新\033[0m订阅"
+echo -----------------------------------------------
 echo -e " 0 返回上级菜单"
 read -p "请输入对应数字 > " num
 if [ -z "$num" ];then
@@ -168,64 +195,23 @@ elif [[ $num == 2 ]];then
 	fi
 	source $clashdir/getdate.sh
 	getlink2
+	
 elif [[ $num == 3 ]];then
-	echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	echo -e "\033[44m 实验性功能，遇问题请加TG群反馈：\033[42;30m t.me/clashfm \033[0m"
-	echo 当前使用规则为：$rule_link
-	echo 1 ACL4SSR默认通用版（推荐）
-	echo 2 ACL4SSR精简全能版（推荐）
-	echo 3 ACL4SSR通用版去广告加强
-	echo 4 ACL4SSR精简版去广告加强
-	echo 5 ACL4SSR通用版无去广告
-	echo 6 ACL4SSR通用版无自动测速
-	echo 7 ACL4SSR精简版无自动测速
-	echo 8 ACL4SSR超重度奈飞全量
-	echo 0 返回上级菜单
-	read -p "请输入对应数字 > " num
-	if [ -z "$num" ];then
-		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		echo -e "\033[31m请输入正确的数字！\033[0m"
+	source $clashdir/getdate.sh
+	linkfilter
 	clashlink
-	elif [[ "$num" == 0 ]];then
-		clashlink
-	else
-		#将对应标记值写入mark
-		sed -i '/rule_link*/'d $ccfg
-		sed -i "4i\rule_link="$num"" $ccfg	
-		rule_link=$num
-		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~	  
-		echo -e "\033[32m设置成功！返回上级菜单！\033[0m"
-		clashlink
-	fi
+	
 elif [[ $num == 4 ]];then
-	echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	echo -e "\033[44m 实验性功能，遇问题请加TG群反馈：\033[42;30m t.me/clashfm \033[0m"
-	echo 当前使用后端为：$server_link
-	echo 1 subconverter-web.now.sh
-	echo 2 subconverter.herokuapp.com
-	echo 3 subcon.py6.pw
-	echo 4 api.dler.io
-	echo 5 api.wcc.best
-	echo 6 skapi.cool
-	echo 7 subconvert.dreamcloud.pw
-	echo 0 返回上级菜单
-	read -p "请输入对应数字 > " num
-    if [ -z "$num" ];then
-		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		echo -e "\033[31m请输入正确的数字！\033[0m"
+	source $clashdir/getdate.sh
+	linkconfig
 	clashlink
-	elif [[ "$num" == 0 ]];then
-		clashlink
-	else
-		#将对应标记值写入mark
-		sed -i '/server_link*/'d $ccfg
-		sed -i "4i\server_link="$num"" $ccfg	
-		server_link=$num
-		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~	  
-		echo -e "\033[32m设置成功！返回上级菜单！\033[0m"
-		clashlink
-	fi
+	
 elif [[ $num == 5 ]];then
+	source $clashdir/getdate.sh
+	linkserver
+	clashlink
+	
+elif [[ $num == 6 ]];then
 	yamlbak=$yaml.bak
 	if [ ! -f "$yaml".bak ];then
 		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -244,8 +230,9 @@ elif [[ $num == 5 ]];then
 		fi
 	fi
 	clashsh
-elif [[ $num == 6 ]];then
-	if [ -z "$Url" ];then
+	
+elif [[ $num == 7 ]];then
+	if [ -z "$Url" -a -z "$Https" ];then
 		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		echo 没有找到你的订阅链接！请先输入链接！
 		clashlink
@@ -270,23 +257,12 @@ else
 	exit;
 fi
 }
-clashadv(){
+clashcfg(){
 #获取设置默认显示
-if [ -z "$skip_cert" ]; then
-	skip_cert=已开启
-fi
-if [ -z "$common_ports" ]; then
-	common_ports=未开启
-fi
-if [ -z "$dns_mod" ]; then
-	dns_mod=redir_host
-fi
-if [ -z "$modify_yaml" ]; then
-	modify_yaml=未开启
-fi
-if [ -z "$ipv6_support" ]; then
-	ipv6_support=未开启
-fi
+[ -z "$skip_cert" ] && skip_cert=未开启
+[ -z "$common_ports" ] && common_ports=未开启
+[ -z "$dns_mod" ] && dns_mod=redir_host
+[ -z "$dns_over" ] && dns_over=未开启
 if [ -z "$(cat $clashdir/mac)" ]; then
 	mac_return=未开启
 else
@@ -294,18 +270,19 @@ else
 fi
 #
 echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-echo -e "\033[30;47m欢迎使用高级模式菜单：\033[0m"
-echo -e "\033[33m修改配置后请手动重启clash服务！\033[0m"
+echo -e "\033[30;47m欢迎使用功能设置菜单：\033[0m"
+echo -e "\033[32m修改配置后请手动重启clash服务！\033[0m"
 echo -----------------------------------------------
 echo -e " 1 切换Clash运行模式: 	\033[36m$redir_mod\033[0m"
 echo -e " 2 切换DNS运行模式：	\033[36m$dns_mod\033[0m"
 echo -e " 3 跳过本地证书验证：	\033[36m$skip_cert\033[0m   ————解决节点证书验证错误"
 echo -e " 4 只代理常用端口： 	\033[36m$common_ports\033[0m   ————用于屏蔽P2P流量"
-echo -e " 5 不修饰config.yaml:	\033[36m$modify_yaml\033[0m   ————用于使用自定义配置"
-echo -e " 6 启用ipv6支持:     	\033[36m$ipv6_support\033[0m   ————实验性且不兼容Fake_ip"
-echo -e " 7 过滤局域网mac地址：	\033[36m$mac_return\033[0m   ————列表内设备不走代理"
+echo -e " 5 过滤局域网mac地址：	\033[36m$mac_return\033[0m   ————列表内设备不走代理"
+echo -e " 6 不使用本地DNS服务：	\033[36m$dns_over\033[0m   ————防止redir-host模式的dns污染"
+echo -----------------------------------------------
 echo -e " 9 \033[32m重启\033[0mclash服务"
 echo -e " 0 返回上级菜单 \033[0m"
+echo -----------------------------------------------
 read -p "请输入对应数字 > " num
 if [[ $num -le 9 ]] > /dev/null 2>&1; then 
 	if [[ $num == 0 ]]; then
@@ -330,16 +307,16 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then
 		if [ -z "$num" ]; then
 			echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			echo -e "\033[31m请输入正确的数字！\033[0m"
-			clashadv
+			clashcfg
 		elif [[ $num == 0 ]]; then
-			clashadv
+			clashcfg
 		elif [[ $num == 1 ]]; then
 			redir_mod=Redir模式
 		elif [[ $num == 2 ]]; then
 			if [ "$clashcore" = "clash" ] || [ "$clashcore" = "clashr" ];then
 				echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 				echo -e "\033[31m当前核心不支持开启Tun模式！请先切换clash核心！！！\033[0m"
-				clashadv
+				clashcfg
 			fi
 			redir_mod=Tun模式
 			dns_mod=fake-ip
@@ -347,13 +324,13 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then
 			if [ "$clashcore" = "clash" ] || [ "$clashcore" = "clashr" ];then
 				echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 				echo -e "\033[31m当前核心不支持开启Tun模式！请先切换clash核心！！！\033[0m"
-				clashadv
+				clashcfg
 			fi
 			redir_mod=混合模式		
 		else
 			echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			echo -e "\033[31m请输入正确的数字！\033[0m"
-			clashadv
+			clashcfg
 		fi
 		sed -i '/redir_mod*/'d $ccfg
 		sed -i "1i\redir_mod=$redir_mod" $ccfg
@@ -361,7 +338,7 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then
 		sed -i "1i\dns_mod=$dns_mod" $ccfg
 		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~	
 		echo -e "\033[36m已设为 $redir_mod ！！\033[0m"
-		clashadv
+		clashcfg
 	  
 	elif [[ $num == 2 ]]; then
 		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -377,9 +354,9 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then
 		if [ -z "$num" ]; then
 			echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			echo -e "\033[31m请输入正确的数字！\033[0m"
-			clashadv
+			clashcfg
 		elif [[ $num == 0 ]]; then
-			clashadv
+			clashcfg
 		elif [[ $num == 1 ]]; then
 			dns_mod=fake-ip
 		elif [[ $num == 2 ]]; then
@@ -388,7 +365,7 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then
 		else
 			echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			echo -e "\033[31m请输入正确的数字！\033[0m"
-			clashadv
+			clashcfg
 		fi
 		sed -i '/dns_mod*/'d $ccfg
 		sed -i "1i\dns_mod=$dns_mod" $ccfg
@@ -396,7 +373,7 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then
 		sed -i "1i\redir_mod=$redir_mod" $ccfg
 		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~	
 		echo -e "\033[36m已设为 $dns_mod 模式！！\033[0m"
-		clashadv
+		clashcfg
 	
 	elif [[ $num == 3 ]]; then	
 		sed -i '/skip_cert*/'d $ccfg
@@ -406,12 +383,11 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then
 			echo -e "\033[33m已设为开启跳过本地证书验证！！\033[0m"
 			skip_cert=已开启
 		else
-			/etc/init.d/clash enable
 			sed -i "1i\skip_cert=未开启" $ccfg
 			echo -e "\033[33m已设为禁止跳过本地证书验证！！\033[0m"
 			skip_cert=未开启
 		fi
-		clashadv
+		clashcfg
 	
 	elif [[ $num == 4 ]]; then	
 		sed -i '/common_ports*/'d $ccfg
@@ -421,47 +397,13 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then
 			echo -e "\033[33m已设为仅代理（22,53,587,465,995,993,143,80,443）等常用端口！！\033[0m"
 			common_ports=已开启
 		else
-			/etc/init.d/clash enable
 			sed -i "1i\common_ports=未开启" $ccfg
 			echo -e "\033[33m已设为代理全部端口！！\033[0m"
 			common_ports=未开启
 		fi
-		clashadv  
+		clashcfg  

 	elif [[ $num == 5 ]]; then	
-		sed -i '/modify_yaml*/'d $ccfg
-		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		if [ "$modify_yaml" = "未开启" ] > /dev/null 2>&1; then 
-			sed -i "1i\modify_yaml=已开启" $ccfg
-			echo -e "\033[33m已设为使用用户完成自定义配置文件！！"
-			echo -e "\033[0m不明白原理的用户切勿随意开启此选项"
-			echo -e "\033[33m！！！必然会导致上不了网！！!\033[0m"
-			modify_yaml=已开启
-		else
-			/etc/init.d/clash enable
-			sed -i "1i\modify_yaml=未开启" $ccfg
-			echo -e "\033[32m已设为使用脚本内置规则管理config.yaml配置文件！！\033[0m"
-			modify_yaml=未开启
-		fi
-		clashadv  
-		
-	elif [[ $num == 6 ]]; then	
-		sed -i '/ipv6_support*/'d $ccfg
-		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		if [ "$ipv6_support" = "未开启" ] > /dev/null 2>&1; then 
-			sed -i "1i\ipv6_support=已开启" $ccfg
-			echo -e "\033[33m已开启对ipv6协议的支持！！\033[0m"
-			echo -e "Clash对ipv6的支持并不友好，如不能使用请静等修复！"
-			ipv6_support=已开启
-		else
-			/etc/init.d/clash enable
-			sed -i "1i\ipv6_support=未开启" $ccfg
-			echo -e "\033[32m已禁用对ipv6协议的支持！！\033[0m"
-			ipv6_support=未开启
-		fi
-		clashadv  
-
-	elif [[ $num == 7 ]]; then	
 	
 		add_mac(){
 			echo -----------------------------------------------
@@ -470,9 +412,9 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then
 			echo -e "\033[0m 0 或回车 结束添加"
 			read -p "请输入对应序号 > " num
 			if [ -z "$num" ]; then
-				clashadv
+				clashcfg
 			elif [ $num -le 0 ]; then
-				clashadv
+				clashcfg
 			elif [ $num -le $(cat /tmp/dhcp.leases | awk 'END{print NR}') ]; then
 				macadd=$(cat /tmp/dhcp.leases | awk '{print $2}' | sed -n "$num"p)
 				if [ -z $(cat $clashdir/mac | grep -E "$macadd") ];then
@@ -506,39 +448,136 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then
 		if [ -z "$num" ]; then
 			echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			echo -e "\033[31m请输入正确的数字！\033[0m"
-			clashadv
+			clashcfg
 		elif [[ $num == 0 ]]; then
-			clashadv
+			clashcfg
 		elif [[ $num == 1 ]]; then
 			:>$clashdir/mac
 			echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			echo -e "\033[31m设备列表已清空！\033[0m"
 			sleep 1
-			clashadv
+			clashcfg
 		elif [[ $num == 2 ]]; then	
 			add_mac
 			
 		else
 			echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			echo -e "\033[31m请输入正确的数字！\033[0m"
-			clashadv
+			clashcfg
 		fi
 		
-
-
-		clashadv 
+	elif [[ $num == 6 ]]; then	
+		sed -i '/dns_over*/'d $ccfg
+		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		if [ "$dns_over" = "未开启" ] > /dev/null 2>&1; then 
+			sed -i "1i\dns_over=已开启" $ccfg
+			echo -e "\033[33m已设置DNS为不走本地dnsmasq服务器！\033[0m"
+			echo -e "可能会对浏览速度产生一定影响，介意勿用！"
+			dns_over=已开启
+		else
+			/etc/init.d/clash enable
+			sed -i "1i\dns_over=未开启" $ccfg
+			echo -e "\033[32m已设置DNS通过本地dnsmasq服务器！\033[0m"
+			echo -e "redir-host模式下部分网站可能会被运营商dns污染导致无法打开"
+			dns_over=未开启
+		fi
+		clashcfg  
 		
 	elif [[ $num == 9 ]]; then	
-		if [ $status -gt 0 ];then
-			echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			/etc/init.d/clash stop
-			echo -e "\033[31mClash服务已停止！\033[0m"
-		fi
 		clashstart
 		clashsh
 	else
 		echo -e "\033[31m暂未支持的选项！\033[0m"
+		clashcfg
+	fi
+else
+	echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	echo -e "\033[31m请输入正确的数字！\033[0m"
+	clashsh
+fi
+exit;
+}
+clashadv(){
+#获取设置默认显示
+[ -z "$modify_yaml" ] && modify_yaml=未开启
+[ -z "$ipv6_support" ] && ipv6_support=未开启
+[ -z "$start_old" ] && start_old=未开启
+#
+echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+echo -e "\033[30;47m欢迎使用进阶模式菜单：\033[0m"
+echo -e "\033[33m如您不是很了解clash的运行机制，请勿更改！\033[0m"
+echo -e "\033[32m修改配置后请手动重启clash服务！\033[0m"
+echo -----------------------------------------------
+echo -e " 1 不修饰config.yaml:	\033[36m$modify_yaml\033[0m   ————用于使用自定义配置"
+echo -e " 2 启用ipv6支持:     	\033[36m$ipv6_support\033[0m   ————实验性且不兼容Fake_ip"
+echo -e " 3 使用保守方式启动:	\033[36m$start_old\033[0m   ————切换时会停止clash服务"
+echo -----------------------------------------------
+echo -e " 9 \033[32m重启\033[0mclash服务"
+echo -e " 0 返回上级菜单 \033[0m"
+echo -----------------------------------------------
+read -p "请输入对应数字 > " num
+if [[ $num -le 9 ]] > /dev/null 2>&1; then 
+	if [[ $num == 0 ]]; then
+		clashsh  
+	
+	elif [[ $num == 1 ]]; then	
+		sed -i '/modify_yaml*/'d $ccfg
+		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		if [ "$modify_yaml" = "未开启" ] > /dev/null 2>&1; then 
+			sed -i "1i\modify_yaml=已开启" $ccfg
+			echo -e "\033[33m已设为使用用户完全自定义的配置文件！！"
+			echo -e "\033[36m不明白原理的用户切勿随意开启此选项"
+			echo -e "\033[31m！！！必然会导致上不了网！！!\033[0m"
+			modify_yaml=已开启
+			sleep 3
+		else
+			sed -i "1i\modify_yaml=未开启" $ccfg
+			echo -e "\033[32m已设为使用脚本内置规则管理config.yaml配置文件！！\033[0m"
+			modify_yaml=未开启
+		fi
 		clashadv  
+		
+	elif [[ $num == 2 ]]; then	
+		sed -i '/ipv6_support*/'d $ccfg
+		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		if [ "$ipv6_support" = "未开启" ] > /dev/null 2>&1; then 
+			sed -i "1i\ipv6_support=已开启" $ccfg
+			echo -e "\033[33m已开启对ipv6协议的支持！！\033[0m"
+			echo -e "Clash对ipv6的支持并不友好，如不能使用请静等修复！"
+			ipv6_support=已开启
+			sleep 2
+		else
+			sed -i "1i\ipv6_support=未开启" $ccfg
+			echo -e "\033[32m已禁用对ipv6协议的支持！！\033[0m"
+			ipv6_support=未开启
+		fi
+		clashadv  
+		
+	elif [[ $num == 3 ]]; then	
+		sed -i '/start_old*/'d $ccfg
+		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		if [ "$start_old" = "未开启" ] > /dev/null 2>&1; then 
+			sed -i "1i\start_old=已开启" $ccfg
+			echo -e "\033[33m改为使用保守方式启动clash服务！！\033[0m"
+			echo -e "\033[36m此模式兼容性更好但无法禁用开机启动！！\033[0m"
+			start_old=已开启
+			/etc/init.d/clash stop > /dev/null 2>&1
+			sleep 2
+		else
+			sed -i "1i\start_old=未开启" $ccfg
+			echo -e "\033[32m改为使用默认方式启动clash服务！！\033[0m"
+			start_old=未开启
+			source $clashdir/start.sh && stop_old
+		fi
+		clashadv  
+
+		
+	elif [[ $num == 9 ]]; then	
+		clashstart
+		clashsh
+	else
+		echo -e "\033[31m暂未支持的选项！\033[0m"
+		clashsh
 	fi
 else
 	echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -558,9 +597,11 @@ echo -e " 1 更新\033[36m管理脚本\033[0m"
 echo -e " 2 切换\033[33mclash核心\033[0m"
 echo -e " 3 更新\033[32mGeoIP数据库\033[0m"
 echo -e " 4 安装本地\033[35mDashboard\033[0m面板"
+echo -----------------------------------------------
 echo -e " 8 切换\033[36m安装源\033[0m地址"
 echo -e " 9 \033[31m卸载\033[34mClash for Miwfi\033[0m"
 echo -e " 0 返回上级菜单" 
+echo -----------------------------------------------
 read -p "请输入对应数字 > " num
 if [[ $num -le 9 ]] > /dev/null 2>&1; then 
 	if [[ $num == 0 ]]; then
@@ -621,8 +662,10 @@ clashcron(){
 	echo -e " 输入  1-7  对应\033[33m每周相应天\033[0m运行"
 	echo -e " 输入   8   设为\033[33m每天定时\033[0m运行"
 	echo -e " 输入 1,3,6 代表\033[36m每周1,3,6\033[0m运行(注意用小写逗号分隔)"
+	echo -----------------------------------------------
 	echo -e " 输入   9   \033[31m删除定时任务\033[0m"
 	echo -e " 输入   0   返回上级菜单"
+	echo -----------------------------------------------
 	read -p "请输入对应数字 > " num
 	if [ -z "$num" ]; then 
 		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -709,6 +752,7 @@ echo -e " 1 设置\033[33m定时重启\033[0mclash服务"
 echo -e " 2 设置\033[31m定时停止\033[0mclash服务"
 echo -e " 3 设置\033[32m定时开启\033[0mclash服务"
 echo -e " 4 设置\033[33m定时更新\033[0m订阅链接(实验性，可能不稳定)"
+echo -----------------------------------------------
 echo -e " 0 返回上级菜单" 
 read -p "请输入对应数字 > " num
 if [ -z "$num" ]; then 
@@ -721,15 +765,15 @@ elif [[ $num == 0 ]]; then
 	
 elif [[ $num == 1 ]]; then
 	cronname=重启clash服务
-	cronset='/etc/init.d/clash restart'
+	cronset='source /etc/profile && source $clashdir/start.sh && restart'
 	setcron
 elif [[ $num == 2 ]]; then
 	cronname=停止clash服务
-	cronset='/etc/init.d/clash stop'
+	cronset='source /etc/profile && source $clashdir/start.sh && stop'
 	setcron
 elif [[ $num == 3 ]]; then
 	cronname=开启clash服务
-	cronset='/etc/init.d/clash start'
+	cronset='source /etc/profile && source $clashdir/start.sh && start'
 	setcron
 elif [[ $num == 4 ]]; then	
 	cronname=更新订阅链接
@@ -747,13 +791,15 @@ clashsh(){
 getconfig
 #############################
 echo -e " 1 \033[32m启动/重启\033[0mclash服务"
-echo -e " 2 clash\033[33m高级设置\033[0m"
+echo -e " 2 clash\033[33m功能设置\033[0m"
 echo -e " 3 \033[31m停止\033[0mclash服务"
 echo -e " 4 $auto1"
-echo -e " 5 设置定时任务"
+echo -e " 5 设置\033[33m定时任务\033[0m"
 echo -e " 6 导入\033[32m节点/订阅\033[0m链接"
+echo -e " 7 clash\033[31m进阶设置\033[0m"
 echo -e " 8 \033[35m测试菜单\033[0m"
 echo -e " 9 \033[36m更新/卸载\033[0m"
+echo -----------------------------------------------
 echo -e " 0 \033[0m退出脚本\033[0m"
 read -p "请输入对应数字 > " num
 if [[ $num -le 9 ]] > /dev/null 2>&1; then 
@@ -766,10 +812,10 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then
 		exit;
  
 	elif [[ $num == 2 ]]; then
-		clashadv
+		clashcfg

 	elif [[ $num == 3 ]]; then
-		/etc/init.d/clash stop > /dev/null 2>&1
+		clashstop
 		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		echo -e "\033[31mClash服务已停止！\033[0m"
 		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -777,7 +823,12 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then

 	elif [[ $num == 4 ]]; then
 		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		if [ -f /etc/rc.d/*clash ]; then
+		if [ "$start_old" = "已开启" ];then
+			sed -i "/start_old*/d" $ccfg
+			sed -i "1i\start_old=未开启" $ccfg
+			echo -e "\033[32m已设为使用默认方式启动clash服务！！\033[0m"
+			start_old=未开启
+		elif [ -f /etc/rc.d/*clash ]; then
 			/etc/init.d/clash disable
 			echo -e "\033[33m已禁止Clash开机启动！\033[0m"
 		else
@@ -792,6 +843,9 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then
 	elif [[ $num == 6 ]]; then
 		clashlink
 		
+	elif [[ $num == 7 ]]; then
+		clashadv
+
 	elif [[ $num == 8 ]]; then
 		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		echo -e "\033[30;47m这里是测试命令菜单\033[0m"
@@ -803,6 +857,7 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then
 		echo " 4 查看iptables端口转发详情"
 		echo " 5 查看config.yaml前40行"
 		echo " 6 测试代理服务器连通性（google.tw)"
+		echo -----------------------------------------------
 		echo " 0 返回上级目录！"
 		read -p "请输入对应数字 > " num
 		if [ -z "$num" ]; then
--- a/scripts/clashservice
+++ b/scripts/clashservice
@@ -5,155 +5,15 @@
 USE_PROCD=1
 START=92

-getconfig(){
+start_service() {
 	#开机加载环境变量保证找到文件路径
 	source /etc/profile > /dev/null 2>&1
-ccfg=$clashdir/mark
-if [ ! -f "$ccfg" ]; then
-	echo mark文件不存在，默认以Redir模式运行！
-cat >$ccfg<<EOF
-#标识clash运行状态的文件，不明勿动！
-EOF
-	#指定一些默认状态
-	redir_mod=redir模式
-	common_ports=未开启
-	dns_mod=redir-host
-	modify_yaml=未开启
-	ipv6_support=未开启
-fi
-source $ccfg #加载配置文件
-#是否代理常用端口
-if [ "$common_ports" = "已开启" ];then
-	ports='-m multiport --dports 22,53,587,465,995,993,143,80,443 '
-fi
-#DNS模式
-if [ "$common_ports" = "已开启" ];then
-	ports='-m multiport --dports 22,53,587,465,995,993,143,80,443 '
-fi
-#检测系统端口占用
-for portx in 1053 7890 7892 9999 ;do
-	[ -n "$(netstat -ntulp |grep $portx|grep -v clash)" ] && echo -e "检测到端口：\033[30;47m $portx \033[0m被占用！clash无法启动！" && exit;
-done
-}
-modify_yaml(){
-##########需要变更的配置###########
-mix='mixed-port: 7890'
-redir='redir-port: 7892'
-lan='allow-lan: true'
-mode='mode: Rule'
-log='log-level: info'
-if [ "$ipv6_support" = "已开启" ];then
-ipv6='ipv6: true'
-else
-ipv6='ipv6: false'
-fi
-external='external-controller: 0.0.0.0:9999'
-if [ "$dns_mod" = "fake-ip" ];then
-dns='dns: {enable: true, listen: 0.0.0.0:1053, fake-ip-range: 198.18.0.1/16, enhanced-mode: fake-ip, nameserver: [114.114.114.114, 127.0.0.1:53], fallback: [tcp://1.0.0.1, 8.8.4.4]}'
-else
-dns='dns: {enable: true, ipv6: true, listen: 0.0.0.0:1053, enhanced-mode: redir-host, nameserver: [114.114.114.114, 127.0.0.1:53], fallback: [1.0.0.1, 8.8.4.4]}'
-fi
-if [ "$redir_mod" != "Redir模式" ];then
-tun='tun: {enable: true, stack: system}'
-else
-tun='tun: {enable: false}'
-fi 
-exper='experimental: {ignore-resolve-fail: true, interface-name: en0}'
-###################################
-	#预删除需要添加的项目
-	i=$(grep  -n  "^proxies:" $clashdir/config.yaml | head -1 | cut -d ":" -f 1)
-	i=$(($i-1))
-	sed -i '1,'$i'd' $clashdir/config.yaml
-	#添加配置
-	sed -i "1i$mix" $clashdir/config.yaml
-	sed -i "1a$redir" $clashdir/config.yaml
-	sed -i "2a$lan" $clashdir/config.yaml
-	sed -i "3a$mode" $clashdir/config.yaml
-	sed -i "4a$log" $clashdir/config.yaml
-	sed -i "5a$ipv6" $clashdir/config.yaml
-	sed -i "6a$external" $clashdir/config.yaml
-	sed -i "7a$dns" $clashdir/config.yaml
-	sed -i "8a$tun" $clashdir/config.yaml
-	sed -i "9a$exper" $clashdir/config.yaml
-	#跳过本地tls证书验证
-	if [ "$skip_cert" != "未开启" ];then
-	sed -i "10,99s/sni: \S*/\1skip-cert-verify: true}/" $clashdir/config.yaml  #跳过trojan本地证书验证
-	sed -i '10,99s/}}/}, skip-cert-verify: true}/' $clashdir/config.yaml  #跳过v2+ssl本地证书验证
-	fi
-	#sed -i '/rules:/a \ - DOMAIN-SUFFIX,clash.razord.top,🎯 全球直连' $clashdir/config.yaml
-}
-mark_time(){
-	start_time=`date +%s`
-	sed -i '/start_time*/'d $ccfg
-	sed -i "3i\start_time=$start_time" $ccfg
-}
-start_redir(){
-	#修改iptables规则使流量进入clash
-	iptables -t nat -N clash
-	iptables -t nat -A clash -d 0.0.0.0/8 -j RETURN
-	iptables -t nat -A clash -d 10.0.0.0/8 -j RETURN
-	iptables -t nat -A clash -d 127.0.0.0/8 -j RETURN
-	iptables -t nat -A clash -d 169.254.0.0/16 -j RETURN
-	iptables -t nat -A clash -d 172.16.0.0/12 -j RETURN
-	iptables -t nat -A clash -d 192.168.0.0/16 -j RETURN
-	iptables -t nat -A clash -d 224.0.0.0/4 -j RETURN
-	iptables -t nat -A clash -d 240.0.0.0/4 -j RETURN
-	for mac in $(cat $clashdir/mac); do
-		iptables -t nat -A clash -m mac --mac-source $mac -j RETURN
-	done
-	
-	iptables -t nat -A clash -p tcp $ports-j REDIRECT --to-ports 7892
-	iptables -t nat -A PREROUTING -p tcp -j clash
-	if [ "$ipv6_support" = "已开启" ];then
-		ip6tables -t nat -N clash
-		for mac in $(cat $clashdir/mac); do
-			ip6tables -t nat -A clash -m mac --mac-source $mac -j RETURN
-		done
-		ip6tables -t nat -A clash -p tcp $ports-j REDIRECT --to-ports 7892
-		ip6tables -t nat -A PREROUTING -p tcp -j clash
-	fi
-}
-stop_iptables(){
-    #重置iptables规则
-	iptables -t nat -D PREROUTING -p tcp -j clash > /dev/null 2>&1
-	iptables -t nat -D PREROUTING -p udp -j clash_dns > /dev/null 2>&1
-	iptables -t nat -F clash > /dev/null 2>&1
-	iptables -t nat -X clash > /dev/null 2>&1
-	iptables -t nat -F clash_dns > /dev/null 2>&1
-	iptables -t nat -X clash_dns > /dev/null 2>&1
-	#重置ipv6规则
-	ip6tables -t nat -D PREROUTING -p tcp -j clash > /dev/null 2>&1
-	ip6tables -t nat -D PREROUTING -p udp -j clash_dns > /dev/null 2>&1
-	ip6tables -t nat -F clash > /dev/null 2>&1
-	ip6tables -t nat -X clash > /dev/null 2>&1
-	ip6tables -t nat -F clash_dns > /dev/null 2>&1
-	ip6tables -t nat -X clash_dns > /dev/null 2>&1
-}
-start_dns(){
-	#允许tun网卡接受流量
-	iptables -I FORWARD -o utun -j ACCEPT
-	ip6tables -I FORWARD -o utun -j ACCEPT
-	#设置dns转发
-	iptables -t nat -N clash_dns
-	for mac in $(cat $clashdir/mac); do
-		iptables -t nat -A clash_dns -m mac --mac-source $mac -j RETURN
-	done
-	iptables -t nat -A clash_dns -p udp --dport 53 -j REDIRECT --to 1053
-	iptables -t nat -A PREROUTING -p udp -j clash_dns
-	#ipv6DNS
-	ip6tables -t nat -N clash_dns
-	for mac in $(cat $clashdir/mac); do
-		ip6tables -t nat -A clash_dns -m mac --mac-source $mac -j RETURN
-	done
-	ip6tables -t nat -A clash_dns -p udp --dport 53 -j REDIRECT --to 1053
-	ip6tables -t nat -A PREROUTING -p udp -j clash_dns
-}
-start_service() {
+	#加载修饰脚本
+	source $clashdir/start.sh
+	#读取配置文件
 	getconfig
 	#使用内置规则强行覆盖config配置文件
-	if [ "$modify_yaml" != "已开启" ];then
-	modify_yaml
-	fi
+	[ "$modify_yaml" != "已开启" ] && modify_yaml
    #创建clash后台进程
 	procd_open_instance
 	procd_set_param respawn
@@ -164,11 +24,14 @@ start_service() {
 	#修改iptables规则使流量进入clash
 	stop_iptables
 	start_dns
-	if [ "$redir_mod" != "Tun模式" ];then
-	start_redir
-	fi
+	[ "$redir_mod" != "Tun模式" ] && start_redir
+	#标记启动时间
 	mark_time
+	#标记启动方式
+	sed -i /start_old=*/d $ccfg
+	sed -i "1i\start_old=未开启" $ccfg	
 }
 stop_service() {
+	source $clashdir/start.sh
 	stop_iptables
 }
--- a/scripts/getdate.sh
+++ b/scripts/getdate.sh
@@ -12,7 +12,6 @@ subcon.py6.pw
 api.dler.io
 api.wcc.best
 skapi.cool
-subconvert.dreamcloud.pw
 EOF`
 Config=`sed -n ""$rule_link"p"<<EOF
 https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online.ini
@@ -23,11 +22,12 @@ https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_On
 https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_NoAuto.ini
 https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_Mini_NoAuto.ini
 https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_Full_Netflix.ini
+https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_Full_AdblockPlus.ini
 EOF`
 #如果传来的是Url链接则合成Https链接，否则直接使用Https链接
 if [ -z $Https ];then
-	echo $Url
-	Https="https://$Server/sub?target=clashr&new_name=true&url=$Url&insert=false&config=$Config"
+	#echo $Url
+	Https="https://$Server/sub?target=clashr&insert=true&new_name=true&scv=true&exclude=$exclude&url=$Url&config=$Config"
 	markhttp=1
 fi
 #
@@ -42,7 +42,7 @@ echo -e "|       \033[0m如长时间没有数据请用ctrl+c退出\033[36m
 echo -e "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\033[0m"
 #获取在线yaml文件
 yaml=$clashdir/config.yaml
-yamlnew=$yaml.new
+yamlnew=/tmp/config.yaml
 rm -rf $yamlnew > /dev/null 2>&1
 result=$(curl -w %{http_code} -kLo $yamlnew $Https)
 if [ "$result" != "200" ];then
@@ -51,12 +51,14 @@ if [ "$result" != "200" ];then
 	echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	echo
 	if [ -z $markhttp ];then
-		exit;
+		echo 请尝试使用导入节点/链接功能！
+		getlink
+		
 	else
 		read -p "是否更换后端地址后重试？[1/0] > " res
 		if [ "$res" = '1' ]; then
 			sed -i '/server_link=*/'d $ccfg
-			if [[ $server_link == 7 ]]; then
+			if [[ $server_link -ge 6 ]]; then
 				server_link=0
 			fi
 			server_link=$(($server_link + 1))
@@ -68,28 +70,63 @@ if [ "$result" != "200" ];then
 		#exit;
 	fi
 else
+	Https=""
 	if cat $yamlnew | grep ', server:' >/dev/null;then
-		#替换文件
-		if [ -f $yaml ];then
-			mv $yaml $yaml.bak
+		#检测旧格式
+		if cat $yamlnew | grep 'Proxy Group:' >/dev/null;then
+			echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			echo -e "\033[31m已经停止对旧格式配置文件的支持！！！\033[0m"
+			echo -e "请使用新格式或者使用\033[32m导入节点/订阅\033[0m功能！"
+			sleep 2
+			clashlink
 		fi
+		#检测不支持的加密协议
+		if cat $yamlnew | grep 'cipher: chacha20,' >/dev/null;then
+			if [ "$clashcore" = "clash" -o "$clashcore" = "clashpre" ];then
+				echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+				echo -e "\033[31m当前核心：$clashcore不支持chacha20加密！！！\033[0m"
+				echo -e "请更换使用clashR核心！！！"
+				sleep 2
+				getcore
+			fi
+		fi
+		#替换文件
+		[ -f $yaml ] && mv $yaml $yaml.bak
 		mv $yamlnew $yaml
 		echo 配置文件已生成！正在启动clash使其生效！
 		#重启clash服务
-		/etc/init.d/clash stop > /dev/null 2>&1
-		/etc/init.d/clash start
-		sleep 1
-		status=`ps |grep -w 'clash -d'|grep -v grep|wc -l`
-		if [[ $status -gt 0 ]];then
+		killall -9 clash &> /dev/null
+		start_over(){
 			host=$(ubus call network.interface.lan status | grep \"address\" | grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}';)
-			echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			echo -e "\033[32mclash服务已启动！\033[0m"
 			echo -e "可以使用\033[30;47m http://clash.razord.top \033[0m管理内置规则"
 			echo -e "Host地址:\033[36m $host \033[0m 端口:\033[36m 9999 \033[0m"
 			echo -e "也可前往更新菜单安装本地Dashboard面板，连接更稳定！\033[0m"
-			sleep 1
+			echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			clashsh
+		}
+		if [ "$start_old" = "已开启" ];then
+			source $clashdir/start.sh && start_old
+			sleep 1
+			status=`ps |grep -w 'clash'|grep -v grep|grep -v clash.sh|wc -l`
+			if [[ $status -gt 0 ]];then
+			start_over
+			fi
 		else
+			/etc/init.d/clash start
+			sleep 1
+			status=`ps |grep -w 'clash'|grep -v grep|grep -v clash.sh|wc -l`
+			if [[ $status -gt 0 ]];then
+				start_over
+			else
+				echo -e "\033[31mclash服务启动失败！尝试使用保守方式启动！\033[0m"
+				source $clashdir/start.sh && start_old
+				sleep 1
+				status=`ps |grep -w 'clash'|grep -v grep|grep -v clash.sh|wc -l`
+				if [[ $status -gt 0 ]];then
+					start_over
+				fi
+			fi
 			echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			if [ -f $yaml.bak ];then
 				echo -e "\033[31mclash服务启动失败！已还原配置文件并重启clash！\033[0m"
@@ -98,9 +135,9 @@ else
 				sleep 1
 				clashsh
 			else
-				echo -e "\033[31mclash服务启动失败！请利用测试菜单排查问题！\033[0m"
-				sleep 1
-				clashsh
+				echo -e "\033[31mclash服务启动失败！请查看报错信息！\033[0m"
+				$clashdir/clash -d $clashdir & { sleep 3 ; kill $! & }
+				exit;
 			fi
 		fi
 	else
@@ -116,6 +153,130 @@ else
 fi
 #exit
 }
+linkconfig(){
+echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+echo -e "\033[44m 实验性功能，遇问题请加TG群反馈：\033[42;30m t.me/clashfm \033[0m"
+echo 当前使用规则为：$rule_link
+echo 1 ACL4SSR默认通用版
+echo 2 ACL4SSR精简全能版（推荐）
+echo 3 ACL4SSR通用版+去广告加强
+echo 4 ACL4SSR精简版+去广告加强
+echo 5 ACL4SSR通用版无去广告
+echo 6 ACL4SSR通用版无自动测速
+echo 7 ACL4SSR精简版无自动测速
+echo 8 ACL4SSR全分组+奈飞（慎用）
+echo 9 ACL4SSR全分组+去广告（慎用）
+echo -----------------------------------------------
+echo 0 返回上级菜单
+read -p "请输入对应数字 > " num
+if [ -z "$num" ] || [[ $num -gt 9 ]];then
+	echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	echo -e "\033[31m请输入正确的数字！\033[0m"
+elif [[ "$num" = 0 ]];then
+	echo 
+elif [[ $num -le 9 ]];then
+	#将对应标记值写入mark
+	sed -i '/rule_link*/'d $ccfg
+	sed -i "4i\rule_link="$num"" $ccfg	
+	rule_link=$num
+	echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~	  
+	echo -e "\033[32m设置成功！返回上级菜单\033[0m"
+fi
+}
+linkserver(){
+echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+echo -e "\033[44m 实验性功能，遇问题请加TG群反馈：\033[42;30m t.me/clashfm \033[0m"
+echo 当前使用后端为：$server_link
+echo 1 subconverter-web.now.sh
+echo 2 subconverter.herokuapp.com
+echo 3 subcon.py6.pw
+echo 4 api.dler.io
+echo 5 api.wcc.best
+echo 6 skapi.cool
+echo -----------------------------------------------
+echo 0 返回上级菜单
+read -p "请输入对应数字 > " num
+if [ -z "$num" ] || [[ $num -gt 6 ]];then
+	echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	echo -e "\033[31m请输入正确的数字！\033[0m"
+elif [[ "$num" = 0 ]];then
+	echo
+elif [[ $num -le 6 ]];then
+	#将对应标记值写入mark
+	sed -i '/server_link*/'d $ccfg
+	sed -i "4i\server_link="$num"" $ccfg	
+	server_link=$num
+	echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~	  
+	echo -e "\033[32m设置成功！返回上级菜单\033[0m"
+fi
+}
+linkfilter(){
+[ -z "$exclude" ] && exclude="未设置"
+echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+echo -e "\033[44m 实验性功能，遇问题请加TG群反馈：\033[42;30m t.me/clashfm \033[0m"
+echo -e "\033[33m当前过滤关键字：\033[47;30m$exclude\033[0m"
+echo -----------------------------------------------
+echo -e "\033[36m匹配关键字的节点会在导入时被屏蔽\033[0m"
+echo -e "多个关键字可以用\033[30;47m | \033[0m号分隔"
+echo -e "\033[32m支持正则表达式\033[0m，特殊符号请使用\033[30;47m \ \033[0m号转义"
+echo -----------------------------------------------
+echo -e " 000   \033[31m删除\033[0m关键字"
+echo -e " 回车  取消输入并返回上级菜单"
+echo -----------------------------------------------
+read -p "请输入关键字 > " exclude
+if [ -z "$exclude" ]; then
+	linkset
+elif [ "$exclude" = '000' ]; then
+	echo -----------------------------------------------
+	exclude=''
+	echo -e "\033[31m 已删除节点过滤关键字！！！\033[0m"
+fi
+sed -i '/exclude=*/'d $ccfg
+sed -i "1i\exclude=\'$exclude\'" $ccfg
+linkset
+}
+linkset(){
+if [ -n $Url ];then
+	echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	echo -e "\033[47;30m请检查输入的链接是否正确：\033[0m"
+	echo -e "\033[32;4m$Url\033[0m"
+	echo -----------------------------------------------
+	echo -e " 1 \033[32m生成配置文件（原文件将被备份）\033[0m"
+	echo -e " 2 \033[36m添加/修改节点过滤关键字 \033[47;30m$exclude\033[0m"
+	echo -e " 3 \033[33m选取配置规则模版\033[0m"
+	echo -e " 4 \033[0m选取在线生成服务器\033[0m"
+	echo -e " 0 \033[31m取消导入\033[0m并返回上级菜单"
+	echo -----------------------------------------------
+	read -p "请输入对应数字 > " num
+	if [ -z "$num" ]; then
+		clashlink
+	elif [ "$num" = '0' ]; then
+		clashlink
+	elif [ "$num" = '1' ]; then
+		#将用户链接写入mark
+		sed -i '/Url=*/'d $ccfg
+		sed -i '/Https=*/'d $ccfg
+		sed -i "6i\Url=\'$Url\'" $ccfg
+		Https=""
+		#获取在线yaml文件
+		getyaml
+	elif [ "$num" = '2' ]; then
+		linkfilter
+		linkset
+	elif [ "$num" = '3' ]; then
+		linkconfig
+		linkset
+	elif [ "$num" = '4' ]; then
+		linkserver
+		linkset
+	else
+		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		echo -e "\033[31m请输入正确的数字！\033[0m"
+		linkset
+	fi
+	clashlink
+fi
+}
 getlink(){
 #设置输入循环
 i=1
@@ -125,13 +286,13 @@ do
 	echo -e "\033[44m 遇问题请加TG群反馈：\033[42;30m t.me/clashfm \033[0m"
 	echo -----------------------------------------------
 	echo -e "支持批量导入\033[30;46m Http/Https/Clash \033[0m等格式的订阅链接"
-	echo -e "支持批量导入\033[30;42m Vmess/SSR/SS/Trojan/Sock5 \033[0m等格式的节点链接"
-	echo -e "\033[31m使用SSR节点请务必使用支持SSR的clash核心！\033[0m"
-	echo -e "多个较短的链接可以用\033[30;47m | \033[0m分隔以一次性输入"
-	echo -e "多个较长的链接请尽量分多次输入，可支持多达\033[30;47m 99 \033[0;36m次输入"
-	echo -e "\033[32m直接输入回车以结束输入并开始导入链接！\033[0m"
+	echo -e "以及\033[30;42m Vmess/SSR/SS/Trojan/Sock5 \033[0m等格式的节点链接"
 	echo -----------------------------------------------
-	echo -e "\033[33m 0 返回上级目录！\033[0m"
+	echo -e "多个较短的链接可以用\033[30;47m | \033[0m号分隔以一次性输入"
+	echo -e "多个较长的链接可分次输入，支持多达\033[30;47m 99 \033[0m次输入"
+	echo -----------------------------------------------
+	echo -e "回车 \033[32m完成输入\033[0m并开始导入链接！"
+	echo -e " 0   \033[33m取消输入\033[0m并返回上级菜单"
 	echo -----------------------------------------------
 	read -p "请输入第"$i"个链接 > " url
 	test=$(echo $url | grep "://")
@@ -147,22 +308,7 @@ do
 		fi
 		i=$(($i+1))
 	elif [ -z $url ];then
-		if [ -n $Url ];then
-			echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			echo -e 请检查输入的链接是否正确：
-			echo -e "\033[4m$Url\033[0m"
-			read -p "确认导入配置文件？原配置文件将被更名为config.yaml.bak![1/0] > " res
-			if [ "$res" = '1' ]; then
-				#将用户链接写入mark
-				sed -i '/Url=*/'d $ccfg
-				sed -i '/Https=*/'d $ccfg
-				sed -i "6i\Url=\'$Url\'" $ccfg
-				Https=""
-				#获取在线yaml文件
-				getyaml
-			fi
-			clashlink
-		fi
+		linkset
 	elif [[ $url == 0 ]];then
 		clashlink
 	else
@@ -174,31 +320,17 @@ done
 echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 echo 输入太多啦，可能会导致订阅失败！
 echo "多个较短的链接请尽量用“|”分隔以一次性输入！"
-echo -e "请检查输入的链接是否正确：\033[4m$Url\033[0m"
-read -p "确认导入配置文件？原配置文件将被更名为config.bak![1/0] > " res
-if [ "$res" = '1' ]; then
-	#将用户链接写入mark
-	sed -i '/Url=*/'d $ccfg
-	sed -i '/Https=*/'d $ccfg
-	sed -i "6i\Url=\'$Url\'" $ccfg
-	#获取在线yaml文件
-	getyaml
-else
-	echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	echo 操作已取消！返回上级菜单！
-	clashlink
-fi
 clashlink
 } 
 getlink2(){
 echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-echo -e "\033[44m 遇问题请加TG群反馈：\033[42;30m t.me/clashfm \033[0m"
+echo -e "\033[30;47m 此功能不明勿用，出问题自行解决！\033[0m"
 echo -----------------------------------------------
-echo -e "\033[33m仅支持导入可直接在clash中使用的完整订阅链接"
-echo -e "\033[36m非完整链接请使用【导入节点/订阅链接】功能"
+echo -e "\033[33m仅限导入完整clash链接！！！"
+echo -e "\033[36m导入后如无法运行，请使用【导入节点/订阅链接】功能"
 echo -e "\033[31m注意如节点使用了chacha20加密协议，需将核心更新为clashr核心\033[0m"
 echo -----------------------------------------------
-echo -e "\033[33m0 返回上级目录！\033[0m"
+echo -e "\033[33m0 返回上级菜单\033[0m"
 echo -----------------------------------------------
 read -p "请输入完整链接 > " Https
 test=$(echo $Https | grep "://")
@@ -286,18 +418,19 @@ cpucore=$(uname -ms | tr ' ' '_' | tr '[A-Z]' '[a-z]')
 [ -n "$(echo $cpucore | grep -E "linux.*armv.*")" ] && cpucore="armv5"
 [ -n "$(echo $cpucore | grep -E "linux.*mips.*")" ] && cpucore="mipsle-softfloat"
 [ -n "$(echo $cpucore | grep -E "linux.*x86.*")" ] && cpucore="386"
+[ -n "$(echo $cpucore | grep -E "linux.*amd64.*")" ] && cpucore="386"
 ###
 echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 echo -e "当前clash核心：\033[47;30m $clashcore \033[46;30m$clashv\033[0m"
 echo -e "\033[32m请选择需要下载的核心版本！\033[0m"
 echo -----------------------------------------------
-echo "1 clash：     运行稳定，内存占用小"
-echo "(官方正式版)  不支持SSR，不支持Tun模式"
+echo "1 clash：     稳定，内存占用小，推荐！"
+echo "(官方正式版)  不支持chacha20加密，不支持Tun模式"
 echo
-echo "2 clashr：    稳定，内存占用小，支持SSR"
+echo "2 clashr：    内存占用小，支持chacha20加密"
 echo "(clashR修改版)不支持Tun模式"
 echo
-echo "3 clashpre：  支持SSR，支持Tun模式"
+echo "3 clashpre：  支持Tun模式"
 echo "(高级预览版)  内存占用高，不支持chacha20加密"
 echo -----------------------------------------------
 echo 0 返回上级菜单 
@@ -369,32 +502,19 @@ fi
 }
 getgeo(){
 echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-echo -e "\033[30;46m感谢Alecthw大神提供的优质GeoIP数据库！！！\033[0m"
+echo -e "\033[33m正在检查更新！\033[0m"
+result=$(curl -w %{http_code} -skLo /tmp/clashversion $update_url/bin/version)
+[ "$result" != "200" ] && echo "检查更新失败！" && exit 1
+source /tmp/clashversion
 echo -----------------------------------------------
-echo -e "\033[33m请选择下载源：\033[0m"
-echo -e " 1 默认源：$update_url"
-echo -e " 2 Alecthw大神的Github(需开启clash服务)"
-echo -e " 0 返回上级菜单"
-read -p "请输入对应数字 > " num
-	if	[ -z $num ]; then 
-		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		echo -e "\033[31m请输入正确的数字！\033[0m"
-		update
-	elif [[ $num == 0 ]]; then
-		update
-	elif [[ $num == 1 ]]; then
-		geolink="$update_url/bin/Country.mmdb"
-		#echo $geolink
-	elif [[ $num == 2 ]]; then
-		geolink="-x 127.0.0.1:7890 https://raw.githubusercontent.com/alecthw/mmdb_china_ip_list/release/Country.mmdb"
-	else
-		echo -e "\033[31m请输入正确的数字！\033[0m"
-		update
-		exit;
-	fi
+echo -e "当前脚本版本为：\033[33m $Geo_v \033[0m"
+echo -e "最新脚本版本为：\033[32m $GeoIP_v \033[0m"
+echo -----------------------------------------------
+read -p "是否更新数据库文件？[1/0] > " res
+if [ "$res" = '1' ]; then
 	echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	echo 正在从服务器获取数据库文件…………
-	result=$(curl -w %{http_code} -kLo $clashdir/Country.mmdb $geolink)
+	result=$(curl -w %{http_code} -kLo /tmp/Country.mmdb $update_url/bin/Country.mmdb)
 	if [ "$result" != "200" ];then
 		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		echo -e "\033[31m文件下载失败！\033[0m"
@@ -403,6 +523,14 @@ read -p "请输入对应数字 > " num
 	else
 		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		echo -e "\033[32mGeoIP数据库文件下载成功！\033[0m"
+		mv /tmp/Country.mmdb $clashdir/Country.mmdb
+		sed -i '/Geo_v=*/'d $ccfg
+		sed -i "1i\Geo_v=$GeoIP_v" $ccfg
+		rm -rf /tmp/clashversion
+		clashsh
+	fi
+else
+clashsh
 fi
 }
 getdb(){
@@ -411,12 +539,27 @@ echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 echo -e "\033[36m安装本地版dashboard管理面板\033[0m"
 echo -----------------------------------------------
 echo -e "\033[32m打开管理面板的速度更快且更稳定"
-echo -e "\033[33m需要占用约500kb的本地空间(目录：/www/clash)\033[0m"
-echo -e "\033[36m可以使用\033[32;4mhttp://$host/clash\033[0;36m访问面板\033[0m"
+echo -e "\033[33m需要占用约500kb的本地空间\033[0m"
 echo -----------------------------------------------
-read -p "是否安装本地面板？[1/0] > " res
-if [ "$res" = '1' ]; then
-	if [ -d /www/clash ];then
+echo " 1 在/www/clash目录安装(http://$host/clash，可能安装失败！)"
+echo " 2 在$clashdir/ui目录安装(http://$host:9999/ui，安装后需重启clash)"
+echo -----------------------------------------------
+echo " 0 返回上级菜单"
+read -p "请输入对应数字 > " num
+
+if [ -z "$num" ];then
+	update
+elif [ "$num" = '1' ]; then
+	dbdir=/www/clash
+	hostdir='/clash\033[0;36m访问面板'
+elif [ "$num" = '2' ]; then
+	dbdir=$clashdir/ui
+	hostdir=':9999/ui\033[0;36m访问面板(需重启clash服务！)'
+else
+	update
+fi
+	#下载及安装
+	if [ -d /www/clash -o -d $clashdir/ui ];then
 		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		echo -e "\033[31m检测到您已经安装过本地面板了！\033[0m"
 		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -425,6 +568,7 @@ if [ "$res" = '1' ]; then
 			update
 		elif [ "$res" = 1 ]; then
 			rm -rf /www/clash
+			rm -rf $clashdir/ui
 		else
 			update
 		fi
@@ -440,20 +584,20 @@ if [ "$res" = '1' ]; then
 		getdb
 	else
 		echo -e "\033[33m下载成功，正在解压文件！\033[0m"
-		mkdir -p /www/clash > /dev/null
-		tar -zxvf '/tmp/clashdb.tar.gz' -C /www/clash > /dev/null
+		mkdir -p $dbdir > /dev/null
+		tar -zxvf '/tmp/clashdb.tar.gz' -C $dbdir > /dev/null
 		[ $? -ne 0 ] && echo "文件解压失败！" && exit 1 
 		#修改默认host和端口
-		sed -i "s/127.0.0.1/$host/g" /www/clash/js/*.js
-		sed -i "s/9090/9999/g" /www/clash/js/*.js
+		sed -i "s/127.0.0.1/$host/g" $dbdir/js/*.js
+		sed -i "s/9090/9999/g" $dbdir/js/*.js
 		#
 		echo -e "\033[32m面板安装成功！\033[0m"
 		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		echo -e "\033[36m请使用\033[32;4mhttp://$host/clash\033[0;36m访问面板\033[0m"
+		echo -e "\033[36m请使用\033[32;4mhttp://$host$hostdir\033[0m"
 		rm -rf /tmp/clashdb.tar.gz
 		update
 	fi
-fi		
+	
 update
 }
 setserver(){
@@ -485,7 +629,7 @@ elif [[ $num == 4 ]]; then
 	read -p "请输入个人源路径 > " update_url
 	if [ -n $update_url ];then
 		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		echo -e "\033[31m取消输入，返回上级菜单！\033[0m"
+		echo -e "\033[31m取消输入，返回上级菜单\033[0m"
 		update
 	fi
 else
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -0,0 +1,209 @@
+ #!/bin/sh
+# Copyright (C) Juewuy
+
+getconfig(){
+ccfg=$clashdir/mark
+if [ ! -f "$ccfg" ]; then
+	echo mark文件不存在，默认以Redir模式运行！
+cat >$ccfg<<EOF
+#标识clash运行状态的文件，不明勿动！
+EOF
+	#指定一些默认状态
+	redir_mod=redir模式
+	modify_yaml=未开启
+fi
+source $ccfg #加载配置文件
+#是否代理常用端口
+[ "$common_ports" = "已开启" ] && ports='-m multiport --dports 22,53,587,465,995,993,143,80,443 '
+#检测系统端口占用
+for portx in 1053 7890 7892 9999 ;do
+	[ -n "$(netstat -ntulp |grep :$portx|grep -v clash)" ] && echo -e "检测到端口：\033[30;47m $portx \033[0m被以下进程占用！clash无法启动！" && echo $(netstat -ntulp |grep :$portx) && exit;
+done
+}
+modify_yaml(){
+##########需要变更的配置###########
+mix='mixed-port: 7890'
+redir='redir-port: 7892'
+lan='allow-lan: true'
+mode='mode: Rule'
+log='log-level: info'
+if [ "$ipv6_support" = "已开启" ];then
+ipv6='ipv6: true'
+else
+ipv6='ipv6: false'
+fi
+external='external-controller: 0.0.0.0:9999'
+if [ -d $clashdir/ui ];then
+external_ui='external-ui: ui'
+else
+external_ui='external-ui:'
+fi
+if [ "$dns_mod" = "fake-ip" ];then
+dns='dns: {enable: true, listen: 0.0.0.0:1053, fake-ip-range: 198.18.0.1/16, enhanced-mode: fake-ip, nameserver: [114.114.114.114, 127.0.0.1:53], fallback: [tcp://1.0.0.1, 8.8.4.4]}'
+elif [ "$dns_over" = "已开启" ];then
+dns='dns: {enable: true, ipv6: true, listen: 0.0.0.0:1053, enhanced-mode: redir-host, nameserver: [114.114.114.114, 223.5.5.5], fallback: [1.0.0.1, 8.8.4.4]}'
+else
+dns='dns: {enable: true, ipv6: true, listen: 0.0.0.0:1053, enhanced-mode: redir-host, nameserver: [114.114.114.114, 223.5.5.5, 127.0.0.1:53], fallback: [1.0.0.1, 8.8.4.4]}'
+fi
+if [ "$redir_mod" != "Redir模式" ];then
+tun='tun: {enable: true, stack: system}'
+else
+tun='tun: {enable: false}'
+fi 
+exper='experimental: {ignore-resolve-fail: true, interface-name: en0}'
+###################################
+	#预删除需要添加的项目
+	i=$(grep  -n  "^proxies:" $clashdir/config.yaml | head -1 | cut -d ":" -f 1)
+	i=$(($i-1))
+	sed -i '1,'$i'd' $clashdir/config.yaml
+	#添加配置
+	sed -i "1i$mix" $clashdir/config.yaml
+	sed -i "1a$redir" $clashdir/config.yaml
+	sed -i "2a$lan" $clashdir/config.yaml
+	sed -i "3a$mode" $clashdir/config.yaml
+	sed -i "4a$log" $clashdir/config.yaml
+	sed -i "5a$ipv6" $clashdir/config.yaml
+	sed -i "6a$external" $clashdir/config.yaml
+	sed -i "7a$external_ui" $clashdir/config.yaml
+	sed -i "8a$dns" $clashdir/config.yaml
+	sed -i "9a$tun" $clashdir/config.yaml
+	sed -i "10a$exper" $clashdir/config.yaml
+	#跳过本地tls证书验证
+	if [ "$skip_cert" = "已开启" ];then
+	sed -i '10,99s/skip-cert-verify: false/skip-cert-verify: true/' $clashdir/config.yaml
+	else
+	sed -i '10,99s/skip-cert-verify: true/skip-cert-verify: false/' $clashdir/config.yaml
+	fi
+}
+mark_time(){
+	start_time=`date +%s`
+	sed -i '/start_time*/'d $ccfg
+	sed -i "3i\start_time=$start_time" $ccfg
+}
+start_redir(){
+	#修改iptables规则使流量进入clash
+	iptables -t nat -N clash
+	iptables -t nat -A clash -d 0.0.0.0/8 -j RETURN
+	iptables -t nat -A clash -d 10.0.0.0/8 -j RETURN
+	iptables -t nat -A clash -d 127.0.0.0/8 -j RETURN
+	iptables -t nat -A clash -d 169.254.0.0/16 -j RETURN
+	iptables -t nat -A clash -d 172.16.0.0/12 -j RETURN
+	iptables -t nat -A clash -d 192.168.0.0/16 -j RETURN
+	iptables -t nat -A clash -d 224.0.0.0/4 -j RETURN
+	iptables -t nat -A clash -d 240.0.0.0/4 -j RETURN
+	for mac in $(cat $clashdir/mac); do
+		iptables -t nat -A clash -m mac --mac-source $mac -j RETURN
+	done
+	
+	iptables -t nat -A clash -p tcp $ports-j REDIRECT --to-ports 7892
+	iptables -t nat -A PREROUTING -p tcp -j clash
+	if [ "$ipv6_support" = "已开启" ];then
+		ip6tables -t nat -N clash
+		for mac in $(cat $clashdir/mac); do
+			ip6tables -t nat -A clash -m mac --mac-source $mac -j RETURN
+		done
+		ip6tables -t nat -A clash -p tcp $ports-j REDIRECT --to-ports 7892
+		ip6tables -t nat -A PREROUTING -p tcp -j clash
+	fi
+}
+stop_iptables(){
+    #重置iptables规则
+	iptables -t nat -D PREROUTING -p tcp -j clash > /dev/null 2>&1
+	iptables -t nat -D PREROUTING -p udp -j clash_dns > /dev/null 2>&1
+	iptables -t nat -F clash > /dev/null 2>&1
+	iptables -t nat -X clash > /dev/null 2>&1
+	iptables -t nat -F clash_dns > /dev/null 2>&1
+	iptables -t nat -X clash_dns > /dev/null 2>&1
+	#重置ipv6规则
+	ip6tables -t nat -D PREROUTING -p tcp -j clash > /dev/null 2>&1
+	ip6tables -t nat -D PREROUTING -p udp -j clash_dns > /dev/null 2>&1
+	ip6tables -t nat -F clash > /dev/null 2>&1
+	ip6tables -t nat -X clash > /dev/null 2>&1
+	ip6tables -t nat -F clash_dns > /dev/null 2>&1
+	ip6tables -t nat -X clash_dns > /dev/null 2>&1
+}
+start_dns(){
+	#允许tun网卡接受流量
+	iptables -I FORWARD -o utun -j ACCEPT
+	ip6tables -I FORWARD -o utun -j ACCEPT
+	#设置dns转发
+	iptables -t nat -N clash_dns
+	for mac in $(cat $clashdir/mac); do
+		iptables -t nat -A clash_dns -m mac --mac-source $mac -j RETURN
+	done
+	iptables -t nat -A clash_dns -p udp --dport 53 -j REDIRECT --to 1053
+	iptables -t nat -A PREROUTING -p udp -j clash_dns
+	#ipv6DNS
+	ip6tables -t nat -N clash_dns
+	for mac in $(cat $clashdir/mac); do
+		ip6tables -t nat -A clash_dns -m mac --mac-source $mac -j RETURN
+	done
+	ip6tables -t nat -A clash_dns -p udp --dport 53 -j REDIRECT --to 1053
+	ip6tables -t nat -A PREROUTING -p udp -j clash_dns
+}
+daemon_old(){
+	#守护进程状态
+	status=$(ps |grep -w 'clash'|grep -v grep|grep -v clash.sh)
+	[ -z $status ] && $clashdir/clash -d $clashdir && mark_time
+}
+checkcron(){
+if [ -d /etc/crontabs/ ]; then 
+	cronpath="/etc/crontabs/root"
+elif [ -d /var/spool/cron/ ]; then
+	cronpath="/var/spool/cron/root"
+elif [ -d /var/spool/cron/crontabs/ ]; then
+	cronpath="/var/spool/cron/crontabs/root"
+else
+	echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	echo "找不到定时任务文件,无法添加定时任务！"
+fi
+}
+start_old(){
+	#读取配置文件
+	getconfig
+	#使用内置规则强行覆盖config配置文件
+	[ "$modify_yaml" != "已开启" ] && modify_yaml
+    #创建clash后台进程
+	$clashdir/clash -d $clashdir> /dev/null &
+	#修改iptables规则使流量进入clash
+	stop_iptables
+	start_dns
+	[ "$redir_mod" != "Tun模式" ] && start_redir
+	#标记启动时间
+	mark_time
+	#创建守护进程
+	checkcron
+	sed -i /start.sh/d $cronpath
+	echo "*/1 * * * * source /etc/profile && source $clashdir/start.sh && daemon_old >/dev/null 2>&1" >> $cronpath
+	#设定启动方式
+	sed -i /start_old=*/d $ccfg
+	sed -i "1i\start_old=已开启" $ccfg	
+}
+stop_old(){
+	#删除守护
+	checkcron
+	sed -i /start.sh/d $cronpath
+	#结束进程
+	killall -9 clash &> /dev/null
+	stop_iptables
+}
+start(){
+	getconfig
+	if [ "$start_old" ="已开启" ];then
+		start_old
+	else
+		/etc/init.d/clash start
+	fi
+}
+stop(){
+	getconfig
+	if [ "$start_old" ="已开启" ];then
+		stop_old
+	else
+		/etc/init.d/clash stop
+	fi
+}
+restart(){
+	stop
+	start
+}
Author	SHA1	Message	Date
juewuy	0396957f42	v0.9.10 ~新增了导入订阅时通过关键字过滤节点的功能 ~优化了导入节点/订阅流程 ~优化了跳过证书验证的方式 ~调整了部分前后端规则地址 ~修复了保守模式下定时任务无法生效的bug	2020-08-24 19:39:50 +08:00
juewuy	6fc597847f	v0.9.9fix ~bug修复	2020-08-23 00:35:48 +08:00
juewuy	6c7a999fc8	v0.9.9 ~新增保守方式启动，适配更多设备（小米3HD，以及其他linux系统） ~新增进阶功能菜单 ~修复了geoip数据库偶尔丢失的bug(感谢Pan Peter同学提交bug！) ~增加了另一种本地面板的安装方式 ~UI优化 ~bug修复	2020-08-22 23:57:28 +08:00
juewuy	a30c958a6f	v0.9.9 ~新增保守方式启动，适配更多设备（小米3HD，以及其他linux系统） ~新增进阶功能菜单 ~修复了geoip数据库偶尔丢失的bug(感谢Pan Peter同学提交bug！) ~增加了另一种本地面板的安装方式 ~UI优化 ~bug修复	2020-08-22 22:54:31 +08:00
juewuy	ed6ec52e34	v0.9.9 ~新增保守方式启动，适配更多设备（小米3HD，以及其他linux系统） ~新增进阶功能菜单 ~修复了geoip数据库偶尔丢失的bug(感谢Pan Peter同学提交bug！) ~增加了另一种本地面板的安装方式 ~UI优化	2020-08-22 22:22:24 +08:00
juewuy	08243de4e4	v0.9.9 ~新增保守方式启动，适配更多设备（小米3HD，以及其他linux系统） ~新增进阶功能菜单 ~修复了geoip数据库偶尔丢失的bug(感谢Pan Peter同学提交bug！) ~增加了另一种本地面板的安装方式 ~UI优化	2020-08-22 22:01:58 +08:00
juewuy	e8876a17de	Merge branch 'master' of https://github.com/juewuy/clash-for-Miwifi	2020-08-22 20:08:36 +08:00
juewuy	7971101f16	v0.9.8 ~新增保守方式启动，适配更多设备（小米3HD，以及其他linux系统） ~新增进阶功能菜单 ~修复了geoip数据库偶尔丢失的bug(感谢Pan Peter同学提交bug！) ~UI优化	2020-08-22 20:08:23 +08:00
juewuy	d090e2d9a9	v0.9.8 ~新增保守方式启动，适配更多设备（小米3HD，以及其他linux系统） ~新增进阶功能菜单 ~修复了geoip数据库偶尔丢失的bug(感谢Pan Peter同学提交bug！)	2020-08-22 19:05:02 +08:00
juewuy	29c0516850	Update README.md	2020-08-22 18:58:53 +08:00
juewuy	c61f8fa504	v0.9.7 ~优化了订阅链接导入提示 ~增加了对不支持的加密方式检测 ~增加了对不支持的配置文件检测	2020-08-19 15:38:45 +08:00
juewuy	ee4ec97d32	v0.9.7 ~优化了订阅链接导入提示 ~增加了对不支持的加密方式检测 ~增加了对不支持的配置文件检测	2020-08-19 14:29:55 +08:00
juewuy	e456baaad8	v0.9.6 ~新增了是否使用本地dnsmasq作为dns服务器的选项开关 ~修复了部分情况下误报端口占用的bug ~找回了安装面板时检测并修复文件目录只读的代码 ~优化了导入节点链接时的提示	2020-08-18 20:30:05 +08:00
juewuy	3a54ff8eb7	v0.9.5 ~根据sayo-melu的pr，新增了下载dashboard面板后修改默认host端口为本机端口的功能 ~增加了启动clash时对端口占用进行检测的功能 ~同步官方v1.1.0正式版核心以及最新Premium核心 ~同步更新最新的GeoIP数据库文件	2020-08-17 19:46:40 +08:00
juewuy	3903711218	Merge branch 'master' of https://github.com/juewuy/clash-for-Miwifi	2020-08-17 14:03:19 +08:00
juewuy	82c5c7d185	v0.9.5 ~根据sayo-melu的pr，新增了下载dashboard面板后修改默认host端口为本机端口的功能 ~增加了启动clash时对端口占用进行检测的功能 ~同步官方v1.1.0正式版核心以及最新Premium核心	2020-08-17 14:03:06 +08:00
juewuy	2fc2c0f53e	Update README.md	2020-08-17 14:00:37 +08:00