diff --git a/plugins/mysql-apt/index.py b/plugins/mysql-apt/index.py index 187098fe3..7a4c242dd 100755 --- a/plugins/mysql-apt/index.py +++ b/plugins/mysql-apt/index.py @@ -3523,9 +3523,9 @@ def uninstallPreInspection(version): if mw.isDebugMode(): return 'ok' - import plugins_api - plugins_api.plugins_api().removeIndex(getPluginName(), version) - + from utils.plugin import plugin as MwPlugin + MwPlugin.instance().removeIndex(getPluginName(), version) + return "请手动删除MySQL[{}]
rm -rf {}".format(version, getServerDir()) if __name__ == "__main__": diff --git a/plugins/mysql-yum/index.py b/plugins/mysql-yum/index.py index b24ca820e..4581ebd86 100755 --- a/plugins/mysql-yum/index.py +++ b/plugins/mysql-yum/index.py @@ -16,11 +16,11 @@ if os.path.exists(web_dir): import core.mw as mw -if mw.isAppleSystem(): - cmd = 'ls /usr/local/lib/ | grep python | cut -d \\ -f 1 | awk \'END {print}\'' - info = mw.execShell(cmd) - p = "/usr/local/lib/" + info[0].strip() + "/site-packages" - sys.path.append(p) +# if mw.isAppleSystem(): +# cmd = 'ls /usr/local/lib/ | grep python | cut -d \\ -f 1 | awk \'END {print}\'' +# info = mw.execShell(cmd) +# p = "/usr/local/lib/" + info[0].strip() + "/site-packages" +# sys.path.append(p) app_debug = False @@ -3487,8 +3487,8 @@ def uninstallPreInspection(version): if mw.isDebugMode(): return 'ok' - import plugins_api - plugins_api.plugins_api().removeIndex(getPluginName(), version) + from utils.plugin import plugin as MwPlugin + MwPlugin.instance().removeIndex(getPluginName(), version) return "请手动删除MySQL[{}]
rm -rf {}".format(version, getServerDir()) diff --git a/plugins/mysql-yum/index_mysql_yum.py b/plugins/mysql-yum/index_mysql_yum.py index 79e7bbf83..6c10d29f0 100644 --- a/plugins/mysql-yum/index_mysql_yum.py +++ b/plugins/mysql-yum/index_mysql_yum.py @@ -15,13 +15,6 @@ if os.path.exists(web_dir): import core.mw as mw -if mw.isAppleSystem(): - cmd = 'ls /usr/local/lib/ | grep python | cut -d \\ -f 1 | awk \'END {print}\'' - info = mw.execShell(cmd) - p = "/usr/local/lib/" + info[0].strip() + "/site-packages" - sys.path.append(p) - - app_debug = False if mw.isAppleSystem(): app_debug = True diff --git a/plugins/mysql/index.py b/plugins/mysql/index.py index 3b501cf7a..0cdc59f5c 100755 --- a/plugins/mysql/index.py +++ b/plugins/mysql/index.py @@ -3774,8 +3774,9 @@ def uninstallPreInspection(version): if mw.isDebugMode(): return 'ok' - import plugins_api - plugins_api.plugins_api().removeIndex(getPluginName(), version) + + from utils.plugin import plugin as MwPlugin + MwPlugin.instance().removeIndex(getPluginName(), version) return "请手动删除MySQL[{}]
rm -rf {}".format(version, getServerDir())