Merge branch 'master' into dev

scripts/libs/get_config.sh

@@ -2,6 +2,7 @@
 # 检查配置文件
 [ -z "$TASKCFGDIR" ] && TASKCFGDIR="$CRASHDIR"/configs/task
 [ -f "$CRASHDIR"/configs/ShellCrash.cfg ] || . "$CRASHDIR"/init.sh >/dev/null 2>&1
+[ -f "$CRASHDIR"/configs/directories.env ] && . "$CRASHDIR"/configs/directories.env >/dev/null 2>&1
 . "$CRASHDIR"/configs/command.env >/dev/null 2>&1
 . "$CRASHDIR"/configs/ShellCrash.cfg
 

scripts/libs/start_wait.sh

@@ -1,10 +1,15 @@
-i=1
-while [ -z "$test" -a "$i" -lt 30 ]; do
-    sleep 1
-    if curl --version >/dev/null 2>&1; then
-        test=$(curl -s -H "Authorization: Bearer $secret" http://127.0.0.1:${db_port}/proxies | grep -o proxies)
-    else
-        test=$(wget -q --header="Authorization: Bearer $secret" -O - http://127.0.0.1:${db_port}/proxies | grep -o proxies)
-    fi
-    i=$((i + 1))
-done
+if [ "$network_check" = "OFF" ]; then
+    #复用网络检查开关：禁用自启网络检查时，也跳过启动后的面板端口校验
+    test=skip
+else
+    i=1
+    while [ -z "$test" ] && [ "$i" -lt 30 ]; do
+        sleep 1
+        if curl --version >/dev/null 2>&1; then
+            test=$(curl -s -H "Authorization: Bearer $secret" http://127.0.0.1:${db_port}/proxies | grep -o proxies)
+        else
+            test=$(wget -q --header="Authorization: Bearer $secret" -O - http://127.0.0.1:${db_port}/proxies | grep -o proxies)
+        fi
+        i=$((i + 1))
+    done
+fi