잉여개발기 (SPDV) 2 лет назад
Родитель
Сommit
afd3c820f5
2 измененных файлов с 19 добавлено и 11 удалено
  1. 18 10
      route/tool/func.py
  2. 1 1
      version.json

+ 18 - 10
route/tool/func.py

@@ -151,19 +151,27 @@ class get_db_connect:
             )
             self.conn.execute('pragma journal_mode = wal')
         else:
-            self.conn = pymysql.connect(
-                host = self.db_set['mysql_host'],
-                user = self.db_set['mysql_user'],
-                password = self.db_set['mysql_pw'],
-                charset = 'utf8mb4',
-                port = int(self.db_set['mysql_port']),
-                autocommit = True
-            )
-
             try:
+                self.conn = pymysql.connect(
+                    host = self.db_set['mysql_host'],
+                    user = self.db_set['mysql_user'],
+                    password = self.db_set['mysql_pw'],
+                    charset = 'utf8mb4',
+                    port = int(self.db_set['mysql_port']),
+                    autocommit = True
+                )
+                
                 self.conn.select_db(self.db_set['name'])
             except:
-                pass
+                self.conn = pymysql.connect(
+                    host = self.db_set['mysql_host'],
+                    user = self.db_set['mysql_user'],
+                    password = self.db_set['mysql_pw'],
+                    charset = 'utf8mb4',
+                    port = int(self.db_set['mysql_port']),
+                    autocommit = True,
+                    db = self.db_set['name']
+                )
 
         return self.conn
     

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.6-RC4-dev228",
+        "r_ver" : "v3.4.6-RC4-dev229",
         "c_ver" : "3500365",
         "s_ver" : "3500111"
     }