diff --git a/plugins/csvn/index.html b/plugins/csvn/index.html index 1bdc5229c..089507415 100755 --- a/plugins/csvn/index.html +++ b/plugins/csvn/index.html @@ -3,6 +3,7 @@

服务

自启动

+

用户管理

diff --git a/plugins/csvn/index.py b/plugins/csvn/index.py index d576b516c..72c1c9632 100755 --- a/plugins/csvn/index.py +++ b/plugins/csvn/index.py @@ -40,9 +40,17 @@ def getInitDFile(): def getArgs(): args = sys.argv[2:] tmp = {} - for i in range(len(args)): - t = args[i].split(':') + args_len = len(args) + + if args_len == 1: + t = args[0].strip('{').strip('}') + t = t.split(':') tmp[t[0]] = t[1] + elif args_len > 1: + for i in range(len(args)): + t = args[i].split(':') + tmp[t[0]] = t[1] + return tmp @@ -142,6 +150,38 @@ def initdUinstall(): return 'ok' +def userList(): + import math + args = getArgs() + + page = 1 + page_size = 10 + if 'page' in args: + page = int(args['page']) + + if 'page_size' in args: + page_size = int(args['page_size']) + + svn_auth_file = getServerDir() + '/data/conf/svn_auth_file' + if not os.path.exists(svn_auth_file): + return public.getJson([]) + + auth = public.readFile(svn_auth_file) + auth_list = auth.split("\n") + auth_list_sum = len(auth_list) + ulist = [] + data = {} + for x in range(auth_list_sum): + tmp = auth_list[x].split(':') + ulist.append(tmp[0]) + + 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) + if __name__ == "__main__": func = sys.argv[1] if func == 'status': @@ -166,5 +206,7 @@ if __name__ == "__main__": print getConf() elif func == 'save_conf': print saveConf() + elif func == 'user_list': + print userList() else: print 'fail' diff --git a/plugins/csvn/js/csvn.js b/plugins/csvn/js/csvn.js index 005d56a32..c72296b94 100755 --- a/plugins/csvn/js/csvn.js +++ b/plugins/csvn/js/csvn.js @@ -1 +1,19 @@ -pluginService('csvn'); \ No newline at end of file +pluginService('csvn'); + + +function csvnUserList(page) { + var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 }); + _data = {}; + _data['page'] = page; + // _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); + },'json'); +} \ No newline at end of file diff --git a/plugins/memcached/index.py b/plugins/memcached/index.py index 6c0663fae..522c0ad61 100755 --- a/plugins/memcached/index.py +++ b/plugins/memcached/index.py @@ -151,6 +151,7 @@ def saveConf(): confFile = getConf() try: args = getArgs() + print args content = public.readFile(confFile) content = re.sub('IP=.+', 'IP=' + args['ip'], content) content = re.sub('PORT=\d+', 'PORT=' + args['port'], content)