Merge pull request #486 from midoks/dev

版本升级

class/core/config_api.py

@@ -27,7 +27,7 @@ from flask import request
 
 class config_api:
 
-    __version = '0.16.1.5'
+    __version = '0.16.1.6'
     __api_addr = 'data/api.json'
 
     def __init__(self):

plugins/memcached/install.sh

@@ -10,7 +10,7 @@ serverPath=$(dirname "$rootPath")
 
 install_tmp=${rootPath}/tmp/mw_install.pl
 
-VERSION=1.6.15
+VERSION=1.6.22
 
 Install_mem(){
 	mkdir -p $serverPath/source

plugins/mysql-apt/index.py

@@ -2740,6 +2740,9 @@ def installPreInspection(version):
     if (sysName == 'debian' and not sysId in('12', '11', '10')):
         return 'debian支持10,11,12'
 
+    if sysName == 'debian' and sysId == '12' and version == '8.0':
+        return 'debian12,暂时不支持8.0'
+
     if (sysName == 'ubuntu' and version == '5.7' and not sysId in ('18.04')):
         return "Ubuntu Apt MySQL[" + version + "] 仅支持18.04"
 

plugins/mysql-apt/install.sh

@@ -12,6 +12,7 @@ serverPath=$(dirname "$rootPath")
 # cd /www/server/mdserver-web/plugins/mysql-apt && bash install.sh install 8.0
 # cd /www/server/mdserver-web/plugins/mysql-apt && bash install.sh uninstall 8.0
 # cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/mysql-apt/index.py start 8.0
+# cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/mysql-apt/index.py fix_db_access
 
 install_tmp=${rootPath}/tmp/mw_install.pl
 

plugins/mysql-apt/versions/8.0/install.sh

@@ -22,6 +22,12 @@ VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -
 
 # cd /www/server/mdserver-web/plugins/mysql-apt && bash install.sh install 8.0
 
+# 暂时debian12没有标准版,先用11使用
+if [ "$OSNAME" == 'debian' ] && [ "$VERSION_ID" == '12' ] ;then 
+	echo "暂时不支持该${OSNAME}${VERSION_ID}" > $install_tmp
+	exit 1
+fi
+
 
 ARCH="amd64"
 TMP_ARCH=`arch`
@@ -39,7 +45,7 @@ if [ "$ARCH" != "amd64" ];then
 fi
 
 
-MYSQL_VER=8.0.30
+MYSQL_VER=8.0.33
 SUFFIX_NAME=${MYSQL_VER}-1${OSNAME}${VERSION_ID}_${ARCH}
 
 
@@ -108,6 +114,7 @@ Install_mysql()
 		echo '8.0' > $serverPath/mysql-apt/version.pl
 		echo '安装完成' > $install_tmp
 	else
+		echo '8.0' > $serverPath/mysql-apt/version.pl
 		echo "暂时不支持该系统" > $install_tmp
 	fi
 }

plugins/php/info.json

@@ -6,7 +6,7 @@
 	"title": "PHP",
 	"coexist": true,
 	"versions": ["53","54","55","56","70","71","72","73","74","80","81","82","83"],
-	"updates": ["5.3.29","5.4.45","5.6.36","7.0.30","7.1.33","7.2.32","7.3.20","7.4.30","8.0.30","8.1.8","8.2.9","8.3.0"],
+	"updates": ["5.3.29","5.4.45","5.6.36","7.0.30","7.1.33","7.2.32","7.3.20","7.4.30","8.0.30","8.1.24","8.2.11","8.3.0"],
 	"tip": "soft",
 	"install_pre_inspection":true,
 	"checks": "server/php/VERSION/bin/php",

plugins/php/versions/80/install.sh

@@ -51,20 +51,20 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then
 	fi
 	# ----------------------------------------------------------------------- #
 
+	if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then
+		wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://www.php.net/distributions/php-${version}.tar.xz
+	fi
+
 	#检测文件是否损坏.
-	md5_file_ok=453206c948d9504b91fcec30fcb59b75
+	md5_file_ok=216ab305737a5d392107112d618a755dc5df42058226f1670e9db90e77d777d9
 	if [ -f $sourcePath/php/php-${version}.tar.xz ];then
