Merge branch 'dev' into nft-tun

This commit is contained in:
juewuy 2024-03-06 16:00:19 +08:00
commit 42475e82fb
2 changed files with 4 additions and 2 deletions

View File

@ -4,5 +4,5 @@ clash_v=v1.7.1
meta_v=v1.18.0
singboxp_v=1.8.5-73d97226
singbox_v=1.8.5
versionsh=1.9.0pre13
versionsh=1.9.0pre14
GeoIP_v=20240302

View File

@ -1366,12 +1366,14 @@ web_save(){ #最小化保存面板节点选择
web_restore(){ #还原面板选择
getconfig
#设置循环检测面板端口以判定服务启动是否成功
i=1
test=""
i=1
while [ -z "$test" -a "$i" -lt 20 ];do
sleep 2
test=$(get_save http://127.0.0.1:${db_port}/configs | grep -o port)
i=$((i+1))
done
sleep 1
[ -n "$test" ] && {
#发送节点选择数据
[ -s ${CRASHDIR}/configs/web_save ] && {