up

class/core/mw.py

@@ -1044,13 +1044,3 @@ def getMyORMDb():
     import ormDb
     o = ormDb.ORM()
     return o
-
-
-def getMyORMMariaDb():
-    '''
-    获取MariaDB资源的ORM | pip install mariadb
-    '''
-    sys.path.append(os.getcwd() + "/class/plugin")
-    import mariaDb
-    o = mariaDb.ORM()
-    return o

class/plugin/mariaDb.py

@@ -1,93 +0,0 @@
-# coding: utf-8
-
-import re
-import os
-import sys
-
-
-class ORM:
-    __DB_PASS = None
-    __DB_USER = 'root'
-    __DB_PORT = 3306
-    __DB_HOST = 'localhost'
-    __DB_CONN = None
-    __DB_CUR = None
-    __DB_ERR = None
-    __DB_CNF = '/etc/my.cnf'
-
-    __DB_SOCKET = '/www/server/mysql/mysql.sock'
-    __DB_CHARSET = 'utf8'
-
-    def __Conn(self):
-        '''连接MariaDB数据库'''
-        try:
-
-            try:
-                import mariadb
-            except Exception as ex:
-                self.__DB_ERR = ex
-                return False
-
-            try:
-                self.__DB_CONN = mariadb.connect(host=self.__DB_HOST, user=self.__DB_USER, passwd=self.__DB_PASS,
-                                                 port=int(self.__DB_PORT), charset=self.__DB_CHARSET, connect_timeout=1)
-            except Exception as e:
-                self.__DB_HOST = '127.0.0.1'
-                self.__DB_CONN = mariadb.connect(host=self.__DB_HOST, user=self.__DB_USER, passwd=self.__DB_PASS,
-                                                 port=int(self.__DB_PORT), charset=self.__DB_CHARSET, connect_timeout=1)
-
-            self.__DB_CUR = self.__DB_CONN.cursor()
-
-            return True
-        except Exception as e:
-            self.__DB_ERR = e
-            return False
-
-    def setDbConf(self, conf):
-        self.__DB_CNF = conf
-
-    def setSocket(self, sock):
-        self.__DB_SOCKET = sock
-
-    def setCharset(self, charset):
-        self.__DB_CHARSET = charset
-
-    def setPort(self, port):
-        self.__DB_PORT = port
-
-    def setPwd(self, pwd):
-        self.__DB_PASS = pwd
-
-    def getPwd(self):
-        return self.__DB_PASS
-
-    def execute(self, sql):
-        # 执行SQL语句返回受影响行
-        if not self.__Conn():
-            return self.__DB_ERR
-        try:
-            result = self.__DB_CUR.execute(sql)
-            self.__DB_CONN.commit()
-            self.__Close()
-            return result
-        except Exception as ex:
-            return ex
-
-    def query(self, sql):
-        # 执行SQL语句返回数据集
-        if not self.__Conn():
-            return self.__DB_ERR
-        try:
-            self.__DB_CUR.execute(sql)
-            result = self.__DB_CUR.fetchall()
-            # 将元组转换成列表
-            data = map(list, result)
-            self.__Close()
-            return data
-        except Exception as ex:
-            return ex
-
-    # 关闭连接
-    def __Close(self):
-        self.__DB_CUR.close()
-        self.__DB_CONN.close()

class/plugin/orm.py

@@ -4,7 +4,7 @@ import re
 import os
 import sys
 
-from mysql import connector
+import pymysql.cursors
 
 
 class ORM:
@@ -21,25 +21,16 @@ class ORM:
     __DB_CHARSET = "utf8"
 
     def __Conn(self):
-        '''连接MYSQL数据库'''
+        '''连接数据库'''
         try:
 
-            if os.path.exists(self.__DB_SOCKET):
+            try:
-                try:
+                self.__DB_CONN = pymysql.connect(host=self.__DB_HOST, user=self.__DB_USER, passwd=self.__DB_PASS,
-                    self.__DB_CONN = connector.connect(host=self.__DB_HOST, user=self.__DB_USER, passwd=self.__DB_PASS,
+                                                 port=self.__DB_PORT, charset=self.__DB_CHARSET, connect_timeout=1, cursorclass=pymysql.cursors.DictCursor)
-                                                       port=self.__DB_PORT, charset=self.__DB_CHARSET, connect_timeout=1, unix_socket=self.__DB_SOCKET)
+            except Exception as e:
-                except Exception as e:
+                self.__DB_HOST = '127.0.0.1'
-                    self.__DB_HOST = '127.0.0.1'
+                self.__DB_CONN = pymysql.connect(host=self.__DB_HOST, user=self.__DB_USER, passwd=self.__DB_PASS,
-                    self.__DB_CONN = connector.connect(host=self.__DB_HOST, user=self.__DB_USER, passwd=self.__DB_PASS,
+                                                 port=self.__DB_PORT, charset=self.__DB_CHARSET, connect_timeout=1, cursorclass=pymysql.cursors.DictCursor)
-                                                       port=self.__DB_PORT, charset=self.__DB_CHARSET, connect_timeout=1, unix_socket=self.__DB_SOCKET)
-            else:
-                try:
-                    self.__DB_CONN = connector.connect(host=self.__DB_HOST, user=self.__DB_USER, passwd=self.__DB_PASS,
-                                                       port=self.__DB_PORT, charset=self.__DB_CHARSET, connect_timeout=1)
-                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=self.__DB_CHARSET, connect_timeout=1)
 
             self.__DB_CUR = self.__DB_CONN.cursor()
             return True

plugins/mariadb/index.py

@@ -144,10 +144,10 @@ def pSqliteDb(dbname='databases'):
 
 
 def pMysqlDb():
-    # mysql.connector
+    # pymysql
-    # db = mw.getMyORM()
+    db = mw.getMyORM()
     # MySQLdb |
-    db = mw.getMyORMMariaDb()
+    # db = mw.getMyORMDb()
 
     db.setDbConf(getConf())
     db.setPort(getDbPort())

requirements.txt

@@ -24,4 +24,5 @@ pymongo
 pillow
 Jinja2>=2.11.2
 flask-caching>=1.10.1
+PyMySQL
 mysql-connector-python

scripts/lib.sh

@@ -114,7 +114,6 @@ cd /www/server/mdserver-web && pip3 install -r /www/server/mdserver-web/requirem
 pip3 install gevent-websocket==0.10.1
 pip3 install flask-caching==1.10.1
 pip3 install mysqlclient
-# pip3 install mariadb
 
 
 if [ ! -f /www/server/mdserver-web/bin/activate ];then
@@ -131,5 +130,4 @@ pip3 install -r /www/server/mdserver-web/requirements.txt
 pip3 install gevent-websocket==0.10.1
 pip3 install flask-caching==1.10.1
 pip3 install mysqlclient
-# pip3 install mariadb