wq

class/core/public.py

@@ -18,13 +18,11 @@ from random import Random
 
 
 def getRunDir():
-    # 运行目录
     return os.getcwd()
 
 
-def getBinDir():
-    # 安装软件
-    pass
+def getRootDir():
+    return os.path.dirname(os.path.dirname(getRunDir()))
 
 
 def M(table):

route/plugins.py

@@ -10,7 +10,7 @@ import sys
 import os
 import json
 
-sys.path.append("class/")
+sys.path.append("class/core")
 import public
 
 
@@ -130,7 +130,7 @@ def installed():
     infoJsonPos = __plugin_name + '/' + name + '/' + 'info.json'
 
     if not os.path.exists(infoJsonPos):
-        return public.retJson(-1, "配置数据(info.json)不存在!", ())
+        return public.returnJson(-1, "配置数据(info.json)不存在!", ())
 
     pluginInfo = json.loads(public.readFile(infoJsonPos))
 
@@ -139,26 +139,12 @@ def installed():
     print request.args
     return ''
 
-# 取分页
-
-
-def get_page(data, args):
-    # 包含分页类
-    import page
-    # 实例化分页类
-    page = page.Page()
-    info = {}
-    info['count'] = len(data)
-    info['row'] = __row_num
-    info['p'] = 1
-    if hasattr(args, 'p'):
-        info['p'] = int(get['p'])
-    info['uri'] = {}
-    info['return_js'] = ''
-    if hasattr(args, 'tojs'):
-        info['return_js'] = args.tojs
-
-    # 获取分页数据
-    result = {}
-    result['page'] = page.GetPage(info)
-    return result
+
+@plugins.route('/check_installed', methods=['POST'])
+def checkInstalled():
+    checks = ['nginx', 'apache', 'php', 'mysql']
+    for name in checks:
+        filename = public.getRootDir() + "/server/" + name
+        if os.path.exists(filename):
+            return "True"
+    return "False"

route/system.py

@@ -145,8 +145,13 @@ def diskinfo():
     return jsonify(diskInfo)
 
 
-@system.route("/systemtotal")
-def systemtotal():
+@system.route("/update_panel")
+def updatePanel():
+    return public.returnJson(False, "12")
+
+
+@system.route("/system_total")
+def systemTotal():
      # 取系统统计信息
     data = GetMemInfo()
     cpu = GetCpuInfo(1)

static/js/index.js

@@ -1,5 +1,5 @@
 //检测是否安装环境
