Merge pull request #586 from midoks/dev

0.17.1

.gitignore

@@ -115,7 +115,22 @@ tmp/*
 *.swp
 *.pem
 *.zip
+debug.out
+mdioks.session-journal
+*.session
+
 logs/*
+
+ssl/local
+ssl/nginx
+ssl/choose.pl
+
+scripts/init.d/mw
+scripts/mdserver-web
+
+data/api_login.txt
+data/sessions
+
 data/*.db
 data/iplist.txt
 data/json/index.json
@@ -131,12 +146,6 @@ data/debug.pl
 data/default_site.pl
 data/ssl.pl
 
-scripts/init.d/mw
-scripts/mdserver-web
-
-data/api_login.txt
-data/sessions
-
 data/port.pl
 data/ipv6.pl
 data/restart.pl
@@ -153,10 +162,6 @@ data/bind_domain.pl
 data/unauthorized_status.pl
 data/auth_secret.pl
 
-ssl/local
-ssl/nginx
-ssl/choose.pl
-
 plugins/vip_*
 plugins/own_*
 plugins/my_*
@@ -175,8 +180,3 @@ plugins/frp
 plugins/file_search
 plugins/proxysql
 plugins/tidb
-debug.out
-
-
-mdioks.session-journal
-*.session

README.md

@@ -110,9 +110,9 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443:
 ```
 
 
-### 版本更新 0.17.0
+### 版本更新 0.17.1
 
-- 面板SSL调整。
+- 任务管理器-插件。
 
 ### JSDelivr安装地址
 

class/core/config_api.py

@@ -28,7 +28,7 @@
 
 class config_api:
 
-    __version = '0.17.0'
+    __version = '0.17.1'
     __api_addr = 'data/api.json'
 
     # 统一默认配置文件

class/core/mw.py

@@ -1466,7 +1466,7 @@ def makeConf():
     file = getRunDir() + '/data/json/config.json'
     if not os.path.exists(file):
         c = {}
-        c['title'] = '老子面板'
+        c['title'] = '后羿面板'
         c['home'] = 'http://github/midoks/mdserver-web'
         c['recycle_bin'] = True
         c['template'] = 'default'
@@ -2110,6 +2110,15 @@ def notifyMessage(msg, stype='common', trigger_time=300, is_write_log=True):
 ##################### notify  end #########################################
 
 
+def getGlibcVersion():
+    try:
+        cmd_result = execShell("ldd --version")[0]
+        if not cmd_result: return ''
+        glibc_version = cmd_result.split("\n")[0].split()[-1]
+    except:
+        return ''
+    return glibc_version
+
 ##################### ssh  start #########################################
 def getSshDir():
     if isAppleSystem():

plugins/mysql/js/mysql.js

@@ -2936,10 +2936,10 @@ function masterOrSlaveConf(version=''){
                 getMasterDbList();
             }
 
-            if (rdata.slave_status){
+            // if (rdata.slave_status){
                 getAsyncMasterDbList();
                 getAsyncDataList()
-            }
+            // }
         });
     }
     getMasterStatus();

plugins/php/js/php.js

@@ -26,7 +26,7 @@ function phpPost(method, version, args,callback){
     },'json'); 
 }
 
-function phpPostCallbak(method, version, args,callback){
+function phpPostCallback(method, version, args,callback){
     var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
 
     var req_data = {};
@@ -715,7 +715,7 @@ function getPHPInfo_old(version) {
 }
 
 function getPHPInfo(version) {
-    phpPostCallbak('get_php_info', version, {}, function(data){
+    phpPostCallback('get_php_info', version, {}, function(data){
         if (!data.status){
             layer.msg(rdata.msg, { icon: 2 });
             return;
@@ -739,7 +739,7 @@ function phpLibConfig(version){
         // var rdata = $.parseJSON(rdata.data);
     // });
 
-    phpPostCallbak('get_lib_conf', version, {}, function(rdata){
+    phpPostCallback('get_lib_conf', version, {}, function(rdata){
         var rdata = rdata.data;
 
         if (!rdata.status){