-		md5_file=`md5sum $sourcePath/php/php-${version}.tar.xz  | awk '{print $1}'`
+		md5_file=`sha256sum $sourcePath/php/php-${version}.tar.xz  | awk '{print $1}'`
 		if [ "${md5_file}" != "${md5_file_ok}" ]; then
 			echo "PHP${version} 下载文件不完整,重新安装"
 			rm -rf $sourcePath/php/php-${version}.tar.xz
 		fi
 	fi
 	
-	if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then
-		wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://www.php.net/distributions/php-${version}.tar.xz
-	fi
-	
 	cd $sourcePath/php && tar -Jxf $sourcePath/php/php-${version}.tar.xz
 	mv $sourcePath/php/php-${version} $sourcePath/php/php${PHP_VER}
 fi

plugins/php/versions/81/install.sh

@@ -16,7 +16,7 @@ function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)"
 function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
 
 
-version=8.1.22
+version=8.1.24
 PHP_VER=81
 Install_php()
 {
@@ -51,21 +51,20 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then
 	fi
 	# ----------------------------------------------------------------------- #
 
+	if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then
+		wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://www.php.net/distributions/php-${version}.tar.xz
+	fi
 	
 	#检测文件是否损坏.
-	md5_file_ok=b3a403d00c28d5e33c0c5b7464d27671
+	md5_file_ok=ee61f6232bb29bd2e785daf325d2177f2272bf80d086c295a724594e710bce3d
 	if [ -f $sourcePath/php/php-${version}.tar.xz ];then
-		md5_file=`md5sum $sourcePath/php/php-${version}.tar.xz  | awk '{print $1}'`
+		md5_file=`sha256sum $sourcePath/php/php-${version}.tar.xz  | awk '{print $1}'`
 		if [ "${md5_file}" != "${md5_file_ok}" ]; then
 			echo "PHP${version} 下载文件不完整,重新安装"
 			rm -rf $sourcePath/php/php-${version}.tar.xz
 		fi
 	fi
 
-	if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then
-		wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://www.php.net/distributions/php-${version}.tar.xz
-	fi
-	
 	cd $sourcePath/php && tar -Jxf $sourcePath/php/php-${version}.tar.xz
 	mv $sourcePath/php/php-${version} $sourcePath/php/php${PHP_VER}
 fi

plugins/php/versions/82/install.sh

@@ -16,7 +16,7 @@ function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)"
 function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
 
 
-version=8.2.9
+version=8.2.11
 PHP_VER=82
 Install_php()
 {
@@ -52,20 +52,20 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then
 	# ----------------------------------------------------------------------- #
 
 
+	if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then
+		wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://www.php.net/distributions/php-${version}.tar.xz
+	fi
+
 	#检测文件是否损坏.
-	md5_file_ok=897c9c416663d03e516a68cb86b598f3
+	md5_file_ok=29af82e4f7509831490552918aad502697453f0869a579ee1b80b08f9112c5b8
 	if [ -f $sourcePath/php/php-${version}.tar.xz ];then
-		md5_file=`md5sum $sourcePath/php/php-${version}.tar.xz  | awk '{print $1}'`
+		md5_file=`sha256sum $sourcePath/php/php-${version}.tar.xz  | awk '{print $1}'`
 		if [ "${md5_file}" != "${md5_file_ok}" ]; then
 			echo "PHP${version} 下载文件不完整,重新安装"
 			rm -rf $sourcePath/php/php-${version}.tar.xz
 		fi
 	fi
 	
-	if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then
-		wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://www.php.net/distributions/php-${version}.tar.xz
-	fi
-	
 	cd $sourcePath/php && tar -Jxf $sourcePath/php/php-${version}.tar.xz
 	mv $sourcePath/php/php-${version} $sourcePath/php/php${PHP_VER}
 fi

plugins/php/versions/83/install.sh

@@ -15,7 +15,7 @@ function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)"
 function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" != "$1"; }
 function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
 
