From 10186786d9569372d6c14a215e9a3780eb418ca3 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Thu, 8 Feb 2024 16:46:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2GitHub=20Proxy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 更换GitHub Proxy --- plugins/dynamic-tracking/install.sh | 2 +- plugins/mysql/index.py | 6 ++++++ plugins/op_waf/install.sh | 2 +- plugins/php/lib/icu.sh | 2 +- plugins/php/lib/libiconv.sh | 2 +- plugins/php/lib/libzip.sh | 2 +- plugins/php/lib/oniguruma.sh | 2 +- plugins/php/lib/openssl_10.sh | 2 +- plugins/php/lib/zlib.sh | 2 +- scripts/install.sh | 4 ++-- scripts/install_dev.sh | 4 ++-- scripts/lib.sh | 4 ++-- scripts/update.sh | 2 +- scripts/update_dev.sh | 4 ++-- 14 files changed, 23 insertions(+), 17 deletions(-) diff --git a/plugins/dynamic-tracking/install.sh b/plugins/dynamic-tracking/install.sh index 32f5ec861..0ddca4b3a 100755 --- a/plugins/dynamic-tracking/install.sh +++ b/plugins/dynamic-tracking/install.sh @@ -38,7 +38,7 @@ Install_App() cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"") HTTP_PREFIX="https://" if [ ! -z "$cn" ];then - HTTP_PREFIX="https://ghproxy.com/" + HTTP_PREFIX="https://mirror.ghproxy.com/" fi # FlameGraph start diff --git a/plugins/mysql/index.py b/plugins/mysql/index.py index e512c47ea..b252a025e 100755 --- a/plugins/mysql/index.py +++ b/plugins/mysql/index.py @@ -2598,6 +2598,10 @@ def trySlaveSyncBugfix(version=''): gtid_purged = '' + var_slave_gtid = sdb.query('show VARIABLES like "%gtid_purged%"') + if len(var_slave_gtid) > 0: + gtid_purged += var_slave_gtid[0]['Value'] + ',' + for i in range(len(slave_sync_data)): port = slave_sync_data[i]['port'] password = slave_sync_data[i]['pass'] @@ -2617,6 +2621,8 @@ def trySlaveSyncBugfix(version=''): if len(var_gtid) > 0: gtid_purged += var_gtid[0]['Value'] + ',' + + gtid_purged = gtid_purged.strip(',') sql = "set @@global.gtid_purged='" + gtid_purged + "'" diff --git a/plugins/op_waf/install.sh b/plugins/op_waf/install.sh index 58018158c..e3a7950c7 100755 --- a/plugins/op_waf/install.sh +++ b/plugins/op_waf/install.sh @@ -87,7 +87,7 @@ Install_App(){ cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"") HTTP_PREFIX="https://" if [ ! -z "$cn" ];then - HTTP_PREFIX="https://ghproxy.com/" + HTTP_PREFIX="https://mirror.ghproxy.com/" fi # download GeoLite Data diff --git a/plugins/php/lib/icu.sh b/plugins/php/lib/icu.sh index 0b2a42cd8..7c8c039c7 100644 --- a/plugins/php/lib/icu.sh +++ b/plugins/php/lib/icu.sh @@ -18,7 +18,7 @@ LOCAL_ADDR=common cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"") if [ ! -z "$cn" ] || [ "$?" == "0" ] ;then LOCAL_ADDR=cn - HTTP_PREFIX="https://ghproxy.com/" + HTTP_PREFIX="https://mirror.ghproxy.com/" fi if [ ! -d ${SERVER_ROOT}/icu ];then diff --git a/plugins/php/lib/libiconv.sh b/plugins/php/lib/libiconv.sh index 99eb02eb7..92d3735c0 100644 --- a/plugins/php/lib/libiconv.sh +++ b/plugins/php/lib/libiconv.sh @@ -20,7 +20,7 @@ LOCAL_ADDR=common cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"") if [ ! -z "$cn" ] || [ "$?" == "0" ] ;then LOCAL_ADDR=cn - HTTP_PREFIX="https://ghproxy.com/" + HTTP_PREFIX="https://mirror.ghproxy.com/" fi if [ ! -d ${SERVER_ROOT}/libiconv ];then diff --git a/plugins/php/lib/libzip.sh b/plugins/php/lib/libzip.sh index afd3e9020..01d80b248 100644 --- a/plugins/php/lib/libzip.sh +++ b/plugins/php/lib/libzip.sh @@ -20,7 +20,7 @@ LOCAL_ADDR=common cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"") if [ ! -z "$cn" ] || [ "$?" == "0" ] ;then LOCAL_ADDR=cn - HTTP_PREFIX="https://ghproxy.com/" + HTTP_PREFIX="https://mirror.ghproxy.com/" fi # HTTP_PREFIX="https://" diff --git a/plugins/php/lib/oniguruma.sh b/plugins/php/lib/oniguruma.sh index 55ea5d9b2..33c8ab0fb 100644 --- a/plugins/php/lib/oniguruma.sh +++ b/plugins/php/lib/oniguruma.sh @@ -16,7 +16,7 @@ SOURCE_ROOT=$rootPath/source/lib HTTP_PREFIX="https://" cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"") if [ ! -z "$cn" ] || [ "$?" == "0" ] ;then - HTTP_PREFIX="https://ghproxy.com/" + HTTP_PREFIX="https://mirror.ghproxy.com/" fi which onig-config diff --git a/plugins/php/lib/openssl_10.sh b/plugins/php/lib/openssl_10.sh index af7a33f3b..24064ebad 100644 --- a/plugins/php/lib/openssl_10.sh +++ b/plugins/php/lib/openssl_10.sh @@ -19,7 +19,7 @@ LOCAL_ADDR=common cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"") if [ ! -z "$cn" ] || [ "$?" == "0" ] ;then LOCAL_ADDR=cn - HTTP_PREFIX="https://ghproxy.com/" + HTTP_PREFIX="https://mirror.ghproxy.com/" fi if [ ! -d ${SERVER_ROOT}/openssl10 ];then diff --git a/plugins/php/lib/zlib.sh b/plugins/php/lib/zlib.sh index a12e50bba..239e4d7c4 100644 --- a/plugins/php/lib/zlib.sh +++ b/plugins/php/lib/zlib.sh @@ -20,7 +20,7 @@ LOCAL_ADDR=common cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"") if [ ! -z "$cn" ] || [ "$?" == "0" ] ;then LOCAL_ADDR=cn - HTTP_PREFIX="https://ghproxy.com/" + HTTP_PREFIX="https://mirror.ghproxy.com/" fi # HTTP_PREFIX="https://" diff --git a/scripts/install.sh b/scripts/install.sh index 1b04b5a33..410f6576b 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -64,7 +64,7 @@ fi # ping -c 1 github.com > /dev/null 2>&1 # if [ "$?" != "0" ];then # LOCAL_ADDR=cn -# HTTP_PREFIX="https://ghproxy.com/" +# HTTP_PREFIX="https://mirror.ghproxy.com/" # fi HTTP_PREFIX="https://" @@ -72,7 +72,7 @@ LOCAL_ADDR=common cn=$(curl -fsSL -m 10 -s http://ipinfo.io/json | grep "\"country\": \"CN\"") if [ ! -z "$cn" ] || [ "$?" == "0" ] ;then LOCAL_ADDR=cn - HTTP_PREFIX="https://ghproxy.com/" + HTTP_PREFIX="https://mirror.ghproxy.com/" fi echo "local:${LOCAL_ADDR}" diff --git a/scripts/install_dev.sh b/scripts/install_dev.sh index e1d712a60..4bca4b5b5 100755 --- a/scripts/install_dev.sh +++ b/scripts/install_dev.sh @@ -67,7 +67,7 @@ fi # ping -c 1 github.com > /dev/null 2>&1 # if [ "$?" != "0" ];then # LOCAL_ADDR=cn -# HTTP_PREFIX="https://ghproxy.com/" +# HTTP_PREFIX="https://mirror.ghproxy.com/" # fi HTTP_PREFIX="https://" @@ -75,7 +75,7 @@ LOCAL_ADDR=common cn=$(curl -fsSL -m 10 -s http://ipinfo.io/json | grep "\"country\": \"CN\"") if [ ! -z "$cn" ] || [ "$?" == "0" ] ;then LOCAL_ADDR=cn - HTTP_PREFIX="https://ghproxy.com/" + HTTP_PREFIX="https://mirror.ghproxy.com/" fi echo "local:${LOCAL_ADDR}" diff --git a/scripts/lib.sh b/scripts/lib.sh index fbd36fe50..a1cb36332 100755 --- a/scripts/lib.sh +++ b/scripts/lib.sh @@ -62,14 +62,14 @@ fi # ping -c 1 github.com > /dev/null 2>&1 # if [ "$?" != "0" ];then # LOCAL_ADDR=cn -# HTTP_PREFIX="https://ghproxy.com/" +# HTTP_PREFIX="https://mirror.ghproxy.com/" # fi HTTP_PREFIX="https://" LOCAL_ADDR=common cn=$(curl -fsSL -m 10 -s http://ipinfo.io/json | grep "\"country\": \"CN\"") if [ ! -z "$cn" ] || [ "$?" == "0" ] ;then LOCAL_ADDR=cn - HTTP_PREFIX="https://ghproxy.com/" + HTTP_PREFIX="https://mirror.ghproxy.com/" fi PIPSRC="https://pypi.python.org/simple" diff --git a/scripts/update.sh b/scripts/update.sh index a89fc8ff2..4bd142ebc 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -62,7 +62,7 @@ LOCAL_ADDR=common cn=$(curl -fsSL -m 10 -s http://ipinfo.io/json | grep "\"country\": \"CN\"") if [ ! -z "$cn" ] || [ "$?" == "0" ] ;then LOCAL_ADDR=cn - HTTP_PREFIX="https://ghproxy.com/" + HTTP_PREFIX="https://mirror.ghproxy.com/" fi echo "local:${LOCAL_ADDR}" diff --git a/scripts/update_dev.sh b/scripts/update_dev.sh index aaa50f53d..f0a77a932 100755 --- a/scripts/update_dev.sh +++ b/scripts/update_dev.sh @@ -61,14 +61,14 @@ fi # ping -c 1 github.com > /dev/null 2>&1 # if [ "$?" != "0" ];then # LOCAL_ADDR=cn -# HTTP_PREFIX="https://ghproxy.com/" +# HTTP_PREFIX="https://mirror.ghproxy.com/" # fi HTTP_PREFIX="https://" LOCAL_ADDR=common cn=$(curl -fsSL -m 10 -s http://ipinfo.io/json | grep "\"country\": \"CN\"") if [ ! -z "$cn" ] || [ "$?" == "0" ] ;then LOCAL_ADDR=cn - HTTP_PREFIX="https://ghproxy.com/" + HTTP_PREFIX="https://mirror.ghproxy.com/" fi echo "local:${LOCAL_ADDR}"