-$.post("/ajax?action=CheckInstalled", function(rdata) {
+$.post("/plugins/check_installed", function(rdata) {
     if (rdata == false) {
         RecInstall();
     }
@@ -180,7 +180,7 @@ function ClearSystem() {
 }
 
 function getInfo() {
-    $.get("/system?action=GetSystemTotal", function(info) {
+    $.get("/system/system_total", function(info) {
         setCookie("memRealUsed", parseInt((info.memRealUsed)));
         $("#memory").html(parseInt((info.memRealUsed)) + '/' + info.memTotal + ' (MB)');
         setCookie("mem-before", $("#memory").text());
@@ -205,7 +205,7 @@ function getInfo() {
             $("#messageError").append('<p><span class="glyphicon glyphicon-alert" style="color: #ff4040; margin-right: 10px;"></span>' + lan.index.user_warning + '<span class="c7 mr5" title="此安全问题不可忽略，请尽快处理" style="cursor:no-drop"> [不可忽略]</span><a class="btlink" href="javascript:setUserName();"> [立即修改]</a></p>')
         }
         setImg();
-    });
+    },'json');
 }
 
 
@@ -450,25 +450,25 @@ function setImg() {
 setImg();
 
 //检查更新
-setTimeout(function() {
-    $.get('/ajax?action=UpdatePanel', function(rdata) {
-        if (rdata.status == false) return;
-        if (rdata.version != undefined) {
-            $("#toUpdate").html('<a class="btlink" href="javascript:updateMsg();">' + lan.index.update_go + '</a>');
-            return;
-        }
-        $.get('/system?action=ReWeb', function() {});
-        layer.msg(rdata.msg, { icon: 1 });
-        setTimeout(function() {
-            window.location.reload();
-        }, 3000);
-    }).error(function() {
-        $.get('/system?action=ReWeb', function() {});
-        setTimeout(function() {
-            window.location.reload();
-        }, 3000);
-    });
-}, 3000);
+// setTimeout(function() {
+//     $.get('/system/update_panel', function(rdata) {
+//         if (rdata.status == false) return;
+//         if (rdata.version != undefined) {
+//             $("#toUpdate").html('<a class="btlink" href="javascript:updateMsg();">' + lan.index.update_go + '</a>');
+//             return;
+//         }
+//         $.get('/system?action=ReWeb', function() {});
+//         layer.msg(rdata.msg, { icon: 1 });
+//         setTimeout(function() {
+//             window.location.reload();
+//         }, 3000);
+//     }).error(function() {
+//         $.get('/system?action=ReWeb', function() {});
+//         setTimeout(function() {
+//             window.location.reload();
+//         }, 3000);
+//     },'json');
+// }, 3000);
 
 
 //检查更新
@@ -603,20 +603,20 @@ function WSafeRestart() {
             $.post('/system?action=RestartServer', '', function(rdata) {
                 $(".SafeRestartCode").html("<p class='c9'>" + lan.index.reboot_msg_1 + "</p><p class='c9'>" + lan.index.reboot_msg_2 + "</p><p class='c9'>" + lan.index.reboot_msg_3 + "</p><p>" + lan.index.reboot_msg_4 + "...</p>");
                 var sEver = setInterval(function() {
-                    $.get("/system?action=GetSystemTotal", function(info) {
+                    $.get("/system/system_total", function(info) {
                         clearInterval(sEver);
                         $(".SafeRestartCode").html("<p class='c9'>" + lan.index.reboot_msg_1 + "</p><p class='c9'>" + lan.index.reboot_msg_2 + "</p><p class='c9'>" + lan.index.reboot_msg_3 + "</p><p class='c9'>" + lan.index.reboot_msg_4 + "</p><p>" + lan.index.reboot_msg_5 + "</p>");
                         setTimeout(function() {
                             layer.closeAll();
                         }, 3000);
-                    }).error(function() {
+                    },'json').error(function() {
 
                     });
                 }, 3000);
             }).error(function() {
                 $(".SafeRestartCode").html("<p class='c9'>" + lan.index.reboot_msg_1 + "</p><p class='c9'>" + lan.index.reboot_msg_2 + "</p><p class='c9'>" + lan.index.reboot_msg_3 + "</p><p>" + lan.index.reboot_msg_4 + "...</p>");
                 var sEver = setInterval(function() {
-                    $.get("/system?action=GetSystemTotal", function(info) {
+                    $.get("/system/system_total", function(info) {
                         clearInterval(sEver);
                         $(".SafeRestartCode").html("<p class='c9'>" + lan.index.reboot_msg_1 + "</p><p class='c9'>" + lan.index.reboot_msg_2 + "</p><p class='c9'>" + lan.index.reboot_msg_3 + "</p><p class='c9'>" + lan.index.reboot_msg_4 + "</p><p>" + lan.index.reboot_msg_5 + "</p>");
                         setTimeout(function() {
@@ -624,7 +624,7 @@ function WSafeRestart() {
                             window.location.reload();
                         }, 3000);
 
-                    }).error(function() {
+                    },'json').error(function() {
 
                     });
                 }, 3000);
@@ -635,19 +635,19 @@ function WSafeRestart() {
 }
 
 function reWeb() {
-    layer.confirm(lan.index.panel_reboot_msg, { title: lan.index.panel_reboot_title, closeBtn: 2, icon: 3 }, function() {
-        var loadT = layer.msg(lan.index.panel_reboot_to, { icon: 16, time: 0, shade: [0.3, '#000'] });
-        $.get('/system?action=ReWeb', function(rdata) {
-            layer.close(loadT);
-            layer.msg(rdata.msg, { icon: 5 });
-        }).error(function() {
-            layer.close(loadT);
-            layer.msg(lan.index.panel_reboot_ok, { icon: 1 });
-            setTimeout(function() {
-                window.location.reload();
-            }, 3000)
-        });
-    });
+    // layer.confirm(lan.index.panel_reboot_msg, { title: lan.index.panel_reboot_title, closeBtn: 2, icon: 3 }, function() {
+    //     var loadT = layer.msg(lan.index.panel_reboot_to, { icon: 16, time: 0, shade: [0.3, '#000'] });
+    //     $.get('/system?action=ReWeb', function(rdata) {
+    //         layer.close(loadT);
+    //         layer.msg(rdata.msg, { icon: 5 });
+    //     }).error(function() {
+    //         layer.close(loadT);
+    //         layer.msg(lan.index.panel_reboot_ok, { icon: 1 });
+    //         setTimeout(function() {
+    //             window.location.reload();
+    //         }, 3000)
+    //     });
+    // });
 }
 
 

templates/default/index.html

@@ -6,7 +6,7 @@
                 <a class="plr10 c4" href="/">首页</a>/<span class="plr10 c4">服务器状态</span>
             </div>
             <span class="pull-right f12 c6" style="line-height:42px; margin-right:15px">
-                    免费版 <span id="btversion" class="mr5" onclick="openLog()">0.0.1</span>
+                    版本信息 <span id="btversion" class="mr5" onclick="openLog()">0.0.1</span>
             <span id="toUpdate"><a class="btlink" href="javascript:checkUpdate();">检查更新</a></span>
             </span>
         </div>
@@ -146,13 +146,13 @@
 setCookie('serverType', '$web.ctx.session.webserver');
 var serverType = getCookie('serverType');
 </script>
-<script type="text/javascript" src="/static/js/echarts.min.js"></script>
-<script type="text/javascript" src="/static/js/site.js?date=20180523"></script>
-<script type="text/javascript" src="/static/js/ftp.js?date=20180307"></script>
-<script type="text/javascript" src="/static/js/data.js?date=20180307"></script>
-<script type="text/javascript" src="/static/js/jquery.dragsort-0.5.2.min.js"></script>
-<script type="text/javascript" src="/static/js/soft.js?date=20180523"></script>
-<script type="text/javascript" src="/static/js/index.js?date=20180523"></script>
+<script type="text/javascript" src="/static/js/echarts.min.js?v={{config.version}}"></script>
+<script type="text/javascript" src="/static/js/site.js?v={{config.version}}"></script>
+<script type="text/javascript" src="/static/js/ftp.js?v={{config.version}}"></script>
+<script type="text/javascript" src="/static/js/data.js?v={{config.version}}"></script>
+<script type="text/javascript" src="/static/js/jquery.dragsort-0.5.2.min.js?v={{config.version}}"></script>
+<script type="text/javascript" src="/static/js/soft.js?v={{config.version}}"></script>
+<script type="text/javascript" src="/static/js/index.js?v={{config.version}}"></script>
 <script type="text/javascript">
 setTimeout(function() {
     GetDiskInfo();

templates/default/layout.html

@@ -48,7 +48,7 @@
             <script src="/static/js/clipboard.min.js?v={{config.version}}"></script>
             <script src="/static/js/public.js?v={{config.version}}"></script>
             {% block content %}{% endblock %}
-            <div class="footer bgw">mdserver-web &copy;2018-～ 面板 (github.com/midoks/mdserver-web)<a style="margin-left:20px;color:#20a53a;" href="//github.com/midoks/mdserver-web" target="_blank">help</a><a style="margin-left:20px;color:#20a53a;" href="//github.com/midoks/mdserver-web" target="_blank">《使用手册》</a></div>
+            <div class="footer bgw">mdserver-web &copy;2018-∞ 面板 (github.com/midoks/mdserver-web)<a style="margin-left:20px;color:#20a53a;" href="//github.com/midoks/mdserver-web" target="_blank">help</a><a style="margin-left:20px;color:#20a53a;" href="//github.com/midoks/mdserver-web" target="_blank">《使用手册》</a></div>
         </div>
     </div>
     </div>