|
@@ -75,8 +75,6 @@ import requests
|
|
|
|
|
|
|
|
import pymysql
|
|
import pymysql
|
|
|
|
|
|
|
|
-import PIL
|
|
|
|
|
-
|
|
|
|
|
if sys.version_info < (3, 6):
|
|
if sys.version_info < (3, 6):
|
|
|
import sha3
|
|
import sha3
|
|
|
|
|
|
|
@@ -84,6 +82,8 @@ if sys.version_info < (3, 6):
|
|
|
global_lang = {}
|
|
global_lang = {}
|
|
|
global_wiki_set = {}
|
|
global_wiki_set = {}
|
|
|
|
|
|
|
|
|
|
+global_db_set = ''
|
|
|
|
|
+
|
|
|
data_css_ver = '111'
|
|
data_css_ver = '111'
|
|
|
data_css = ''
|
|
data_css = ''
|
|
|
|
|
|
|
@@ -170,7 +170,13 @@ class server_init:
|
|
|
else:
|
|
else:
|
|
|
return self.server_set_var[key]['default']
|
|
return self.server_set_var[key]['default']
|
|
|
|
|
|
|
|
-def get_conn(db_set):
|
|
|
|
|
|
|
+def get_conn(db_set = ''):
|
|
|
|
|
+ global global_db_set
|
|
|
|
|
+ if db_set != '':
|
|
|
|
|
+ global_db_set = db_set
|
|
|
|
|
+ else:
|
|
|
|
|
+ db_set = global_db_set
|
|
|
|
|
+
|
|
|
if db_set['type'] == 'sqlite':
|
|
if db_set['type'] == 'sqlite':
|
|
|
conn = sqlite3.connect(db_set['name'] + '.db')
|
|
conn = sqlite3.connect(db_set['name'] + '.db')
|
|
|
curs = conn.cursor()
|
|
curs = conn.cursor()
|
|
@@ -194,6 +200,8 @@ def get_conn(db_set):
|
|
|
|
|
|
|
|
conn.select_db(db_set['name'])
|
|
conn.select_db(db_set['name'])
|
|
|
|
|
|
|
|
|
|
+ load_conn(conn)
|
|
|
|
|
+
|
|
|
return conn
|
|
return conn
|
|
|
|
|
|
|
|
def update(ver_num, set_data):
|
|
def update(ver_num, set_data):
|