From 6ff17813720cbeb274e944b7cf28d4459fd93b64 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 15 Dec 2024 04:01:57 +0800
Subject: [PATCH] update

---
 plugins/mysql-apt/init.d/mysql5.7.service.tpl | 12 ++++++------
 plugins/mysql-apt/install.sh                  |  3 +++
 plugins/mysql-apt/versions/5.7/install.sh     |  1 +
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/plugins/mysql-apt/init.d/mysql5.7.service.tpl b/plugins/mysql-apt/init.d/mysql5.7.service.tpl
index 52654c8bf..e9c46ad41 100644
--- a/plugins/mysql-apt/init.d/mysql5.7.service.tpl
+++ b/plugins/mysql-apt/init.d/mysql5.7.service.tpl
@@ -26,19 +26,19 @@
 Description=MySQL Community Server
 After=network.target
 
-[Install]
-WantedBy=multi-user.target
-
 [Service]
 User=mysql
 Group=mysql
-Type=forking
+Type=simple
 PermissionsStartOnly=true
-#ExecStartPre=/usr/share/mysql/mysql-systemd-start pre
-ExecStart={$SERVER_PATH}/mysql-apt/bin/usr/sbin/mysqld --defaults-file={$SERVER_PATH}/mysql-apt/etc/my.cnf --daemonize
+#ExecStartPre={$SERVER_PATH}/mysql-apt/bin/usr/share/mysql/mysql-systemd-start pre
+ExecStart={$SERVER_PATH}/mysql-apt/bin/usr/sbin/mysqld --defaults-file={$SERVER_PATH}/mysql-apt/etc/my.cnf
 TimeoutSec=600
 LimitNOFILE = 5000
 Restart=on-failure
 RestartPreventExitStatus=1
 RuntimeDirectory=mysqld
 RuntimeDirectoryMode=755
+
+[Install]
+WantedBy=multi-user.target
diff --git a/plugins/mysql-apt/install.sh b/plugins/mysql-apt/install.sh
index db63dcd32..592dca39b 100755
--- a/plugins/mysql-apt/install.sh
+++ b/plugins/mysql-apt/install.sh
@@ -9,6 +9,9 @@ serverPath=$(dirname "$rootPath")
 
 # https://downloads.mysql.com/archives/community/
 
+# /www/server/mysql-apt/bin/usr/sbin/mysqld --basedir=/www/server/mysql-apt/bin/usr --datadir=/www/server/mysql-apt/data --initialize-insecure --explicit_defaults_for_timestamp
+
+
 # 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 5.7
diff --git a/plugins/mysql-apt/versions/5.7/install.sh b/plugins/mysql-apt/versions/5.7/install.sh
index 331c63aca..1d2a70c43 100755
--- a/plugins/mysql-apt/versions/5.7/install.sh
+++ b/plugins/mysql-apt/versions/5.7/install.sh
@@ -11,6 +11,7 @@ export DEBIAN_FRONTEND=noninteractive
 # cd /www/server/mdserver-web/plugins/mysql-apt && bash install.sh install 5.7
 # cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/mysql-apt/index.py start 5.7
 # /www/server/mysql-apt/bin/usr/sbin/mysqld --defaults-file=/www/server/mysql-apt/etc/my.cnf --daemonize
+# /www/server/mysql-apt/bin/usr/bin/mysql -S /www/server/mysql-apt/mysql.sock -uroot -p
 
 curPath=`pwd`
 rootPath=$(dirname "$curPath")