Merge pull request #644 from midoks/dev

更改/合并mysql快速安装方式
midoks · Dec 17, 2024 · 3acbad4 · 3acbad4
2 parents c17df78 + 1973f6a
commit 3acbad4
Show file tree

Hide file tree

Showing 81 changed files with 758 additions and 10,362 deletions.
diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
@@ -84,7 +84,7 @@ def get_options(self, sid=None):
         result['host'] = '127.0.0.1'
         result['username'] = 'root'
 
-        if sid in ['mysql', 'mysql-apt', 'mysql-yum']:
+        if sid in ['mysql', 'mysql-apt', 'mysql-yum', 'mysql-community']:
             my_cnf_path = "{}/{}/etc/my.cnf".format(mw.getServerDir(),sid)
             if not os.path.exists(my_cnf_path):
                 return False
@@ -132,6 +132,10 @@ def getServerList(self):
         local_mysql_yum = "{}/mysql-yum/etc/my.cnf".format(mw.getServerDir())
         if os.path.exists(local_mysql_yum):
             data.append({'name':'本地服务器[yum]', 'val':'mysql-yum'})
+
+        local_mysql_yum = "{}/mysql-community/etc/my.cnf".format(mw.getServerDir())
+        if os.path.exists(local_mysql_yum):
+            data.append({'name':'本地服务器[community]', 'val':'mysql-community'})
         return mw.returnData(True, 'ok', data)
 
 @singleton

diff --git a/plugins/mysql-apt/index_mysql_apt.py b/plugins/mysql-apt/index_mysql_apt.py
diff --git a/plugins/mysql-apt/install.sh b/plugins/mysql-apt/install.sh