v1.9.1beta1

~移除了所有不支持vless及hy的在线sub服务器并将重试次数降低到3次
~singbox内核不再默认启用ntp服务
~自动任务中重启命令优化
~修复providers中指定单独提供商生成配置失败的bug
~优化iptables/ip6tables检测机制,修复报错,修复旧设备ipv6运行出错导致的各种问题
~优化cn绕过检测机制,修复报错
~优化保持面板节点功能,增加了空文件校验,修复部分用户还原失败的bug
This commit is contained in:
juewuy
2024-03-19 13:58:02 +08:00
parent 78d834bc7f
commit fd1b592a7e
9 changed files with 46 additions and 50 deletions

View File

@@ -395,7 +395,7 @@ EOF
if [ -n "$2" ];then
gen_clash_providers_txt $1 $2
providers_tags=$1
sed -i 's/, {providers_tags}//g' ${TMPDIR}/providers/proxy-groups.yaml
echo ' - {name: '${1}', type: url-test, tolerance: 100, lazy: true, use: ['${1}']}' >> ${TMPDIR}/providers/proxy-groups.yaml
else
providers_tags=''
while read line;do
@@ -479,14 +479,16 @@ EOF
{
"outbound_providers": [
EOF
if [ -n "$2" ];then
gen_singbox_providers_txt $1 $2
providers_tags=\"$1\"
else
cat > ${TMPDIR}/providers/outbounds_add.json <<EOF
cat > ${TMPDIR}/providers/outbounds_add.json <<EOF
{
"outbounds": [
EOF
#单独指定节点时使用特殊方式
if [ -n "$2" ];then
gen_singbox_providers_txt $1 $2
providers_tags=\"$1\"
echo '{ "tag": "'${1}'", "type": "urltest", "tolerance": 100, "providers": "'${1}'", "includes": ".*" },' >> ${TMPDIR}/providers/outbounds_add.json
else
providers_tags=''
while read line;do
tag=$(echo $line | awk '{print $1}')
@@ -495,9 +497,10 @@ EOF
gen_singbox_providers_txt $tag $url
echo '{ "tag": "'${tag}'", "type": "urltest", "tolerance": 100, "providers": "'${tag}'", "includes": ".*" },' >> ${TMPDIR}/providers/outbounds_add.json
done < ${CRASHDIR}/configs/providers.cfg
sed -i '$s/},/}]}/' ${TMPDIR}/providers/outbounds_add.json #修复文件格式
fi
sed -i '$s/},/}]}/' ${TMPDIR}/providers/providers.json #修复文件格式
#修复文件格式
sed -i '$s/},/}]}/' ${TMPDIR}/providers/outbounds_add.json
sed -i '$s/},/}]}/' ${TMPDIR}/providers/providers.json
#使用模版生成outbounds和rules模块
cat ${TMPDIR}/provider_temp_file | sed "s/{providers_tags}/$providers_tags/g" >> ${TMPDIR}/providers/outbounds.json
rm -rf ${TMPDIR}/provider_temp_file