ver1.7.1 优化界面;修复客户端SSH连接部分BUG

leffss · Aug 29, 2019 · 52e16d9 · 52e16d9
1 parent afaec7e
commit 52e16d9
Show file tree

Hide file tree

Showing 87 changed files with 1,002 additions and 436 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/README.md b/README.md
@@ -38,34 +38,6 @@ sh start_docker.sh
 ![效果](https://github.com/leffss/devops/blob/master/screenshots/9.PNG?raw=true)
 ![效果](https://github.com/leffss/devops/blob/master/screenshots/10.PNG?raw=true)
 ![效果](https://github.com/leffss/devops/blob/master/screenshots/11.PNG?raw=true)
-![效果](https://github.com/leffss/devops/blob/master/screenshots/12.PNG?raw=true)
-![效果](https://github.com/leffss/devops/blob/master/screenshots/13.PNG?raw=true)
-![效果](https://github.com/leffss/devops/blob/master/screenshots/14.PNG?raw=true)
-![效果](https://github.com/leffss/devops/blob/master/screenshots/15.PNG?raw=true)
-![效果](https://github.com/leffss/devops/blob/master/screenshots/16.PNG?raw=true)
-![效果](https://github.com/leffss/devops/blob/master/screenshots/17.PNG?raw=true)
-![效果](https://github.com/leffss/devops/blob/master/screenshots/18.PNG?raw=true)
-![效果](https://github.com/leffss/devops/blob/master/screenshots/19.PNG?raw=true)
-![效果](https://github.com/leffss/devops/blob/master/screenshots/20.PNG?raw=true)
-![效果](https://github.com/leffss/devops/blob/master/screenshots/21.PNG?raw=true)
-![效果](https://github.com/leffss/devops/blob/master/screenshots/22.PNG?raw=true)
-![效果](https://github.com/leffss/devops/blob/master/screenshots/23.PNG?raw=true)
-![效果](https://github.com/leffss/devops/blob/master/screenshots/24.PNG?raw=true)
-![效果](https://github.com/leffss/devops/blob/master/screenshots/25.PNG?raw=true)
-![效果](https://github.com/leffss/devops/blob/master/screenshots/26.PNG?raw=true)
-![效果](https://github.com/leffss/devops/blob/master/screenshots/27.PNG?raw=true)
-![效果](https://github.com/leffss/devops/blob/master/screenshots/28.PNG?raw=true)
-![效果](https://github.com/leffss/devops/blob/master/screenshots/29.PNG?raw=true)
-![效果](https://github.com/leffss/devops/blob/master/screenshots/30.PNG?raw=true)
-![效果](https://github.com/leffss/devops/blob/master/screenshots/31.PNG?raw=true)
-![效果](https://github.com/leffss/devops/blob/master/screenshots/32.PNG?raw=true)
-![效果](https://github.com/leffss/devops/blob/master/screenshots/33.PNG?raw=true)
-![效果](https://github.com/leffss/devops/blob/master/screenshots/34.PNG?raw=true)
-![效果](https://github.com/leffss/devops/blob/master/screenshots/35.PNG?raw=true)
-![效果](https://github.com/leffss/devops/blob/master/screenshots/36.PNG?raw=true)
-![效果](https://github.com/leffss/devops/blob/master/screenshots/37.JPG?raw=true)
-![效果](https://github.com/leffss/devops/blob/master/screenshots/38.PNG?raw=true)
-![效果](https://github.com/leffss/devops/blob/master/screenshots/39.PNG?raw=true)
 
 
 # TODO LISTS

diff --git a/db.sqlite3 b/db.sqlite3
diff --git a/devops/__pycache__/settings.cpython-37.pyc b/devops/__pycache__/settings.cpython-37.pyc
diff --git a/devops/settings.py b/devops/settings.py
@@ -18,10 +18,6 @@
 if not os.path.isdir(TMP_DIR):
     os.makedirs(TMP_DIR)
 
-TERMINAL_LOGS = os.path.join(BASE_DIR, 'terminal_logs')
-if not os.path.isdir(TERMINAL_LOGS):
-    os.makedirs(TERMINAL_LOGS)
-
 MEDIA_ROOT = os.path.join(BASE_DIR, 'terminal_logs')
 if not os.path.isdir(MEDIA_ROOT):
     os.makedirs(MEDIA_ROOT)

diff --git a/screenshots/1.PNG b/screenshots/1.PNG
diff --git a/screenshots/10.PNG b/screenshots/10.PNG
diff --git a/screenshots/11.PNG b/screenshots/11.PNG
diff --git a/screenshots/12.PNG b/screenshots/12.PNG
diff --git a/screenshots/13.PNG b/screenshots/13.PNG
diff --git a/screenshots/14.PNG b/screenshots/14.PNG
diff --git a/screenshots/15.PNG b/screenshots/15.PNG
diff --git a/screenshots/16.PNG b/screenshots/16.PNG
diff --git a/screenshots/17.PNG b/screenshots/17.PNG
diff --git a/screenshots/18.PNG b/screenshots/18.PNG
diff --git a/screenshots/19.PNG b/screenshots/19.PNG
diff --git a/screenshots/2.PNG b/screenshots/2.PNG
diff --git a/screenshots/20.PNG b/screenshots/20.PNG
diff --git a/screenshots/21.PNG b/screenshots/21.PNG
diff --git a/screenshots/22.PNG b/screenshots/22.PNG
diff --git a/screenshots/23.PNG b/screenshots/23.PNG
diff --git a/screenshots/24.PNG b/screenshots/24.PNG
diff --git a/screenshots/25.PNG b/screenshots/25.PNG
diff --git a/screenshots/26.PNG b/screenshots/26.PNG
diff --git a/screenshots/27.PNG b/screenshots/27.PNG
diff --git a/screenshots/28.PNG b/screenshots/28.PNG
diff --git a/screenshots/29.PNG b/screenshots/29.PNG
diff --git a/screenshots/3.PNG b/screenshots/3.PNG
diff --git a/screenshots/30.PNG b/screenshots/30.PNG
diff --git a/screenshots/31.PNG b/screenshots/31.PNG
diff --git a/screenshots/32.PNG b/screenshots/32.PNG
diff --git a/screenshots/33.PNG b/screenshots/33.PNG
diff --git a/screenshots/34.PNG b/screenshots/34.PNG
diff --git a/screenshots/35.PNG b/screenshots/35.PNG
diff --git a/screenshots/36.PNG b/screenshots/36.PNG
diff --git a/screenshots/37.JPG b/screenshots/37.JPG
diff --git a/screenshots/38.PNG b/screenshots/38.PNG
diff --git a/screenshots/39.PNG b/screenshots/39.PNG
diff --git a/screenshots/4.PNG b/screenshots/4.PNG
diff --git a/screenshots/5.PNG b/screenshots/5.PNG
diff --git a/screenshots/6.PNG b/screenshots/6.PNG
diff --git a/screenshots/7.PNG b/screenshots/7.PNG
diff --git a/screenshots/8.PNG b/screenshots/8.PNG
diff --git a/screenshots/9.PNG b/screenshots/9.PNG
diff --git a/server/__pycache__/views.cpython-37.pyc b/server/__pycache__/views.cpython-37.pyc
diff --git a/server/views.py b/server/views.py
@@ -2,6 +2,7 @@
 from util.tool import login_required, admin_required
 from .models import RemoteUserBindHost, RemoteUser
 from user.models import User, Group
+from webssh.models import TerminalSession
 from django.db.models import Q
 # Create your views here.
 
@@ -11,6 +12,7 @@ def index(request):
     host_count = RemoteUserBindHost.objects.all().count()
     user_count = User.objects.all().count()
     group_count = Group.objects.all().count()
+    session_count = TerminalSession.objects.all().count()
     return render(request, 'server/index.html', locals())
 
 

diff --git a/templates/base.html b/templates/base.html
@@ -102,7 +102,7 @@ <h4 class="text-center mt-3">确定要退出吗？</h4>
 					<button type="button" class="btn btn-block btn-secondary btn-flat" data-iziModal-close>取消</button>
 				</div>
 				<div class="col-6 p-3">
-					<a href="{% url 'user:logout' %}"><button type="button" class="btn btn-block btn-success btn-flat">退出</button></a>
+					<a href="{% url 'user:logout' %}"><button type="button" class="btn btn-block btn-success btn-flat">确定</button></a>
 				</div>
 			</div>
 		</div>
@@ -233,20 +233,15 @@ <h4 class="text-center mt-3">确定要退出吗？</h4>
               </p>
             </a>
             <ul class="nav nav-treeview">
-              <li class="nav-item">
-                <a href="{% url 'server:hosts' %}" class="nav-link">
-                  <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;批量命令 - x</p>
-                </a>
-              </li>
               <li class="nav-item">
                 <a href="{% url 'webssh:hosts' %}" class="nav-link">
-                  <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;web终端</p>
+                  <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;终端登陆</p>
                 </a>
               </li>
 			  {% if request.session.issuperuser %}
               <li class="nav-item">
                 <a href="{% url 'webssh:sessions' %}" class="nav-link">
-                  <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;在线会话</p>
+                  <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;在线终端</p>
                 </a>
               </li>
 			  {% endif %}
@@ -266,15 +261,10 @@ <h4 class="text-center mt-3">确定要退出吗？</h4>
                 <a href="{% url 'user:logs' %}" class="nav-link">
                   <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;操作日志</p>
                 </a>
-              </li>
-			  <li class="nav-item">
-                <a href="{% url 'server:hosts' %}" class="nav-link">
-                  <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;批量命令日志 - x</p>
-                </a>
               </li>
               <li class="nav-item">
                 <a href="{% url 'webssh:logs' %}" class="nav-link">
-                  <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;web终端日志</p>
+                  <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;终端日志</p>
                 </a>
               </li>
             </ul>

diff --git a/templates/server/hosts.html b/templates/server/hosts.html
@@ -64,7 +64,18 @@ <h3 class="card-title">
 				  <td>{{ host.get_env_display }}</td>
 				  <td>{{ host.ip }}</td>
 				  <td>{% if host.enabled %}<span class="badge badge-success">启用</span>{% else %}<span class="badge badge-danger">禁用</span>{% endif %}</td>
-				  <td><span class="badge badge-success">{{ host.get_protocol_display }}</span></td>
+				  <td>
+				  {% if host.get_protocol_display == 'ssh' %}
+					<span class="badge badge-success">{{ host.get_protocol_display }}</span>
+				  {% elif host.get_protocol_display == 'sftp' %}
+					<span class="badge badge-info">{{ host.get_protocol_display }}</span>
+				  {% elif host.get_protocol_display == 'telnet' %}
+					<span class="badge badge-primary">{{ host.get_protocol_display }}</span>
+				  {% else %}
+				    <span class="badge badge-secondary">{{ host.get_protocol_display }}</span>
+				  {% endif %}
+
+				  </td>
 				  <td>{{ host.port }}</td>
 				  <td>{{ host.release }}</td>
 				  {% if host.remote_user %}

diff --git a/templates/server/index.html b/templates/server/index.html
@@ -70,13 +70,13 @@ <h3>{{ group_count }}</h3>
 			  <!-- ./col -->
 			  <div class="col-lg-3 col-6">
 				<!-- small box -->
-				<div class="small-box bg-danger">
+				<div class="small-box bg-secondary">
 				  <div class="inner">
-					<h3>0</h3>
-					<p>告警</p>
+					<h3>{{ session_count }}</h3>
+					<p>在线终端</p>
 				  </div>
 				  <div class="icon">
-					<i class="fas fa-bell"></i>
+					<i class="fas fa-terminal"></i>
 				  </div>
 				</div>
 			  </div>

diff --git a/templates/user/logs.html b/templates/user/logs.html
@@ -2,7 +2,7 @@
 {% load static %}
 
   {% block title %}
-  <title>用户日志</title>
+  <title>操作日志</title>
   {% endblock title %}
 
 	{% block navheader %}
@@ -12,7 +12,7 @@
           <div class="col-12">
             <ol class="breadcrumb">
               <li class="breadcrumb-item">日志审计</li>
-              <li class="breadcrumb-item active">用户日志</li>
+              <li class="breadcrumb-item active">操作日志</li>
             </ol>
           </div>
         </div>
@@ -23,7 +23,7 @@
 		  {% block content %}
           <div class="card card-primary card-outline">
             <div class="card-header">
-              <h3 class="card-title">用户日志</h3>
+              <h3 class="card-title">操作日志</h3>
 				<div class="card-tools">
 				  <button type="button" class="btn btn-tool" data-widget="collapse">
 					<i class="fas fa-minus"></i>

diff --git a/templates/webssh/hosts.html b/templates/webssh/hosts.html
@@ -2,7 +2,7 @@
 {% load static %}
 
   {% block title %}
-  <title>web终端</title>
+  <title>终端登陆</title>
   {% endblock title %}
 
 	{% block navheader %}
@@ -12,7 +12,7 @@
           <div class="col-12">
             <ol class="breadcrumb">
               <li class="breadcrumb-item">作业中心</li>
-              <li class="breadcrumb-item active">web终端</li>
+              <li class="breadcrumb-item active">终端登陆</li>
             </ol>
           </div>
         </div>
@@ -23,7 +23,7 @@
 		  {% block content %}
           <div class="card card-primary card-outline">
             <div class="card-header">
-              <h3 class="card-title">web终端</h3>
+              <h3 class="card-title">终端登陆</h3>
 				<div class="card-tools">
 				  <button type="button" class="btn btn-tool" data-widget="collapse">
 					<i class="fas fa-minus"></i>
@@ -60,7 +60,17 @@ <h3 class="card-title">web终端</h3>
 				  <td>{{ host.get_type_display }}</td>
 				  <td>{{ host.get_env_display }}</td>
 				  <td>{{ host.ip }}</td>
-				  <td><span class="badge badge-info">{{ host.get_protocol_display }}</span></td>
+				  <td>
+				  {% if host.get_protocol_display == 'ssh' %}
+					<span class="badge badge-success">{{ host.get_protocol_display }}</span>
+				  {% elif host.get_protocol_display == 'sftp' %}
+					<span class="badge badge-info">{{ host.get_protocol_display }}</span>
+				  {% elif host.get_protocol_display == 'telnet' %}
+					<span class="badge badge-primary">{{ host.get_protocol_display }}</span>
+				  {% else %}
+				    <span class="badge badge-secondary">{{ host.get_protocol_display }}</span>
+				  {% endif %}
+				  </td>
 				  <td>{{ host.port }}</td>
 				  <td>{{ host.release }}</td>
 				  {% if host.remote_user %}
@@ -71,33 +81,37 @@ <h3 class="card-title">web终端</h3>
 				  <td>{{ host.create_time|date:"Y/m/d H:i:s" }}</td>
 				  <td>
 					{% if host.remote_user and host.enabled %}
-					{% if host.get_protocol_display == 'ssh' %}
-					<form method="post" action="{% url 'webssh:terminal' %}" target="_blank" style="display:inline;">
-					{% elif host.get_protocol_display == 'telnet' %}
-					<form method="post" action="{% url 'webtelnet:terminal' %}" target="_blank" style="display:inline;">
-					{% else %}
-					<form method="post" action="#" onsubmit="return false;" style="display:inline;">
-					{% endif %}
-						{% csrf_token %}
-						<input type="text" name="hostid" value="{{ host.id }}" hidden>
-						<button type="submit" class="btn btn-sm btn-success btn-flat"><i class="fas fa-terminal"></i> web终端</button>
-					</form>
+						{% if host.get_protocol_display == 'ssh' %}
+						<form method="post" action="{% url 'webssh:terminal' %}" target="_blank" style="display:inline;">
+						{% elif host.get_protocol_display == 'telnet' %}
+						<form method="post" action="{% url 'webtelnet:terminal' %}" target="_blank" style="display:inline;">
+						{% else %}
+						<form method="post" action="#" onsubmit="return false;" style="display:inline;">
+						{% endif %}
+							{% csrf_token %}
+							<input type="text" name="hostid" value="{{ host.id }}" hidden>
+							<button type="submit" class="btn btn-sm btn-success btn-flat"><i class="fas fa-terminal"></i> web终端</button>
+						</form>
 					{% else %}
-					<button class="btn btn-sm btn-secondary btn-flat disabled"><i class="fas fa-terminal"></i> web终端</button>
+					<button class="btn btn-sm btn-success btn-flat disabled"><i class="fas fa-terminal"></i> web终端</button>
 					{% endif %}
+
 					&nbsp;&nbsp;
 					{% if host.remote_user and host.enabled %}
 						{% if host.get_protocol_display == 'ssh' %}
 							<form method="post" target="_blank" onsubmit="clishell(this);return false;" style="display:inline;">
 								{% csrf_token %}
 								<input type="text" name="hostid" value="{{ host.id }}" hidden>
-								<button type="submit" class="btn btn-sm btn-primary btn-flat"><i class="fas fa-network-wired"></i> 客户端终端</button>
+								<button type="submit" class="btn btn-sm btn-primary btn-flat"><i class="fas fa-network-wired"></i> 客户端ssh</button>
 							</form>
+							&nbsp;&nbsp;
+							<button type="submit" class="btn btn-sm btn-info btn-flat"><i class="fas fa-network-wired"></i> 客户端sftp</button>
 						{% endif %}
 					{% else %}
-						<button class="btn btn-sm btn-secondary btn-flat disabled"><i class="fas fa-network-wired"></i> 客户端终端</button>
+						<button class="btn btn-sm btn-primary btn-flat disabled"><i class="fas fa-network-wired"></i> 客户端ssh</button>
+						&nbsp;&nbsp;
+						<button class="btn btn-sm btn-info btn-flat disabled"><i class="fas fa-network-wired"></i> 客户端sftp</button>
 					{% endif %}
-
 				  </td>
                 </tr>
 				{% endfor %}