From fb83cb40dfeff6b37aa6a213e906436ec9f7c47d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 23 Jul 2024 14:28:09 +0800
Subject: [PATCH] update

---
 plugins/mysql-apt/info.json               |   2 +-
 plugins/mysql-apt/versions/8.4/install.sh |   6 +-
 plugins/mysql-apt/versions/9.0/install.sh | 139 ++++++++++++++++++++++
 plugins/mysql/versions/9.0/install.sh     |   2 +-
 4 files changed, 144 insertions(+), 5 deletions(-)
 create mode 100755 plugins/mysql-apt/versions/9.0/install.sh

diff --git a/plugins/mysql-apt/info.json b/plugins/mysql-apt/info.json
index 3e44183c9..d2b06cbd9 100755
--- a/plugins/mysql-apt/info.json
+++ b/plugins/mysql-apt/info.json
@@ -6,7 +6,7 @@
 	"type":"运行环境",
 	"ps":"一种关系数据库管理系统[debian,ubuntu](极速安装)",
 	"todo_versions":["5.7","8.0"],
-	"versions":["5.7","8.0","8.2","8.3","8.4"],
+	"versions":["5.7","8.0","8.2","8.3","8.4","9.0"],
 	"shell":"install.sh",
 	"install_pre_inspection":true,
 	"uninstall_pre_inspection":true,
diff --git a/plugins/mysql-apt/versions/8.4/install.sh b/plugins/mysql-apt/versions/8.4/install.sh
index d70a9a930..a3647de16 100755
--- a/plugins/mysql-apt/versions/8.4/install.sh
+++ b/plugins/mysql-apt/versions/8.4/install.sh
@@ -45,7 +45,7 @@ if [ "$ARCH" != "amd64" ];then
 fi
 
 
-MYSQL_VER=8.4.0
+MYSQL_VER=8.4.2
 SUFFIX_NAME=${MYSQL_VER}-1${OSNAME}${VERSION_ID}_${ARCH}
 
 
@@ -112,10 +112,10 @@ Install_mysql()
 	if [ "$?" == "0" ];then
 		mkdir -p $serverPath/mysql-apt
 		echo '8.4' > $serverPath/mysql-apt/version.pl
-		echo '安装完成' > $install_tmp
+		echo '安装完成' >
 	else
 		echo '8.4' > $serverPath/mysql-apt/version.pl
-		echo "暂时不支持该系统" > $install_tmp
+		echo "暂时不支持该系统"
 	fi
 }
 