-version=8.3.0alpha2
+version=8.3.0RC4
 PHP_VER=83
 Install_php()
 {
@@ -56,9 +56,9 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then
 	fi
 
 	#检测文件是否损坏.
-	# md5_file_ok=5c5b1960276e24b1a7a1b3a9817738e8
+	# md5_file_ok=29af82e4f7509831490552918aad502697453f0869a579ee1b80b08f9112c5b8
 	# if [ -f $sourcePath/php/php-${version}.tar.xz ];then
-	# 	md5_file=`md5sum $sourcePath/php/php-${version}.tar.xz  | awk '{print $1}'`
+	# 	md5_file=`sha256sum $sourcePath/php/php-${version}.tar.xz  | awk '{print $1}'`
 	# 	if [ "${md5_file}" != "${md5_file_ok}" ]; then
 	# 		echo "PHP${version} 下载文件不完整,重新安装"
 	# 		rm -rf $sourcePath/php/php-${version}.tar.xz

plugins/redis/info.json

@@ -4,8 +4,8 @@
 	"name": "redis",
 	"title": "Redis",
 	"shell": "install.sh",
-	"versions":["4.0.11","5.0.8","6.0.4","6.2.7","7.0.12"],
+	"versions":["4.0.11","5.0.8","6.0.4","6.2.7","7.0.12","7.2.2"],
-	"updates":["4.0.11","5.0.8","6.0.4","6.2.7","7.0.12"],
+	"updates":["4.0.11","5.0.8","6.0.4","6.2.7","7.0.12","7.2.2"],
 	"tip": "soft",
 	"checks": "server/redis",
 	"path": "server/redis",

plugins/sphinx/install.sh

@@ -21,6 +21,8 @@ if [ ${OSNAME} == "centos" ] ||
 	yum install -y postgresql-libs unixODBC
 fi
 
+
+VERSION=3.1.1
 Install_sphinx()
 {
 
@@ -30,28 +32,28 @@ Install_sphinx()
 	SPHINX_DIR=${serverPath}/source/sphinx
 	mkdir -p $SPHINX_DIR
 	
-	if [ ! -f ${SPHINX_DIR}/sphinx-3.1.1.tar.gz ];then
+	if [ ! -f ${SPHINX_DIR}/sphinx-${VERSION}.tar.gz ];then
 		if [ $sysName == 'Darwin' ]; then
-			wget -O ${SPHINX_DIR}/sphinx-3.1.1.tar.gz http://sphinxsearch.com/files/sphinx-3.1.1-612d99f-darwin-amd64.tar.gz
+			wget -O ${SPHINX_DIR}/sphinx-${VERSION}.tar.gz http://sphinxsearch.com/files/sphinx-${VERSION}-612d99f-darwin-amd64.tar.gz
 		else
-			curl -sSLo ${SPHINX_DIR}/sphinx-3.1.1.tar.gz http://sphinxsearch.com/files/sphinx-3.1.1-612d99f-linux-amd64.tar.gz
+			curl -sSLo ${SPHINX_DIR}/sphinx-${VERSION}.tar.gz http://sphinxsearch.com/files/sphinx-${VERSION}-612d99f-linux-amd64.tar.gz
 		fi
 	fi
 
-	if [ ! -f ${SPHINX_DIR}/sphinx-3.1.1.tar.gz ];then
+	if [ ! -f ${SPHINX_DIR}/sphinx-${VERSION}.tar.gz ];then
-		curl -sSLo ${SPHINX_DIR}/sphinx-3.1.1.tar.gz https://github.com/midoks/mdserver-web/releases/download/init/sphinx-3.1.1.tar.gz
+		curl -sSLo ${SPHINX_DIR}/sphinx-${VERSION}.tar.gz https://github.com/midoks/mdserver-web/releases/download/init/sphinx-${VERSION}.tar.gz
 	fi
 
 
-	cd ${SPHINX_DIR} && tar -zxvf sphinx-3.1.1.tar.gz
+	cd ${SPHINX_DIR} && tar -zxvf sphinx-${VERSION}.tar.gz
 	
 	if [ "$?" == "0" ];then
 		mkdir -p $SPHINX_DIR
-		cp -rf ${SPHINX_DIR}/sphinx-3.1.1/ $serverPath/sphinx/bin
+		cp -rf ${SPHINX_DIR}/sphinx-${VERSION}/ $serverPath/sphinx/bin
 	fi
 	
 	if [ -d $serverPath/sphinx ];then
-		echo '3.1.1' > $serverPath/sphinx/version.pl
+		echo "${VERSION}" > $serverPath/sphinx/version.pl
 		echo '安装完成' > $install_tmp
 		cd ${rootPath} && python3 ${rootPath}/plugins/sphinx/index.py start
 		cd ${rootPath} && python3 ${rootPath}/plugins/sphinx/index.py initd_install