From c3b7fb946f82276031d8ce272e3662dc3f3db250 Mon Sep 17 00:00:00 2001 From: juewuy Date: Fri, 25 Apr 2025 12:23:16 +0800 Subject: [PATCH] =?UTF-8?q?~=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E5=9C=A8?= =?UTF-8?q?=E7=BA=BF=E8=A7=84=E5=88=99=E5=90=AF=E5=8A=A8=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E7=9A=84bug=20~=E4=BF=AE=E5=A4=8D=E4=B8=80=E9=94=AE=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=8A=A0=E5=AF=86DNS=E4=BE=9D=E7=84=B6=E4=BC=9A?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=B7=B2=E8=A2=ABgfw=E5=B1=8F=E8=94=BD?= =?UTF-8?q?=E7=9A=84dns=E6=9C=8D=E5=8A=A1=E5=99=A8=E7=9A=84bug=20~?= =?UTF-8?q?=E4=B8=BATG=E6=8E=A8=E9=80=81=E6=B7=BB=E5=8A=A0=E4=BA=86?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E8=BE=93=E5=85=A5ChatID=E7=9A=84=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/menu.sh | 10 ++++++++-- scripts/start.sh | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/scripts/menu.sh b/scripts/menu.sh index 3a0a5f8..50a2f33 100644 --- a/scripts/menu.sh +++ b/scripts/menu.sh @@ -290,11 +290,16 @@ log_pusher() { #日志菜单 chat=$(wget -Y on -q -O - $url_tg | tail -n -1) fi [ -n "$chat" ] && chat_ID=$(echo $chat | grep -oE '"id":.*,"is_bot":false' | sed s'/"id"://'g | sed s'/,"is_bot":false//'g) + [ -z "$chat_ID" ] && { + echo -e "\033[31m无法获取对话ID，请确认使用的不是已经被绑定的机器人，或手动输入ChatID！\033[0m" + echo -e "通常访问 $url_tg 即可看到ChatID，也可以尝试其他方法\033[0m" + read -p "请手动输入ChatID > " chat_ID + } if [ -n "$chat_ID" ]; then push_TG=$TOKEN setconfig push_TG $TOKEN setconfig chat_ID $chat_ID - ${CRASHDIR}/start.sh logger "已完成Telegram日志推送设置！" 32 + ${CRASHDIR}/start.sh logger "已完成Telegram日志推送设置！" 32 else echo -e "\033[31m无法获取对话ID，请重新配置！\033[0m" fi @@ -653,7 +658,8 @@ setdns() { #DNS详细设置 openssldir="$(openssl version -d 2>&1 | awk -F '"' '{print $2}')" if [ -s "$openssldir/certs/ca-certificates.crt" -o -s "/etc/ssl/certs/ca-certificates.crt" ]; then dns_nameserver='https://223.5.5.5/dns-query, https://doh.pub/dns-query, tls://dns.rubyfish.cn:853' - dns_fallback='tls://1.0.0.1:853, tls://8.8.4.4:853, https://doh.opendns.com/dns-query' + #dns_fallback='tls://1.0.0.1:853, tls://8.8.4.4:853, https://doh.opendns.com/dns-query' + dns_fallback=$dns_nameserver setconfig dns_nameserver \'"$dns_nameserver"\' setconfig dns_fallback \'"$dns_fallback"\' echo -e "\033[32m已设置加密DNS，如出现DNS解析问题，请尝试重置DNS配置！\033[0m" diff --git a/scripts/start.sh b/scripts/start.sh index 1408578..5fdd151 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -261,7 +261,7 @@ check_clash_config() { #检查clash配置文件 fi #检测并去除无效策略组 [ -n "$url_type" ] && ckcmd xargs && { - cat "$core_config_new" | sed '/^rules:/,$d' | grep -A 15 "\- name:" | xargs | sed 's/- name: /\n/g' | sed 's/ type: .*proxies: /#/g' | sed 's/- //g' | grep -E '#DIRECT $|#DIRECT$' | awk -F '#' '{print $1}' >"$TMPDIR"/clash_proxies_$USER + cat "$core_config_new" | sed '/^rules:/,$d' | grep -A 15 "\- name:" | xargs | sed 's/- name: /\n/g' | sed 's/ type: .*proxies: /#/g' | sed 's/- //g' | grep -E '#DIRECT $|#DIRECT$' | grep -Ev '全球直连|direct|Direct' | awk -F '#' '{print $1}' >"$TMPDIR"/clash_proxies_$USER while read line; do sed -i "/- $line/d" "$core_config_new" sed -i "/- name: $line/,/- DIRECT/d" "$core_config_new"