pull/617/head
Mr Chen 10 months ago
parent bf256c6e60
commit 88a7431067
  1. 2
      class/plugin/orm.py
  2. 7
      plugins/mysql/index.py

@ -23,7 +23,7 @@ class ORM:
__DB_CHARSET = "utf8" __DB_CHARSET = "utf8"
def __Conn(self): def __Conn(self):
# print(self.__DB_HOST, self.__DB_USER) # print(self.__DB_HOST, self.__DB_USER, self.__DB_PASS, self.__DB_SOCKET)
'''连接数据库''' '''连接数据库'''
try: try:

@ -183,7 +183,7 @@ def pMysqlDb():
db = mw.getMyORM() db = mw.getMyORM()
# MySQLdb | # MySQLdb |
# db = mw.getMyORMDb() # db = mw.getMyORMDb()
# print(getDbPort())
db.setPort(getDbPort()) db.setPort(getDbPort())
db.setSocket(getSocketFile()) db.setSocket(getSocketFile())
# db.setCharset("utf8") # db.setCharset("utf8")
@ -665,6 +665,8 @@ def my8cmd(version, method):
def appCMD(version, action): def appCMD(version, action):
makeInitRsaKey(version) makeInitRsaKey(version)
mdb8 = getMdb8Ver() mdb8 = getMdb8Ver()
mdb8.append('5.7')
# print(mdb8)
if mw.inArray(mdb8, version): if mw.inArray(mdb8, version):
status = my8cmd(version, action) status = my8cmd(version, action)
else: else:
@ -777,8 +779,7 @@ def setMyDbPos(version):
mw.writeFile(myfile, mycnf) mw.writeFile(myfile, mycnf)
start(version) start(version)
result = mw.execShell( result = mw.execShell('ps aux|grep mysqld| grep -v grep|grep -v python')
'ps aux|grep mysqld| grep -v grep|grep -v python')
if len(result[0]) > 10: if len(result[0]) > 10:
mw.writeFile('data/datadir.pl', t_datadir) mw.writeFile('data/datadir.pl', t_datadir)
return mw.returnJson(True, '存储目录迁移成功!') return mw.returnJson(True, '存储目录迁移成功!')

Loading…
Cancel
Save