update

class/core/public.py

@@ -335,27 +335,6 @@ def getLastLine(inputfile, lineNum):
         return getMsg('TASK_SLEEP')
 
 
-def serviceReload():
-    # 重载Web服务配置
-    if os.path.exists('/www/server/nginx/sbin/nginx'):
-        result = execShell('/etc/init.d/nginx reload')
-        if result[1].find('nginx.pid') != -1:
-            execShell('pkill -9 nginx && sleep 1')
-            execShell('/etc/init.d/nginx start')
-    else:
-        result = execShell('/etc/init.d/httpd reload')
-    return result
-
-
-def phpReload(version):
-    # 重载PHP配置
-    import os
-    if os.path.exists('/www/server/php/' + version + '/libphp5.so'):
-        execShell('/etc/init.d/httpd reload')
-    else:
-        execShell('/etc/init.d/php-fpm-' + version + ' reload')
-
-
 def downloadFile(url, filename):
     import urllib
     urllib.urlretrieve(url, filename=filename, reporthook=downloadHook)
@@ -367,7 +346,7 @@ def downloadHook(count, blockSize, totalSize):
     print '%02d%%' % (100.0 * count * blockSize / totalSize)
 
 
-def GetLocalIp():
+def getLocalIp():
     # 取本地外网IP
     try:
         import re
@@ -402,23 +381,6 @@ def inArray(arrays, searchStr):
     return False
 
 
-def checkWebConfig():
-    # 检查Web服务器配置文件是否有错误
-    if get_webserver() == 'nginx':
-        result = ExecShell(
-            "ulimit -n 10240 && /www/server/nginx/sbin/nginx -t -c /www/server/nginx/conf/nginx.conf")
-        searchStr = 'successful'
-    else:
-        result = ExecShell(
-            "ulimit -n 10240 && /www/server/apache/bin/apachectl -t")
-        searchStr = 'Syntax OK'
-
-    if result[1].find(searchStr) == -1:
-        WriteLog("TYPE_SOFT", 'CONF_CHECK_ERR', (result[1],))
-        return result[1]
-    return True
-
-
 def checkIp(ip):
     # 检查是否为IPv4地址
     import re
@@ -494,26 +456,6 @@ def hasPwd(password):
     return crypt.crypt(password, password)
 
 
-def get_url(timeout=0.5):
-    import json
-    try:
-        nodeFile = '/www/server/panel/data/node.json'
-        node_list = json.loads(readFile(nodeFile))
-        mnode = None
-        for node in node_list:
-            node['ping'] = get_timeout(
-                node['protocol'] + node['address'] + ':' + node['port'] + '/check.txt')
-            if not node['ping']:
-                continue
-            if not mnode:
-                mnode = node
-            if node['ping'] < mnode['ping']:
-                mnode = node
-        return mnode['protocol'] + mnode['address'] + ':' + mnode['port']
-    except:
-        return 'http://download.bt.cn'
-
-
 def get_timeout(url):
     start = time.time()
     result = httpGet(url)

plugins/csvn/index.py

@@ -175,10 +175,12 @@ def userList():
         tmp = auth_list[x].split(':')
         ulist.append(tmp[0])
 
+    data['list'] = public.getPage({'count': auth_list_sum, 'p': page})
     data['page'] = page
     data['page_size'] = page_size
     data['page_count'] = int(math.ceil(auth_list_sum / page_size))
     start = (page - 1) * page_size
+
     data['data'] = ulist[start:page_size]
     return public.getJson(data)
 

plugins/csvn/js/csvn.js

@@ -5,15 +5,47 @@ function csvnUserList(page) {
     var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
     _data = {};
     _data['page'] = page;
-    // _data['page_size'] = 10;
+    _data['page_size'] = 10;
     $.post('/plugins/run', {name:'csvn', func:'user_list', args:JSON.stringify(_data)}, function(data) {
-    	console.log(data);
     	layer.close(loadT);
+    	
     	if (!data.status){
     		layer.msg(data.msg,{icon:0,time:2000,shade: [0.3, '#000']});
     		return;
     	}
 
         var rdata = $.parseJSON(data.data);
+        // console.log(rdata);
+
+        content = '<div class="finduser"><input class="bt-input-text mr5" type="text" placeholder="查找用户名" id="disable_function_val" style="height: 28px; border-radius: 3px;width: 410px;">';
+        content += '<button class="btn btn-success btn-sm">查找</button></div>';
+
+        content += '<div class="divtable" style="margin-top:0px;"><table class="table table-hover" width="100%" cellspacing="0" cellpadding="0" border="0">';
+        content += '<thead><tr>';
+        content += '<th>用户名</th>';
+        content += '<th>操作</th>';
+        content += '</tr></thead>';
+
+        content += '<tbody>';
+
+        ulist = rdata.data;
+        for (i in ulist){
+            content += '<tr><td>'+ulist[i]+'</td><td>'+
+                '<a class="btlink" onclick="csvnDelUser(\''+ulist[i]+'\')">删除</a>|' +
+                '<a class="btlink" onclick="csvnDelUser(\''+ulist[i]+'\')">改密</a></td></tr>';
+        }
+
+        content += '</tbody>';
+        content += '</table></div>';
+
+        page = '<div class="dataTables_paginate paging_bootstrap pagination" style="margin-top:0px;"><ul id="softPage" class="page"><div>';
+        page += rdata.list;
+        page += '</div></ul></div>';
+
+        content += page;
+
+        $(".soft-man-con").html(content);
+
+    	
     },'json');
 }

static/app/public.js

@@ -5,6 +5,12 @@ $(document).ready(function() {
 	});
 });
 
+//转换单们到MB
+function toSizeM(byteLen) {
+    var a = parseInt(byteLen) / 1024 / 1024;
+    return a || 0;
+}
+
 function randomStrPwd(b) {
 	b = b || 32;
 	var c = "AaBbCcDdEeFfGHhiJjKkLMmNnPpRSrTsWtXwYxZyz2345678";

static/app/soft.js

@@ -1,8 +1,4 @@
-//转换单们到MB
+
-function toSizeM(byteLen) {
-    var a = parseInt(byteLen) / 1024 / 1024;
-    return a || 0;
-}
 
 //重置插件弹出框宽度
 function resetPluginWinWidth(width){
@@ -361,7 +357,7 @@ function indexListHtml(callback){
         if (softboxlen <= softboxsum) {
             for (var i = 0; i < softboxsum - softboxlen; i++) {
                 // softboxn += 1000;
-                softboxcon += '<div class="col-sm-3 col-md-3 col-lg-3 no-bg" data-id="'  + '"></div>'
+                softboxcon += '<div class="col-sm-3 col-md-3 col-lg-3 no-bg" data-id=""></div>';
             }
             $("#indexsoft").append(softboxcon);
         }

static/css/site.css

@@ -1051,7 +1051,7 @@ html .menu .menu_exit:hover {
     border-bottom: 1px solid #e6e6e6;
     color: #666;
     font-weight: normal;
-    padding: 8px
+    padding: 8px;
 }
 .divtable .table_toolbar{
     left: 8px;