From 88a7431067415afb65c00544d3956578f87e8b36 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 13 Jul 2024 14:25:49 +0800
Subject: [PATCH] update

---
 class/plugin/orm.py    | 2 +-
 plugins/mysql/index.py | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/class/plugin/orm.py b/class/plugin/orm.py
index a1852451d..89ba623e9 100755
--- a/class/plugin/orm.py
+++ b/class/plugin/orm.py
@@ -23,7 +23,7 @@ class ORM:
     __DB_CHARSET = "utf8"
 
     def __Conn(self):
-        # print(self.__DB_HOST, self.__DB_USER)
+        # print(self.__DB_HOST, self.__DB_USER, self.__DB_PASS, self.__DB_SOCKET)
         '''连接数据库'''
         try:
 
diff --git a/plugins/mysql/index.py b/plugins/mysql/index.py
index 6ee09f530..d77cb9cd2 100755
--- a/plugins/mysql/index.py
+++ b/plugins/mysql/index.py
@@ -183,7 +183,7 @@ def pMysqlDb():
     db = mw.getMyORM()
     # MySQLdb |
     # db = mw.getMyORMDb()
-
+    # print(getDbPort())
     db.setPort(getDbPort())
     db.setSocket(getSocketFile())
     # db.setCharset("utf8")
@@ -665,6 +665,8 @@ def my8cmd(version, method):
 def appCMD(version, action):
     makeInitRsaKey(version)
     mdb8 = getMdb8Ver()
+    mdb8.append('5.7')
+    # print(mdb8)
     if mw.inArray(mdb8, version):
         status = my8cmd(version, action)
     else:
@@ -777,8 +779,7 @@ def setMyDbPos(version):
     mw.writeFile(myfile, mycnf)
     start(version)
 
-    result = mw.execShell(
-        'ps aux|grep mysqld| grep -v grep|grep -v python')
+    result = mw.execShell('ps aux|grep mysqld| grep -v grep|grep -v python')
     if len(result[0]) > 10:
         mw.writeFile('data/datadir.pl', t_datadir)
         return mw.returnJson(True, '存储目录迁移成功!')