From 046c28a387dcc6177566f2aaa4e2e2a68f2b0822 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?= <i@haozi.net>
Date: Fri, 6 Oct 2023 00:22:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=89=E8=A3=85=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/tools/tools.go                       |  4 ++--
 scripts/install_panel.sh                 | 10 +++++-----
 scripts/mysql/install.sh                 |  4 ++--
 scripts/mysql/update.sh                  |  4 ++--
 scripts/openresty/install.sh             | 22 +++++++++++-----------
 scripts/php/install.sh                   |  4 ++--
 scripts/php_extensions/imagick.sh        |  2 +-
 scripts/php_extensions/ionCube Loader.sh |  2 +-
 scripts/php_extensions/redis.sh          |  2 +-
 scripts/phpmyadmin/install.sh            |  2 +-
 scripts/postgresql/install.sh            |  2 +-
 scripts/postgresql/update.sh             |  2 +-
 scripts/pureftpd/install.sh              |  2 +-
 scripts/pureftpd/update.sh               |  2 +-
 scripts/redis/install.sh                 |  2 +-
 scripts/redis/update.sh                  |  2 +-
 16 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/pkg/tools/tools.go b/pkg/tools/tools.go
index 338bf6e7..ee25f0c0 100644
--- a/pkg/tools/tools.go
+++ b/pkg/tools/tools.go
@@ -140,9 +140,9 @@ func UpdatePanel(proxy bool) error {
 
 	color.Greenln("正在下载...")
 	if proxy {
-		Exec("wget -O /www/panel/panel.zip https://ghproxy.com/" + panelInfo.DownloadUrl)
+		Exec("wget -T 120 -t 3 -O /www/panel/panel.zip https://ghproxy.com/" + panelInfo.DownloadUrl)
 	} else {
-		Exec("wget -O /www/panel/panel.zip " + panelInfo.DownloadUrl)
+		Exec("wget -T 120 -t 3 -O /www/panel/panel.zip " + panelInfo.DownloadUrl)
 	}
 
 	if !Exists("/www/panel/panel.zip") {
diff --git a/scripts/install_panel.sh b/scripts/install_panel.sh
index 24d18403..7eda08af 100644
--- a/scripts/install_panel.sh
+++ b/scripts/install_panel.sh
@@ -22,7 +22,7 @@ HR="+----------------------------------------------------"
 download_Url=""
 setup_Path="/www"
 sshPort=$(cat /etc/ssh/sshd_config | grep 'Port ' | awk '{print $2}')
-ipLocation=$(curl -s https://ip.ping0.cc/geo)
+inChina=$(curl --retry 2 -m 10 -L https://www.cloudflare-cn.com/cdn-cgi/trace 2> /dev/null | grep -qx 'loc=CN' && echo "true" || echo "false")
 
 Prepare_system() {
     if [ $(whoami) != "root" ]; then
@@ -92,7 +92,7 @@ Prepare_system() {
     fi
 
     if [ "${OS}" == "centos" ]; then
-        if [[ ${ipLocation} =~ "中国" ]]; then
+        if ${inChina}; then
             sed -e 's|^mirrorlist=|#mirrorlist=|g' \
                 -e 's|^#baseurl=http://dl.rockylinux.org/$contentdir|baseurl=https://mirrors.aliyun.com/rockylinux|g' \
                 -i.bak \
@@ -107,7 +107,7 @@ Prepare_system() {
         dnf install dnf-plugins-core -y
         dnf install epel-release -y
         dnf config-manager --set-enabled epel
-        if [[ ${ipLocation} =~ "中国" ]]; then
+        if ${inChina}; then
             sed -i 's|^#baseurl=https://download.example/pub|baseurl=https://mirrors.aliyun.com|' /etc/yum.repos.d/epel*
             sed -i 's|^metalink|#metalink|' /etc/yum.repos.d/epel*
             dnf makecache -y
@@ -121,7 +121,7 @@ Prepare_system() {
         dnf makecache -y
         dnf install -y curl wget zip unzip tar git jq git-core dos2unix
     elif [ "${OS}" == "debian" ]; then
-        if [[ ${ipLocation} =~ "中国" ]]; then
+        if ${inChina}; then
             sed -i 's/deb.debian.org/mirrors.aliyun.com/g' /etc/apt/sources.list
             sed -i 's/security.debian.org/mirrors.aliyun.com/g' /etc/apt/sources.list
         fi
@@ -187,7 +187,7 @@ Init_Panel() {
         echo "错误：获取面板下载链接失败，请截图错误信息寻求帮助。"
         exit 1
     fi
-    wget -O ${setup_Path}/panel/panel.zip "${download_Url}${panelZip}"
+    wget -T 120 -t 3 -O ${setup_Path}/panel/panel.zip "${download_Url}${panelZip}"
     if [ "$?" != "0" ]; then
         echo -e $HR
         echo "错误：下载面板失败，请截图错误信息寻求帮助。"
diff --git a/scripts/mysql/install.sh b/scripts/mysql/install.sh
index 28d0dfc9..d292f1ae 100644
--- a/scripts/mysql/install.sh
+++ b/scripts/mysql/install.sh
@@ -71,13 +71,13 @@ mkdir -p ${mysqlPath}
 cd ${mysqlPath}
 
 # 下载源码
-wget -T 120 -O ${mysqlPath}/mysql-${mysqlVersion}.tar.gz ${downloadUrl}/mysql-boost-${mysqlVersion}.tar.gz
+wget -T 120 -t 3 -O ${mysqlPath}/mysql-${mysqlVersion}.tar.gz ${downloadUrl}/mysql-boost-${mysqlVersion}.tar.gz
 tar -zxvf mysql-${mysqlVersion}.tar.gz
 rm -f mysql-${mysqlVersion}.tar.gz
 mv mysql-${mysqlVersion} src
 
 # openssl
-wget -T 120 -O ${mysqlPath}/openssl-1.1.1u.tar.gz ${downloadUrl}/openssl/openssl-1.1.1u.tar.gz
+wget -T 120 -t 3 -O ${mysqlPath}/openssl-1.1.1u.tar.gz ${downloadUrl}/openssl/openssl-1.1.1u.tar.gz
 tar -zxvf openssl-1.1.1u.tar.gz
 rm -f openssl-1.1.1u.tar.gz
 mv openssl-1.1.1u openssl
diff --git a/scripts/mysql/update.sh b/scripts/mysql/update.sh
index 3f786b39..5ebf0950 100644
--- a/scripts/mysql/update.sh
+++ b/scripts/mysql/update.sh
@@ -69,13 +69,13 @@ fi
 cd ${mysqlPath}
 
 # 下载源码
-wget -T 120 -O ${mysqlPath}/mysql-${mysqlVersion}.tar.gz ${downloadUrl}/mysql-boost-${mysqlVersion}.tar.gz
+wget -T 120 -t 3 -O ${mysqlPath}/mysql-${mysqlVersion}.tar.gz ${downloadUrl}/mysql-boost-${mysqlVersion}.tar.gz
 tar -zxvf mysql-${mysqlVersion}.tar.gz
 rm -f mysql-${mysqlVersion}.tar.gz
 mv mysql-${mysqlVersion} src
 
 # openssl
-wget -T 120 -O ${mysqlPath}/openssl-1.1.1u.tar.gz ${downloadUrl}/openssl/openssl-1.1.1u.tar.gz
+wget -T 120 -t 3 -O ${mysqlPath}/openssl-1.1.1u.tar.gz ${downloadUrl}/openssl/openssl-1.1.1u.tar.gz
 tar -zxvf openssl-1.1.1u.tar.gz
 rm -f openssl-1.1.1u.tar.gz
 mv openssl-1.1.1u openssl
diff --git a/scripts/openresty/install.sh b/scripts/openresty/install.sh
index dad8cde7..4442b6db 100644
--- a/scripts/openresty/install.sh
+++ b/scripts/openresty/install.sh
@@ -46,56 +46,56 @@ mkdir -p ${openrestyPath}
 cd ${openrestyPath}
 
 # 下载源码
-wget -T 120 -O ${openrestyPath}/openresty-${openrestyVersion}.tar.gz ${downloadUrl}/openresty-${openrestyVersion}.tar.gz
+wget -T 120 -t 3 -O ${openrestyPath}/openresty-${openrestyVersion}.tar.gz ${downloadUrl}/openresty-${openrestyVersion}.tar.gz
 tar -zxvf openresty-${openrestyVersion}.tar.gz
 rm -f openresty-${openrestyVersion}.tar.gz
 mv openresty-${openrestyVersion} src
 cd src
 
 # openssl
-wget -T 120 -O openssl.tar.gz ${downloadUrl}/openssl/openssl-1.1.1u.tar.gz
+wget -T 120 -t 3 -O openssl.tar.gz ${downloadUrl}/openssl/openssl-1.1.1u.tar.gz
 tar -zxvf openssl.tar.gz
 rm -f openssl.tar.gz
 mv openssl-1.1.1u openssl
 rm -f openssl.tar.gz
 
 # pcre
-wget -T 60 -O pcre-8.45.tar.gz ${downloadUrl}/pcre/pcre-8.45.tar.gz
+wget -T 60 -t 3 -O pcre-8.45.tar.gz ${downloadUrl}/pcre/pcre-8.45.tar.gz
 tar -zxvf pcre-8.45.tar.gz
 rm -f pcre-8.45.tar.gz
 mv pcre-8.45 pcre
 rm -f pcre-8.45.tar.gz
 
 # ngx_cache_purge
-wget -T 20 -O ngx_cache_purge.tar.gz ${downloadUrl}/modules/ngx_cache_purge-2.3.tar.gz
+wget -T 20 -t 3 -O ngx_cache_purge.tar.gz ${downloadUrl}/modules/ngx_cache_purge-2.3.tar.gz
 tar -zxvf ngx_cache_purge.tar.gz
 rm -f ngx_cache_purge.tar.gz
 mv ngx_cache_purge-2.3 ngx_cache_purge
 rm -f ngx_cache_purge.tar.gz
 
 # nginx-sticky-module
-wget -T 20 -O nginx-sticky-module.zip ${downloadUrl}/modules/nginx-sticky-module.zip
+wget -T 20 -t 3 -O nginx-sticky-module.zip ${downloadUrl}/modules/nginx-sticky-module.zip
 unzip -o nginx-sticky-module.zip
 rm -f nginx-sticky-module.zip
 
 # nginx-dav-ext-module
-wget -T 20 -O nginx-dav-ext-module-3.0.0.tar.gz ${downloadUrl}/modules/nginx-dav-ext-module-3.0.0.tar.gz
+wget -T 20 -t 3 -O nginx-dav-ext-module-3.0.0.tar.gz ${downloadUrl}/modules/nginx-dav-ext-module-3.0.0.tar.gz
 tar -xvf nginx-dav-ext-module-3.0.0.tar.gz
 rm -f nginx-dav-ext-module-3.0.0.tar.gz
 mv nginx-dav-ext-module-3.0.0 nginx-dav-ext-module
 
 # waf
-wget -T 60 -O uthash.zip ${downloadUrl}/modules/uthash-2.3.0.zip
+wget -T 60 -t 3 -O uthash.zip ${downloadUrl}/modules/uthash-2.3.0.zip
 unzip -o uthash.zip
 mv uthash-2.3.0 uthash
 rm -f uthash.zip
 cd ../
-wget -T 20 -O ngx_waf.zip ${downloadUrl}/modules/ngx_waf-6.1.9.zip
+wget -T 20 -t 3 -O ngx_waf.zip ${downloadUrl}/modules/ngx_waf-6.1.9.zip
 unzip -o ngx_waf.zip
 mv ngx_waf-6.1.9 ngx_waf
 rm -f ngx_waf.zip
 cd ngx_waf/inc
-wget -T 60 -O libinjection.zip ${downloadUrl}/modules/libinjection-3.10.0.zip
+wget -T 60 -t 3 -O libinjection.zip ${downloadUrl}/modules/libinjection-3.10.0.zip
 unzip -o libinjection.zip
 mv libinjection-3.10.0 libinjection
 rm -f libinjection.zip
@@ -110,13 +110,13 @@ fi
 cd ${openrestyPath}/src
 
 # brotli
-wget -T 20 -O ngx_brotli.zip ${downloadUrl}/modules/ngx_brotli-1.0.0rc.zip
+wget -T 20 -t 3 -O ngx_brotli.zip ${downloadUrl}/modules/ngx_brotli-1.0.0rc.zip
 unzip -o ngx_brotli.zip
 mv ngx_brotli-1.0.0rc ngx_brotli
 rm -f ngx_brotli.zip
 cd ngx_brotli/deps
 rm -rf brotli
-wget -T 20 -O brotli.zip ${downloadUrl}/modules/brotli-1.0.9.zip
+wget -T 20 -t 3 -O brotli.zip ${downloadUrl}/modules/brotli-1.0.9.zip
 unzip -o brotli.zip
 mv brotli-1.0.9 brotli
 rm -f brotli.zip
diff --git a/scripts/php/install.sh b/scripts/php/install.sh
index 847e7ab5..f0077fb1 100644
--- a/scripts/php/install.sh
+++ b/scripts/php/install.sh
@@ -70,7 +70,7 @@ else
     exit 1
 fi
 
-wget -O ${phpPath}/php-${phpVersion}.tar.gz ${downloadUrl}/php-${phpVersionCode}.tar.gz
+wget -T 120 -t 3 -O ${phpPath}/php-${phpVersion}.tar.gz ${downloadUrl}/php-${phpVersionCode}.tar.gz
 if [ "$?" != "0" ]; then
     echo -e $HR
     echo "错误：PHP-${phpVersion}下载失败，请检查网络是否正常。"
@@ -82,7 +82,7 @@ rm -f php-${phpVersion}.tar.gz
 mv php-* src
 
 if [ "${phpVersion}" -le "80" ]; then
-    wget -T 120 -O ${phpPath}/openssl-1.1.1u.tar.gz ${downloadUrl}/openssl/openssl-1.1.1u.tar.gz
+    wget -T 120 -t 3 -O ${phpPath}/openssl-1.1.1u.tar.gz ${downloadUrl}/openssl/openssl-1.1.1u.tar.gz
     tar -zxvf openssl-1.1.1u.tar.gz
     rm -f openssl-1.1.1u.tar.gz
     mv openssl-1.1.1u openssl
diff --git a/scripts/php_extensions/imagick.sh b/scripts/php_extensions/imagick.sh
index 01f98dfe..035955bf 100644
--- a/scripts/php_extensions/imagick.sh
+++ b/scripts/php_extensions/imagick.sh
@@ -48,7 +48,7 @@ Install() {
     cd /www/server/php/${phpVersion}/src/ext
     rm -rf imagick
     rm -rf imagick.tar.gz
-    wget -O imagick.tar.gz ${downloadUrl}/imagick-${imagickVersion}.tar.gz
+    wget -T 60 -t 3 -O imagick.tar.gz ${downloadUrl}/imagick-${imagickVersion}.tar.gz
     tar -zxvf imagick.tar.gz
     mv imagick-${imagickVersion} imagick
     cd imagick
diff --git a/scripts/php_extensions/ionCube Loader.sh b/scripts/php_extensions/ionCube Loader.sh
index 0168b165..103effe3 100644
--- a/scripts/php_extensions/ionCube Loader.sh	
+++ b/scripts/php_extensions/ionCube Loader.sh	
@@ -33,7 +33,7 @@ Install() {
     fi
 
     mkdir /usr/local/ioncube
-    wget -O /usr/local/ioncube/ioncube_loader_lin_${phpVersion}.so ${downloadUrl}/ioncube_loader_lin_${phpVersion}.so
+    wget -T 60 -t 3 -O /usr/local/ioncube/ioncube_loader_lin_${phpVersion}.so ${downloadUrl}/ioncube_loader_lin_${phpVersion}.so
     if [ "$?" != "0" ]; then
         echo -e $HR
         echo "错误：ionCube 下载失败，请检查网络是否正常。"
diff --git a/scripts/php_extensions/redis.sh b/scripts/php_extensions/redis.sh
index a7a859c8..c0871c44 100644
--- a/scripts/php_extensions/redis.sh
+++ b/scripts/php_extensions/redis.sh
@@ -36,7 +36,7 @@ Install() {
     cd /www/server/php/${phpVersion}/src/ext
     rm -rf phpredis
     rm -rf phpredis.tar.gz
-    wget -O phpredis.tar.gz ${downloadUrl}/phpredis-${phpredisVersion}.tar.gz
+    wget -T 60 -t 3 -O phpredis.tar.gz ${downloadUrl}/phpredis-${phpredisVersion}.tar.gz
     tar -zxvf phpredis.tar.gz
     mv phpredis-${phpredisVersion} phpredis
     cd phpredis
diff --git a/scripts/phpmyadmin/install.sh b/scripts/phpmyadmin/install.sh
index a2c1ab12..dc273ae6 100644
--- a/scripts/phpmyadmin/install.sh
+++ b/scripts/phpmyadmin/install.sh
@@ -31,7 +31,7 @@ rm -rf ${phpmyadminPath}
 mkdir -p ${phpmyadminPath}
 cd ${phpmyadminPath}
 
-wget -O phpmyadmin.zip ${downloadUrl}/phpMyAdmin-${phpmyadminVersion}-all-languages.zip
+wget -T 60 -t 3 -O phpmyadmin.zip ${downloadUrl}/phpMyAdmin-${phpmyadminVersion}-all-languages.zip
 if [ "$?" != "0" ]; then
     echo -e $HR
     echo "错误：phpMyAdmin 下载失败"
diff --git a/scripts/postgresql/install.sh b/scripts/postgresql/install.sh
index 695e8120..467a22a8 100644
--- a/scripts/postgresql/install.sh
+++ b/scripts/postgresql/install.sh
@@ -63,7 +63,7 @@ mkdir -p ${postgresqlPath}
 cd ${postgresqlPath}
 
 # 下载源码
-wget -T 120 -O ${postgresqlPath}/postgresql-${postgresqlVersion}.tar.gz ${downloadUrl}/postgresql-${postgresqlVersion}.tar.gz
+wget -T 120 -t 3 -O ${postgresqlPath}/postgresql-${postgresqlVersion}.tar.gz ${downloadUrl}/postgresql-${postgresqlVersion}.tar.gz
 tar -zxvf postgresql-${postgresqlVersion}.tar.gz
 rm -f postgresql-${postgresqlVersion}.tar.gz
 mv postgresql-${postgresqlVersion} src
diff --git a/scripts/postgresql/update.sh b/scripts/postgresql/update.sh
index 4f71b651..e9ff84d6 100644
--- a/scripts/postgresql/update.sh
+++ b/scripts/postgresql/update.sh
@@ -59,7 +59,7 @@ rm -rf ${postgresqlPath}/src
 cd ${postgresqlPath}
 
 # 下载源码
-wget -T 120 -O ${postgresqlPath}/postgresql-${postgresqlVersion}.tar.gz ${downloadUrl}/postgresql-${postgresqlVersion}.tar.gz
+wget -T 120 -t 3 -O ${postgresqlPath}/postgresql-${postgresqlVersion}.tar.gz ${downloadUrl}/postgresql-${postgresqlVersion}.tar.gz
 tar -zxvf postgresql-${postgresqlVersion}.tar.gz
 rm -f postgresql-${postgresqlVersion}.tar.gz
 mv postgresql-${postgresqlVersion} src
diff --git a/scripts/pureftpd/install.sh b/scripts/pureftpd/install.sh
index 4fd1f6ad..244e9289 100644
--- a/scripts/pureftpd/install.sh
+++ b/scripts/pureftpd/install.sh
@@ -29,7 +29,7 @@ rm -rf ${pureftpdPath}
 mkdir -p ${pureftpdPath}
 cd ${pureftpdPath}
 
-wget -O ${pureftpdPath}/pure-ftpd-${pureftpdVersion}.tar.gz ${downloadUrl}/pure-ftpd-${pureftpdVersion}.tar.gz
+wget -T 120 -t 3 -O ${pureftpdPath}/pure-ftpd-${pureftpdVersion}.tar.gz ${downloadUrl}/pure-ftpd-${pureftpdVersion}.tar.gz
 if [ "$?" != "0" ]; then
     echo -e $HR
     echo "错误：Pure-Ftpd-${pureftpdVersion}下载失败，请检查网络是否正常。"
diff --git a/scripts/pureftpd/update.sh b/scripts/pureftpd/update.sh
index 99c2367d..cc726531 100644
--- a/scripts/pureftpd/update.sh
+++ b/scripts/pureftpd/update.sh
@@ -33,7 +33,7 @@ rm -rf ${pureftpdPath}
 mkdir -p ${pureftpdPath}
 cd ${pureftpdPath}
 
-wget -O ${pureftpdPath}/pure-ftpd-${pureftpdVersion}.tar.gz ${downloadUrl}/pure-ftpd-${pureftpdVersion}.tar.gz
+wget -T 60 -t 3 -O ${pureftpdPath}/pure-ftpd-${pureftpdVersion}.tar.gz ${downloadUrl}/pure-ftpd-${pureftpdVersion}.tar.gz
 if [ "$?" != "0" ]; then
     echo -e $HR
     echo "错误：Pure-Ftpd-${pureftpdVersion}下载失败，请检查网络是否正常。"
diff --git a/scripts/redis/install.sh b/scripts/redis/install.sh
index 0aecfa96..7760cd69 100644
--- a/scripts/redis/install.sh
+++ b/scripts/redis/install.sh
@@ -51,7 +51,7 @@ mkdir -p ${redisPath}
 cd ${redisPath}
 
 # 下载源码
-wget -T 120 -O ${redisPath}/redis-${redisVersion}.tar.gz ${downloadUrl}/redis-${redisVersion}.tar.gz
+wget -T 120 -t 3 -O ${redisPath}/redis-${redisVersion}.tar.gz ${downloadUrl}/redis-${redisVersion}.tar.gz
 tar -zxvf redis-${redisVersion}.tar.gz
 rm -f redis-${redisVersion}.tar.gz
 mv redis-${redisVersion}/* ./ && rm -rf redis-${redisVersion}
diff --git a/scripts/redis/update.sh b/scripts/redis/update.sh
index 8558b37c..bbed13c2 100644
--- a/scripts/redis/update.sh
+++ b/scripts/redis/update.sh
@@ -30,7 +30,7 @@ cpuCore=$(cat /proc/cpuinfo | grep "processor" | wc -l)
 cd ${redisPath}
 
 # 下载源码
-wget -T 120 -O ${redisPath}/redis-${redisVersion}.tar.gz ${downloadUrl}/redis-${redisVersion}.tar.gz
+wget -T 120 -t 3 -O ${redisPath}/redis-${redisVersion}.tar.gz ${downloadUrl}/redis-${redisVersion}.tar.gz
 tar -zxvf redis-${redisVersion}.tar.gz
 rm -f redis-${redisVersion}.tar.gz
 mv redis-${redisVersion}/* ./ && rm -rf redis-${redisVersion}