diff --git a/class/core/public.py b/class/core/public.py index de88ac5b6..825cff733 100755 --- a/class/core/public.py +++ b/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) diff --git a/plugins/csvn/index.py b/plugins/csvn/index.py index 72c1c9632..f86bd2c5b 100755 --- a/plugins/csvn/index.py +++ b/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) diff --git a/plugins/csvn/js/csvn.js b/plugins/csvn/js/csvn.js index c72296b94..94b83bea7 100755 --- a/plugins/csvn/js/csvn.js +++ b/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); + var rdata = $.parseJSON(data.data); + // console.log(rdata); + + content = '
'; + content += '
'; + + content += '
'; + content += ''; + content += ''; + content += ''; + content += ''; + + content += ''; + + ulist = rdata.data; + for (i in ulist){ + content += ''; + } + + content += ''; + content += '
用户名操作
'+ulist[i]+''+ + '删除|' + + '改密
'; + + page = ''; + + content += page; + + $(".soft-man-con").html(content); + + },'json'); } \ No newline at end of file diff --git a/static/app/public.js b/static/app/public.js index 8978c13a9..98790e203 100755 --- a/static/app/public.js +++ b/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"; diff --git a/static/app/soft.js b/static/app/soft.js index dabac2311..c66db491a 100755 --- a/static/app/soft.js +++ b/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 += '
' + softboxcon += '
'; } $("#indexsoft").append(softboxcon); } diff --git a/static/css/site.css b/static/css/site.css index 2a09263c0..fbdc167c7 100755 --- a/static/css/site.css +++ b/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;