From 962b0fa9c52af66b2c2431c9113e7d286881fd31 Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Mon, 9 Oct 2023 20:32:35 +0800
Subject: [PATCH] =?UTF-8?q?mysql=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/mariadb/index.py   | 4 ++--
 plugins/mysql-apt/index.py | 3 ++-
 plugins/mysql-yum/index.py | 4 ++--
 plugins/mysql/index.py     | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/plugins/mariadb/index.py b/plugins/mariadb/index.py
index 55111291a9..dd5988e50b 100755
--- a/plugins/mariadb/index.py
+++ b/plugins/mariadb/index.py
@@ -402,6 +402,8 @@ def initMariaDbPwd():
         pwd + ' -e "drop database test";'
     mw.execShell(drop_test_db)
 
+    pSqliteDb('config').where('id=?', (1,)).save('mysql_root', (pwd,))
+
     # 删除冗余账户
     hostname = mw.execShell('hostname')[0].strip()
     if hostname != 'localhost':
@@ -412,8 +414,6 @@ def initMariaDbPwd():
         drop_root_hostname =  serverdir + '/bin/mysql  --defaults-file=' + \
             myconf + ' -uroot -p' + pwd + ' -e "drop user \'root\'@\'' + hostname + '\'";'
         mw.execShell(drop_root_hostname)
-
-    pSqliteDb('config').where('id=?', (1,)).save('mysql_root', (pwd,))
     return True
 
 
diff --git a/plugins/mysql-apt/index.py b/plugins/mysql-apt/index.py
index 4fda68d442..fea0209471 100755
--- a/plugins/mysql-apt/index.py
+++ b/plugins/mysql-apt/index.py
@@ -405,6 +405,8 @@ def initMysql8Pwd():
         pwd + ' -e "drop database test";'
     mw.execShell(drop_test_db)
 
+    pSqliteDb('config').where('id=?', (1,)).save('mysql_root', (pwd,))
+
     # 删除冗余账户
     hostname = mw.execShell('hostname')[0].strip()
     if hostname != 'localhost':
@@ -416,7 +418,6 @@ def initMysql8Pwd():
             myconf + ' -uroot -p' + pwd + ' -e "drop user \'root\'@\'' + hostname + '\'";'
         mw.execShell(drop_root_hostname)
 
-        pSqliteDb('config').where('id=?', (1,)).save('mysql_root', (pwd,))
     return True
 
 
diff --git a/plugins/mysql-yum/index.py b/plugins/mysql-yum/index.py
index 717fc4ccc2..8beae76a9d 100755
--- a/plugins/mysql-yum/index.py
+++ b/plugins/mysql-yum/index.py
@@ -394,6 +394,8 @@ def initMysql8Pwd():
         pwd + ' -e "drop database test";'
     mw.execShell(drop_test_db)
 
+    pSqliteDb('config').where('id=?', (1,)).save('mysql_root', (pwd,))
+
     # 删除冗余账户
     hostname = mw.execShell('hostname')[0].strip()
     if hostname != 'localhost':
@@ -404,8 +406,6 @@ def initMysql8Pwd():
         drop_root_hostname =  cmd_my + ' --defaults-file=' + \
             myconf + ' -uroot -p' + pwd + ' -e "drop user \'root\'@\'' + hostname + '\'";'
         mw.execShell(drop_root_hostname)
-
-        pSqliteDb('config').where('id=?', (1,)).save('mysql_root', (pwd,))
     return True
 
 
diff --git a/plugins/mysql/index.py b/plugins/mysql/index.py
index ce15f133a6..a1c3da9d6c 100755
--- a/plugins/mysql/index.py
+++ b/plugins/mysql/index.py
@@ -509,6 +509,8 @@ def initMysql8Pwd():
         myconf + ' -uroot -p' + pwd + ' -e "drop database test";'
     mw.execShell(drop_test_db)
 
+    pSqliteDb('config').where('id=?', (1,)).save('mysql_root', (pwd,))
+
     # 删除冗余账户
     hostname = mw.execShell('hostname')[0].strip()
     if hostname != 'localhost':
@@ -520,8 +522,6 @@ def initMysql8Pwd():
             myconf + ' -uroot -p' + pwd + ' -e "drop user \'root\'@\'' + hostname + '\'";'
         mw.execShell(drop_root_hostname)
 
-    pSqliteDb('config').where('id=?', (1,)).save('mysql_root', (pwd,))
-
     return True