From a2628df36869be0dc9df49b396a42a589d18cf92 Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 13 Jul 2022 14:10:28 +0800 Subject: [PATCH] up --- class/plugin/orm.py | 4 ++-- plugins/mariadb/scripts/test.py | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/class/plugin/orm.py b/class/plugin/orm.py index d590b738e..a5d12c956 100755 --- a/class/plugin/orm.py +++ b/class/plugin/orm.py @@ -23,11 +23,11 @@ class ORM: try: try: self.__DB_CONN = connector.connect(host=self.__DB_HOST, user=self.__DB_USER, passwd=self.__DB_PASS, - port=self.__DB_PORT, charset="utf8", connect_timeout=1, unix_socket=socket) + port=self.__DB_PORT, charset="utf8", connect_timeout=1, unix_socket=self.__DB_SOCKET) except Exception as e: self.__DB_HOST = '127.0.0.1' self.__DB_CONN = connector.connect(host=self.__DB_HOST, user=self.__DB_USER, passwd=self.__DB_PASS, - port=self.__DB_PORT, charset="utf8", connect_timeout=1, unix_socket=socket) + port=self.__DB_PORT, charset="utf8", connect_timeout=1, unix_socket=self.__DB_SOCKET) self.__DB_CUR = self.__DB_CONN.cursor() return True diff --git a/plugins/mariadb/scripts/test.py b/plugins/mariadb/scripts/test.py index c32da0405..b4ef50fd2 100644 --- a/plugins/mariadb/scripts/test.py +++ b/plugins/mariadb/scripts/test.py @@ -18,8 +18,7 @@ root_dir = os.path.dirname(os.path.dirname(plugin_dir)) sys.path.append(root_dir + "/class/core") import mw -sys.path.append(plugin_dir + "/class") -import orm +os.chdir(root_dir) def getPluginName(): @@ -54,8 +53,11 @@ def getConf(): def pMysqlDb(): - db = orm.ORM() + db = mw.getMyORM() db.setDbConf(getConf()) + db.__DB_SOCKET = mw.getServerDir() + '/mysql/mysql.socket' + + print(mw.getServerDir() + '/mysql/mysql.socket') db.setPwd(pSqliteDb('config').where('id=?', (1,)).getField('mysql_root')) return db