diff --git a/plugins/mysql-apt/versions/9.0/install.sh b/plugins/mysql-apt/versions/9.0/install.sh
new file mode 100755
index 000000000..766521900
--- /dev/null
+++ b/plugins/mysql-apt/versions/9.0/install.sh
@@ -0,0 +1,139 @@
+# -*- coding: utf-8 -*-
+#!/bin/bash
+
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+export DEBIAN_FRONTEND=noninteractive
+
+# https://downloads.mysql.com/archives/community/
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+sysName=`uname`
+
+install_tmp=${rootPath}/tmp/mw_install.pl
+myDir=${serverPath}/source/mysql-apt
+
+bash ${rootPath}/scripts/getos.sh
+OSNAME=`cat ${rootPath}/data/osname.pl`
+VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
+
+# 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`
+if [ "$TMP_ARCH" == "x86_64" ];then
+	ARCH="amd64"
+elif [ "$TMP_ARCH" == "aarch64" ];then
+	ARCH="arm64"
+else
+	ARCH="amd64"
+fi
+
+if [ "$ARCH" != "amd64" ];then
+	echo "暂时不支持该${ARCH}" > $install_tmp
+	exit 1
+fi
+
+
+MYSQL_VER=9.0.1
+SUFFIX_NAME=${MYSQL_VER}-1${OSNAME}${VERSION_ID}_${ARCH}
+
+
+# /lib/systemd/system/mysql.service
+# /etc/mysql/my.cnf
+
+APT_INSTALL()
+{
+########
+mkdir -p $myDir
+mkdir -p $serverPath/mysql-apt/bin
+
+mkdir -p /var/run/mysqld
+chown mysql -R /var/run/mysqld
+
+# https://cdn.mysql.com/archives/mysql-8.4/mysql-server_${SUFFIX_NAME}.deb-bundle.tar
+# https://dev.mysql.com/get/Downloads/MySQL-8.4/mysql-server_${SUFFIX_NAME}.deb-bundle.tar
+
+wget  --no-check-certificate -O ${myDir}/mysql-server_${SUFFIX_NAME}.deb-bundle.tar https://dev.mysql.com/get/Downloads/MySQL-8.4/mysql-server_${SUFFIX_NAME}.deb-bundle.tar
+chmod +x ${myDir}/mysql-server_${SUFFIX_NAME}.deb-bundle.tar
+cd ${myDir} && tar vxf ${myDir}/mysql-server_${SUFFIX_NAME}.deb-bundle.tar
+
+apt update -y
+apt install -y libnuma1 libaio1 libmecab2
+
+# 安装
+dpkg -X mysql-common_${SUFFIX_NAME}.deb $serverPath/mysql-apt/bin
+
+
+
+dpkg -X mysql-community-client-plugins_${SUFFIX_NAME}.deb $serverPath/mysql-apt/bin
+dpkg -X mysql-community-client-core_${SUFFIX_NAME}.deb $serverPath/mysql-apt/bin
+dpkg -X mysql-community-client_${SUFFIX_NAME}.deb $serverPath/mysql-apt/bin
+dpkg -X mysql-client_${SUFFIX_NAME}.deb $serverPath/mysql-apt/bin
+
+dpkg -X mysql-community-server-core_${SUFFIX_NAME}.deb $serverPath/mysql-apt/bin
+
+dpkg -X mysql-community-server_${SUFFIX_NAME}.deb $serverPath/mysql-apt/bin
+dpkg -X mysql-server_${SUFFIX_NAME}.deb $serverPath/mysql-apt/bin
+
+# 测试时可关闭
+rm -rf $myDir
+#######
+}
+
+APT_UNINSTALL()
+{
+###
+rm -rf $myDir
+# apt remove -y mysql-server
+###
+}
+
+
+Install_mysql()
+{
+	echo '正在安装脚本文件...' > $install_tmp
+
+	isApt=`which apt`
+	if [ "$isApt" != "" ];then
+		APT_INSTALL
+	fi
+
+	if [ "$?" == "0" ];then
+		mkdir -p $serverPath/mysql-apt
+		echo '9.0' > $serverPath/mysql-apt/version.pl
+		echo '安装完成'
+	else
+		echo '9.0' > $serverPath/mysql-apt/version.pl
+		echo "暂时不支持该系统"
+	fi
+}
+
+Uninstall_mysql()
+{
+
+	isApt=`which apt`
+	if [ "$isApt" != "" ];then
+		APT_UNINSTALL
+	fi
+
+	rm -rf $serverPath/mysql-apt
+	echo '卸载完成'
+}
+
+action=$1
+if [ "${1}" == 'install' ];then
+	Install_mysql
+else
+	Uninstall_mysql
+fi
diff --git a/plugins/mysql/versions/9.0/install.sh b/plugins/mysql/versions/9.0/install.sh
index f422eb125..ac433a427 100755
--- a/plugins/mysql/versions/9.0/install.sh
+++ b/plugins/mysql/versions/9.0/install.sh
@@ -204,7 +204,7 @@ Install_mysql()
 
 		if [ -d $serverPath/mysql ];then
 			rm -rf ${mysqlDir}/mysql-${VERSION}
-			echo '8.4' > $serverPath/mysql/version.pl
+			echo '9.0' > $serverPath/mysql/version.pl
 			echo "${VERSION}安装完成"
 		else
 			# rm -rf ${mysqlDir}/mysql-${VERSION}