v1.0.0beta18.6
~增加部分测试接口 ~部分文本提示优化
This commit is contained in:
Binary file not shown.
@@ -1,4 +1,4 @@
|
|||||||
clash_v=1.3.5
|
clash_v=1.3.5
|
||||||
clashpre_v=2020.12.27
|
clashpre_v=2020.12.27
|
||||||
GeoIP_v=20210122
|
GeoIP_v=20210122
|
||||||
versionsh=1.0.0beta18.5
|
versionsh=1.0.0beta18.6
|
||||||
|
|||||||
@@ -634,7 +634,6 @@ clashcfg(){
|
|||||||
#
|
#
|
||||||
echo -----------------------------------------------
|
echo -----------------------------------------------
|
||||||
echo -e "\033[30;47m欢迎使用功能设置菜单:\033[0m"
|
echo -e "\033[30;47m欢迎使用功能设置菜单:\033[0m"
|
||||||
echo -e "\033[32m修改配置后请手动重启clash服务!\033[0m"
|
|
||||||
echo -----------------------------------------------
|
echo -----------------------------------------------
|
||||||
echo -e " 1 切换Clash运行模式: \033[36m$redir_mod\033[0m"
|
echo -e " 1 切换Clash运行模式: \033[36m$redir_mod\033[0m"
|
||||||
echo -e " 2 切换DNS运行模式: \033[36m$dns_mod\033[0m"
|
echo -e " 2 切换DNS运行模式: \033[36m$dns_mod\033[0m"
|
||||||
@@ -643,7 +642,6 @@ clashcfg(){
|
|||||||
echo -e " 5 过滤局域网设备: \033[36m$mac_return\033[0m ————使用黑名单/白名单进行过滤"
|
echo -e " 5 过滤局域网设备: \033[36m$mac_return\033[0m ————使用黑名单/白名单进行过滤"
|
||||||
echo -e " 6 设置本机代理服务: \033[36m$local_proxy\033[0m ————使用环境变量或GUI/api配置本机代理"
|
echo -e " 6 设置本机代理服务: \033[36m$local_proxy\033[0m ————使用环境变量或GUI/api配置本机代理"
|
||||||
echo -----------------------------------------------
|
echo -----------------------------------------------
|
||||||
echo -e " 9 \033[32m重启\033[0mclash服务"
|
|
||||||
echo -e " 0 返回上级菜单 \033[0m"
|
echo -e " 0 返回上级菜单 \033[0m"
|
||||||
echo -----------------------------------------------
|
echo -----------------------------------------------
|
||||||
read -p "请输入对应数字 > " num
|
read -p "请输入对应数字 > " num
|
||||||
@@ -714,8 +712,7 @@ clashadv(){
|
|||||||
#
|
#
|
||||||
echo -----------------------------------------------
|
echo -----------------------------------------------
|
||||||
echo -e "\033[30;47m欢迎使用进阶模式菜单:\033[0m"
|
echo -e "\033[30;47m欢迎使用进阶模式菜单:\033[0m"
|
||||||
echo -e "\033[33m如您不是很了解clash的运行机制,请勿更改!\033[0m"
|
echo -e "\033[33m如您并不了解clash的运行机制,请勿更改本页面功能!\033[0m"
|
||||||
echo -e "\033[32m修改配置后请手动重启clash服务!\033[0m"
|
|
||||||
echo -----------------------------------------------
|
echo -----------------------------------------------
|
||||||
echo -e " 1 使用保守方式启动: \033[36m$start_old\033[0m ————切换时会停止clash服务"
|
echo -e " 1 使用保守方式启动: \033[36m$start_old\033[0m ————切换时会停止clash服务"
|
||||||
echo -e " 2 启用ipv6支持: \033[36m$ipv6_support\033[0m ————实验性功能,可能不稳定"
|
echo -e " 2 启用ipv6支持: \033[36m$ipv6_support\033[0m ————实验性功能,可能不稳定"
|
||||||
@@ -726,7 +723,6 @@ clashadv(){
|
|||||||
echo -e " 7 使用自定义配置"
|
echo -e " 7 使用自定义配置"
|
||||||
echo -----------------------------------------------
|
echo -----------------------------------------------
|
||||||
echo -e " 8 \033[31m重置\033[0m配置文件"
|
echo -e " 8 \033[31m重置\033[0m配置文件"
|
||||||
echo -e " 9 \033[32m重启\033[0mclash服务"
|
|
||||||
echo -e " 0 返回上级菜单 \033[0m"
|
echo -e " 0 返回上级菜单 \033[0m"
|
||||||
echo -----------------------------------------------
|
echo -----------------------------------------------
|
||||||
read -p "请输入对应数字 > " num
|
read -p "请输入对应数字 > " num
|
||||||
@@ -883,10 +879,7 @@ EOF
|
|||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
clashadv
|
clashadv
|
||||||
|
|
||||||
elif [ "$num" = 9 ]; then
|
|
||||||
clashstart
|
|
||||||
sleep 1
|
|
||||||
else
|
else
|
||||||
errornum
|
errornum
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -580,7 +580,7 @@ setdb(){
|
|||||||
echo -e "请选择面板\033[33m安装目录:\033[0m"
|
echo -e "请选择面板\033[33m安装目录:\033[0m"
|
||||||
echo -----------------------------------------------
|
echo -----------------------------------------------
|
||||||
echo -e " 1 在$clashdir/ui目录安装"
|
echo -e " 1 在$clashdir/ui目录安装"
|
||||||
echo -e " 2 在/www/clash目录安装(推荐!)"
|
echo -e " 2 在/www/clash目录安装"
|
||||||
echo -----------------------------------------------
|
echo -----------------------------------------------
|
||||||
echo " 0 返回上级菜单"
|
echo " 0 返回上级菜单"
|
||||||
read -p "请输入对应数字 > " num
|
read -p "请输入对应数字 > " num
|
||||||
|
|||||||
@@ -660,6 +660,10 @@ web_save)
|
|||||||
getconfig
|
getconfig
|
||||||
web_save
|
web_save
|
||||||
;;
|
;;
|
||||||
|
web_restore)
|
||||||
|
getconfig
|
||||||
|
web_restore
|
||||||
|
;;
|
||||||
daemon)
|
daemon)
|
||||||
getconfig
|
getconfig
|
||||||
cronset '#clash保守模式守护进程' "*/1 * * * * test -z \"$(pidof clash)\" && $clashdir/start.sh restart #clash保守模式守护进程"
|
cronset '#clash保守模式守护进程' "*/1 * * * * test -z \"$(pidof clash)\" && $clashdir/start.sh restart #clash保守模式守护进程"
|
||||||
|
|||||||
Reference in New Issue
Block a user