From e2ec115c76da369ae6f6946257da829fd5cce19e Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Thu, 3 Jan 2019 11:03:46 +0800 Subject: [PATCH] update --- plugins/pureftp/index.py | 31 +++++++++++++ plugins/pureftp/js/ftp.js | 92 +++++++++++++++++++++++++++++++------- route/static/app/public.js | 2 +- 3 files changed, 108 insertions(+), 17 deletions(-) diff --git a/plugins/pureftp/index.py b/plugins/pureftp/index.py index 1526db36e..868870354 100755 --- a/plugins/pureftp/index.py +++ b/plugins/pureftp/index.py @@ -172,6 +172,33 @@ def initdUinstall(): os.remove(initd_bin) return 'ok' + +def getFtpPort(): + import re + try: + file = getServerDir() + '/etc/pure-ftpd.conf' + conf = public.readFile(file) + rep = "\n#?\s*Bind\s+[0-9]+\.[0-9]+\.[0-9]+\.+[0-9]+,([0-9]+)" + port = re.search(rep, conf).groups()[0] + except: + port = '21' + return port + + +def getFtpList(): + + data = {} + info = {} + info['ip'] = public.getLocalIp() + info['port'] = getFtpPort() + data['info'] = info + + return public.getJson(data) + + +def addFtp(): + return 'o' + if __name__ == "__main__": func = sys.argv[1] if func == 'status': @@ -192,5 +219,9 @@ if __name__ == "__main__": print initdUinstall() elif func == 'conf': print getConf() + elif func == 'get_ftp_list': + print getFtpList() + elif func == 'add_ftp': + print addFtp() else: print 'error' diff --git a/plugins/pureftp/js/ftp.js b/plugins/pureftp/js/ftp.js index a7d3dab3c..dda7b7acd 100755 --- a/plugins/pureftp/js/ftp.js +++ b/plugins/pureftp/js/ftp.js @@ -1,6 +1,67 @@ +function ftpPost(method,args,callback){ + var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 }); + $.post('/plugins/run', {name:'pureftp', func:method, args:JSON.stringify(args)}, function(data) { + layer.close(loadT); + if (!data.status){ + layer.msg(data.msg,{icon:0,time:2000,shade: [0.3, '#000']}); + return; + } + + if(typeof(callback) == 'function'){ + callback(data); + } + },'json'); +} function ftpList(page, search){ - + var _data = {}; + if (typeof(page) =='undefined'){ + var page = 1; + } + + _data['page'] = page; + _data['page_size'] = 10; + if(typeof(search) != 'undefined'){ + _data['search'] = search; + } + + ftpPost('get_ftp_list', _data, function(data){ + + var rdata = $.parseJSON(data.data); + content = '

当前FTP地址为：ftp://'+rdata['info']['ip']+':'+rdata['info']['port']+'

'; + content += '
'; + content += '
'; + + content += '
'; + content += ''; + content += ''; + content += ''; + content += ''; + content += ''; + content += ''; + content += ''; + content += ''; + + content += ''; + + ulist = rdata.data; + for (i in ulist){ + content += ''; + } + + content += ''; + content += '
用户名密码状态根目录备注操作(添加|修改FTP端口)
'+ulist[i]+''+ + '删除 | ' + + '改密
'; + + page = ''; + + content += page; + + $(".soft-man-con").html(content); + }); } @@ -66,13 +127,14 @@ function getFtp(page, search) { *添加FTP帐户 * @param {Number} type 添加类型 */ -function ftpAdd(type) { +function addFtp(type) { if (type == 1) { var loadT = layer.load({ shade: true, shadeClose: false }); var data = $("#ftpAdd").serialize(); + console.log(data); $.post('/ftp?action=AddUser', data, function(rdata) { if (rdata.status) { getFtp(1); @@ -95,41 +157,39 @@ function ftpAdd(type) { type: 1, skin: 'demo-class', area: '500px', - title: lan.ftp.add_title, + title: '添加FTP帐户', closeBtn: 2, shift: 5, shadeClose: false, content: "
\
\ - "+lan.ftp.add_user+"\ + 用户名\
\
\
\ - "+lan.ftp.add_pass+"\ -
\ + 密码\ +
\
\
\ - "+lan.ftp.add_path+"\ -

"+lan.ftp.add_path_ps+"

\ + 根目录\ +

"+lan.ftp.add_path_ps+"

\
\ \
\ - \ - \ + \ + \
\
" }); - - $("#ftpUser").keyup(function() - { + $("#ftpUser").keyup(function(){ + console.log('dd'); var ftpName = $(this).val(); - if($("#inputPath").val().substr(0,11) == '/www/wwwroo' ) - { + if( $("#inputPath").val().substr(0,11) == '/www/wwwroo' ){ $("#inputPath").val('/www/wwwroot/'+ftpName); } }); diff --git a/route/static/app/public.js b/route/static/app/public.js index 7b310b330..9977aba71 100755 --- a/route/static/app/public.js +++ b/route/static/app/public.js @@ -84,7 +84,7 @@ function syncPost(path, args){ } function repeatPwd(a) { - $("#MyPassword").val(RandomStrPwd(a)) + $("#MyPassword").val(randomStrPwd(a)) }