diff --git a/scripts/menu.sh b/scripts/menu.sh index 514e8d2..2084f5a 100644 --- a/scripts/menu.sh +++ b/scripts/menu.sh @@ -170,6 +170,7 @@ errornum() { echo -e "\033[31m请输入正确的字母或数字！\033[0m" } startover() { + echo -ne " \r" echo -e "\033[32m服务已启动！\033[0m" echo -e "请使用 \033[4;36mhttp://$host$hostdir\033[0m 管理内置规则" if [ "$redir_mod" = "纯净模式" ]; then @@ -195,12 +196,12 @@ start_core() { ${CRASHDIR}/start.sh start #设置循环检测以判定服务启动是否成功 i=1 - while [ -z "$test" -a "$i" -lt 10 ]; do + while [ -z "$test" -a "$i" -lt 30 ]; do sleep 1 if curl --version >/dev/null 2>&1; then - test=$(curl -s http://127.0.0.1:${db_port}/configs | grep -o port) + test=$(curl -s -H "Authorization: Bearer $secret" http://127.0.0.1:${db_port}/configs | grep -o port) else - test=$(wget -q -O - http://127.0.0.1:${db_port}/configs | grep -o port) + test=$(wget -q --header="Authorization: Bearer $secret" -O - http://127.0.0.1:${db_port}/configs | grep -o port) fi i=$((i + 1)) done @@ -685,8 +686,8 @@ setport() { #端口设置 esac } setdns() { #DNS详细设置 - [ -z "$dns_nameserver" ] && dns_nameserver='114.114.114.114, 223.5.5.5' - [ -z "$dns_fallback" ] && dns_fallback='1.0.0.1, 8.8.4.4' + [ -z "$dns_nameserver" ] && dns_nameserver='180.184.1.1, 1.2.4.8' + [ -z "$dns_fallback" ] && dns_fallback="$dns_nameserver" [ -z "$hosts_opt" ] && hosts_opt=已启用 [ -z "$dns_redir" ] && dns_redir=未开启 [ -z "$dns_no" ] && dns_no=未禁用 @@ -739,9 +740,8 @@ setdns() { #DNS详细设置 echo ----------------------------------------------- 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=$dns_nameserver + dns_nameserver='https://doh.360.cn/dns-query, https://dns.alidns.com/dns-query, https://doh.pub/dns-query' + dns_fallback='https://cloudflare-dns.com/dns-query, https://dns.google/dns-query, https://doh.opendns.com/dns-query' 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 bf223df..ae2cf72 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -55,10 +55,10 @@ getconfig() { #读取配置及全局变量 if [ -n "$(pidof dnsmasq)" ];then dns_nameserver='127.0.0.1' else - dns_nameserver='114.114.114.114, 223.5.5.5' + dns_nameserver='180.184.1.1, 1.2.4.8' fi } - [ -z "$dns_fallback" ] && dns_fallback='1.0.0.1, 8.8.4.4' + [ -z "$dns_fallback" ] && dns_fallback="$dns_nameserver" #自动生成ua [ -z "$user_agent" -o "$user_agent" = "auto" ] && { if echo "$crashcore" | grep -q 'singbox';then @@ -465,7 +465,7 @@ hosts: 'time.android.com': 203.107.6.88 'time.facebook.com': 203.107.6.88 EOF - [ "$crashcore" = "meta" ] && echo " 'services.googleapis.cn': services.googleapis.com'" >>"$TMPDIR"/hosts.yaml + [ "$crashcore" = "meta" ] && echo " 'services.googleapis.cn': services.googleapis.com" >>"$TMPDIR"/hosts.yaml #加载本机hosts sys_hosts=/etc/hosts [ -f /data/etc/custom_hosts ] && sys_hosts=/data/etc/custom_hosts @@ -602,6 +602,16 @@ EOF done } modify_json() { #修饰singbox1.13配置文件 + #提取配置文件以获得outbounds.json,providers.json及route.json + "$TMPDIR"/CrashCore format -c $core_config >"$TMPDIR"/format.json + echo '{' >"$TMPDIR"/jsons/outbounds.json + echo '{' >"$TMPDIR"/jsons/route.json + cat "$TMPDIR"/format.json | sed -n '/"outbounds":/,/^ "[a-z]/p' | sed '$d' >>"$TMPDIR"/jsons/outbounds.json + [ "$crashcore" = "singboxr" ] && { + echo '{' >"$TMPDIR"/jsons/providers.json + cat "$TMPDIR"/format.json | sed -n '/^ "providers":/,/^ "[a-z]/p' | sed '$d' >>"$TMPDIR"/jsons/providers.json + } + cat "$TMPDIR"/format.json | sed -n '/"route":/,/^\( "[a-z]\|}\)/p' | sed '$d' >>"$TMPDIR"/jsons/route.json #生成log.json cat >"$TMPDIR"/jsons/log.json <"$TMPDIR"/jsons/add_route.json <"$TMPDIR"/jsons/add_outbounds.json <"$TMPDIR"/jsons/add_outbounds.json <"$TMPDIR"/jsons/cust_add_rules.json [ ! -s "$TMPDIR"/jsons/cust_add_rules.json ] && rm -rf "$TMPDIR"/jsons/cust_add_rules.json } - #提取配置文件以获得outbounds.json,providers.json及route.json - "$TMPDIR"/CrashCore format -c $core_config >"$TMPDIR"/format.json - echo '{' >"$TMPDIR"/jsons/outbounds.json - echo '{' >"$TMPDIR"/jsons/route.json - cat "$TMPDIR"/format.json | sed -n '/"outbounds":/,/^ "[a-z]/p' | sed '$d' >>"$TMPDIR"/jsons/outbounds.json - [ "$crashcore" = "singboxr" ] && { - echo '{' >"$TMPDIR"/jsons/providers.json - cat "$TMPDIR"/format.json | sed -n '/^ "providers":/,/^ "[a-z]/p' | sed '$d' >>"$TMPDIR"/jsons/providers.json - } - cat "$TMPDIR"/format.json | sed -n '/"route":/,/^\( "[a-z]\|}\)/p' | sed '$d' >>"$TMPDIR"/jsons/route.json #清理route.json中的process_name规则以及"auto_detect_interface" sed -i '/"process_name": \[/,/],$/d' "$TMPDIR"/jsons/route.json sed -i '/"process_name": "[^"]*",/d' "$TMPDIR"/jsons/route.json @@ -1833,7 +1834,7 @@ singbox_check() { #singbox启动前检查 return 0 } network_check() { #检查是否联网 - for host in 223.5.5.5 114.114.114.114 1.2.4.8 dns.alidns.com doh.pub doh.360.cn; do + for host in 223.5.5.5 dns.alidns.com doh.pub doh.360.cn; do ping -c 3 $host >/dev/null 2>&1 && return 0 sleep 5 done @@ -1906,11 +1907,12 @@ afstart() { #启动后 #设置循环检测面板端口以判定服务启动是否成功 i=1 while [ -z "$test" -a "$i" -lt 30 ]; do + echo "$i" | grep -q '10' && echo -ne "服务正在启动，请耐心等待！\r" sleep 1 if curl --version >/dev/null 2>&1; then - test=$(curl -s http://127.0.0.1:${db_port}/configs | grep -o port) + test=$(curl -s -H "Authorization: Bearer $secret" http://127.0.0.1:${db_port}/configs | grep -o port) else - test=$(wget -q -O - http://127.0.0.1:${db_port}/configs | grep -o port) + test=$(wget -q --header="Authorization: Bearer $secret" -O - http://127.0.0.1:${db_port}/configs | grep -o port) fi i=$((i + 1)) done diff --git a/scripts/webget.sh b/scripts/webget.sh index 3f575c6..27667ab 100644 --- a/scripts/webget.sh +++ b/scripts/webget.sh @@ -1375,6 +1375,7 @@ setcustcore(){ #自定义内核 if [ "$?" = 0 ];then release_tag=$(cat ${TMPDIR}/github_api | grep '"tag_name":' | awk -F '"' '{print $4}') release_date=$(cat ${TMPDIR}/github_api | grep '"published_at":' | awk -F '"' '{print $4}') + update_date=$(cat ${TMPDIR}/github_api | grep '"updated_at":' | head -n 1 | awk -F '"' '{print $4}') [ -n "$(echo $cpucore | grep mips)" ] && cpu_type=mips || cpu_type=$cpucore cat ${TMPDIR}/github_api | grep "browser_download_url" | grep -oE "https://github.com/${project}/releases/download.*linux.*${cpu_type}.*\.gz\"$" | sed 's/"//' > ${TMPDIR}/core.list rm -rf ${TMPDIR}/github_api @@ -1382,7 +1383,8 @@ setcustcore(){ #自定义内核 if [ -s ${TMPDIR}/core.list ];then echo ----------------------------------------------- echo -e "内核版本：\033[36m$release_tag\033[0m" - echo -e "发布时间：\033[32m$release_date\033[0m" + echo -e "发布时间：\033[33m$release_date\033[0m" + echo -e "更新时间：\033[32m$update_date\033[0m" echo ----------------------------------------------- echo -e "\033[33m请确认内核信息并选择：\033[0m" cat ${TMPDIR}/core.list | grep -oE "$release_tag.*" | sed 's|.*/||' | awk '{print " "NR" "$1}' @@ -2327,9 +2329,8 @@ userguide(){ fi #设置加密DNS if [ -s $openssldir/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='https://1.0.0.1/dns-query, https://8.8.4.4/dns-query, https://doh.opendns.com/dns-query' - dns_fallback=$dns_nameserver + dns_nameserver='https://doh.360.cn/dns-query, https://dns.alidns.com/dns-query, https://doh.pub/dns-query' + dns_fallback='https://cloudflare-dns.com/dns-query, https://dns.google/dns-query, https://doh.opendns.com/dns-query' setconfig dns_nameserver \'"$dns_nameserver"\' setconfig dns_fallback \'"$dns_fallback"\' fi