diff --git a/connect.py b/connect.py index 37a88f84c..61bace914 100755 --- a/connect.py +++ b/connect.py @@ -341,14 +341,14 @@ def connect(username, password, host, port, login_name): def remote_exec_cmd(ip, port, username, password, cmd): try: - time.sleep(3) + time.sleep(5) ssh = paramiko.SSHClient() ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) ssh.connect(ip, port, username, password, key_filename=USER_KEY_FILE, timeout=5) stdin, stdout, stderr = ssh.exec_command("bash -l -c '%s'" % cmd) out = stdout.readlines() err = stderr.readlines() - color_print('%s:', 'blue') + color_print('%s:' %ip, 'blue') for i in out: color_print(" " * 4 + i.strip(), 'green') for j in err: @@ -360,7 +360,7 @@ def remote_exec_cmd(ip, port, username, password, cmd): def multi_remote_exec_cmd(hosts, username, cmd): - pool = Pool(processes=3) + pool = Pool(processes=5) for host in hosts: username, password, ip, port = get_connect_item(username, host) pool.apply_async(remote_exec_cmd, (ip, port, username, password, cmd)) diff --git a/jasset/urls.py b/jasset/urls.py new file mode 100644 index 000000000..48c32db05 --- /dev/null +++ b/jasset/urls.py @@ -0,0 +1,8 @@ +# coding:utf-8 +from django.conf.urls import patterns, include, url +from jasset.views import * + +urlpatterns = patterns('', + url(r'^$', index), + url(r'jadd', jadd), +) \ No newline at end of file diff --git a/jasset/views.py b/jasset/views.py index 91ea44a21..820b4b315 100644 --- a/jasset/views.py +++ b/jasset/views.py @@ -1,3 +1,16 @@ +#coding:utf-8 from django.shortcuts import render +from django.http import HttpResponse +from django.template import RequestContext +from django.shortcuts import render_to_response +from django.http import HttpResponseRedirect -# Create your views here. + +def index(request): + return render_to_response('jasset/jasset.html',) + + +def jadd(request): + if request.method == 'POST': + pass + return render_to_response('jasset/jadd.html',) \ No newline at end of file diff --git a/jumpserver/urls.py b/jumpserver/urls.py index d570d92ff..5ee408303 100644 --- a/jumpserver/urls.py +++ b/jumpserver/urls.py @@ -1,6 +1,5 @@ from django.conf.urls import patterns, include, url -from django.contrib import admin -from jumpserver import views + urlpatterns = patterns('', # Examples: @@ -8,4 +7,5 @@ urlpatterns = patterns('', # url(r'^blog/', include('blog.urls')), (r'^user/', include('juser.urls')), + url(r'^jasset/', include('jasset.urls')), ) diff --git a/templates/base.html b/templates/base.html index e793c1d1c..1b76e9777 100644 --- a/templates/base.html +++ b/templates/base.html @@ -21,7 +21,7 @@
{% include 'nav_bar_header.html' %}
- {{ content }} + {% block content %}{% endblock %} {% include 'footer.html' %} diff --git a/templates/jasset/jadd.html b/templates/jasset/jadd.html new file mode 100644 index 000000000..81f4fa931 --- /dev/null +++ b/templates/jasset/jadd.html @@ -0,0 +1,113 @@ +{% extends 'base.html' %} +{% block content %} +

添加主机

+
+
+
+
+
请在以下填写主机详细信息
+
+
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+
+
+ + +
+ + +
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+
+ + + +
+
+
+
+ +
+
+
+
+ +
+
+
+ + +
+
+
+
+
+
+
+ + + + + + +{% endblock %} \ No newline at end of file diff --git a/templates/jasset/jasset.html b/templates/jasset/jasset.html new file mode 100644 index 000000000..e92bd8edd --- /dev/null +++ b/templates/jasset/jasset.html @@ -0,0 +1,10 @@ + + + + + 资产管理 + + +

welocome!

+ + \ No newline at end of file diff --git a/templates/nav.html b/templates/nav.html index 46a3a55b8..2a84fd274 100644 --- a/templates/nav.html +++ b/templates/nav.html @@ -15,35 +15,35 @@
  • 用户管理
  • 资产管理
  • 授权管理
  • 日志审计