From ab64c01981f2b579c7172c5719837edccb07156f Mon Sep 17 00:00:00 2001 From: midoks Date: Sat, 31 Dec 2022 13:14:30 +0800 Subject: [PATCH] up --- plugins/mariadb/index.py | 29 ++++++++++++++++++----------- plugins/mysql-apt/index.py | 29 ++++++++++++++++++----------- plugins/mysql-yum/index.py | 29 ++++++++++++++++++----------- plugins/mysql/index.py | 6 +++--- 4 files changed, 57 insertions(+), 36 deletions(-) diff --git a/plugins/mariadb/index.py b/plugins/mariadb/index.py index 003aab3ce..8245cf93b 100755 --- a/plugins/mariadb/index.py +++ b/plugins/mariadb/index.py @@ -140,20 +140,27 @@ def contentReplace(content): def pSqliteDb(dbname='databases'): file = getServerDir() + '/mariadb.db' name = 'mysql' - if not os.path.exists(file): + + import_sql = mw.readFile(getPluginDir() + '/conf/mariadb.sql') + md5_sql = mw.md5(import_sql) + + import_sign = False + save_md5_file = getServerDir() + '/import_sql.md5' + if os.path.exists(save_md5_file): + save_md5_sql = mw.readFile(save_md5_file) + if save_md5_sql != md5_sql: + import_sign = True + mw.writeFile(save_md5_file, md5_sql) + else: + mw.writeFile(save_md5_file, md5_sql) + + if not os.path.exists(file) or import_sql: conn = mw.M(dbname).dbPos(getServerDir(), name) - csql = mw.readFile(getPluginDir() + '/conf/mariadb.sql') - csql_list = csql.split(';') + csql_list = import_sql.split(';') for index in range(len(csql_list)): conn.execute(csql_list[index], ()) - else: - # 现有run - # conn = mw.M(dbname).dbPos(getServerDir(), name) - # csql = mw.readFile(getPluginDir() + '/conf/mysql.sql') - # csql_list = csql.split(';') - # for index in range(len(csql_list)): - # conn.execute(csql_list[index], ()) - conn = mw.M(dbname).dbPos(getServerDir(), name) + + conn = mw.M(dbname).dbPos(getServerDir(), name) return conn diff --git a/plugins/mysql-apt/index.py b/plugins/mysql-apt/index.py index 49eab0e7f..a0c6c674b 100755 --- a/plugins/mysql-apt/index.py +++ b/plugins/mysql-apt/index.py @@ -122,20 +122,27 @@ def contentReplace(content): def pSqliteDb(dbname='databases'): file = getServerDir() + '/mysql.db' name = 'mysql' - if not os.path.exists(file): + + import_sql = mw.readFile(getPluginDir() + '/conf/mysql.sql') + md5_sql = mw.md5(import_sql) + + import_sign = False + save_md5_file = getServerDir() + '/import_sql.md5' + if os.path.exists(save_md5_file): + save_md5_sql = mw.readFile(save_md5_file) + if save_md5_sql != md5_sql: + import_sign = True + mw.writeFile(save_md5_file, md5_sql) + else: + mw.writeFile(save_md5_file, md5_sql) + + if not os.path.exists(file) or import_sql: conn = mw.M(dbname).dbPos(getServerDir(), name) - csql = mw.readFile(getPluginDir() + '/conf/mysql.sql') - csql_list = csql.split(';') + csql_list = import_sql.split(';') for index in range(len(csql_list)): conn.execute(csql_list[index], ()) - else: - # 现有run - # conn = mw.M(dbname).dbPos(getServerDir(), name) - # csql = mw.readFile(getPluginDir() + '/conf/mysql.sql') - # csql_list = csql.split(';') - # for index in range(len(csql_list)): - # conn.execute(csql_list[index], ()) - conn = mw.M(dbname).dbPos(getServerDir(), name) + + conn = mw.M(dbname).dbPos(getServerDir(), name) return conn diff --git a/plugins/mysql-yum/index.py b/plugins/mysql-yum/index.py index bf14c60c1..97d983b60 100755 --- a/plugins/mysql-yum/index.py +++ b/plugins/mysql-yum/index.py @@ -129,20 +129,27 @@ def contentReplace(content): def pSqliteDb(dbname='databases'): file = getServerDir() + '/mysql.db' name = 'mysql' - if not os.path.exists(file): + + import_sql = mw.readFile(getPluginDir() + '/conf/mysql.sql') + md5_sql = mw.md5(import_sql) + + import_sign = False + save_md5_file = getServerDir() + '/import_sql.md5' + if os.path.exists(save_md5_file): + save_md5_sql = mw.readFile(save_md5_file) + if save_md5_sql != md5_sql: + import_sign = True + mw.writeFile(save_md5_file, md5_sql) + else: + mw.writeFile(save_md5_file, md5_sql) + + if not os.path.exists(file) or import_sql: conn = mw.M(dbname).dbPos(getServerDir(), name) - csql = mw.readFile(getPluginDir() + '/conf/mysql.sql') - csql_list = csql.split(';') + csql_list = import_sql.split(';') for index in range(len(csql_list)): conn.execute(csql_list[index], ()) - else: - # 现有run - # conn = mw.M(dbname).dbPos(getServerDir(), name) - # csql = mw.readFile(getPluginDir() + '/conf/mysql.sql') - # csql_list = csql.split(';') - # for index in range(len(csql_list)): - # conn.execute(csql_list[index], ()) - conn = mw.M(dbname).dbPos(getServerDir(), name) + + conn = mw.M(dbname).dbPos(getServerDir(), name) return conn diff --git a/plugins/mysql/index.py b/plugins/mysql/index.py index cd72198ad..7318cbd83 100755 --- a/plugins/mysql/index.py +++ b/plugins/mysql/index.py @@ -135,15 +135,15 @@ def pSqliteDb(dbname='databases'): save_md5_file = getServerDir() + '/import_sql.md5' if os.path.exists(save_md5_file): save_md5_sql = mw.readFile(save_md5_file) - if save_md5_sql == md5_sql: + if save_md5_sql != md5_sql: import_sign = True + mw.writeFile(save_md5_file, md5_sql) else: mw.writeFile(save_md5_file, md5_sql) if not os.path.exists(file) or import_sql: conn = mw.M(dbname).dbPos(getServerDir(), name) - csql = mw.readFile(getPluginDir() + '/conf/mysql.sql') - csql_list = csql.split(';') + csql_list = import_sql.split(';') for index in range(len(csql_list)): conn.execute(csql_list[index], ())