diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3f94861..23578e4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,17 +9,7 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/webssh/views_api.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="736">
-              <caret line="44" lean-forward="true" selection-start-line="44" selection-end-line="44" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
@@ -30,7 +20,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/webssh/forms.py" />
         <option value="$PROJECT_DIR$/static/webssh/webssh.js" />
         <option value="$PROJECT_DIR$/webssh/routing.py" />
         <option value="$PROJECT_DIR$/devops/routing.py" />
@@ -51,25 +40,27 @@
         <option value="$PROJECT_DIR$/server/forms.py" />
         <option value="$PROJECT_DIR$/server/views_api.py" />
         <option value="$PROJECT_DIR$/webssh/admin.py" />
-        <option value="$PROJECT_DIR$/webssh/ssh.py" />
-        <option value="$PROJECT_DIR$/webssh/urls.py" />
-        <option value="$PROJECT_DIR$/webssh/views.py" />
         <option value="$PROJECT_DIR$/webssh/models.py" />
-        <option value="$PROJECT_DIR$/websocket/routing.py" />
-        <option value="$PROJECT_DIR$/webssh/websocket_layer.py" />
         <option value="$PROJECT_DIR$/webtelnet/websocket_layer.py" />
         <option value="$PROJECT_DIR$/layer.py" />
         <option value="$PROJECT_DIR$/user/urls_api.py" />
         <option value="$PROJECT_DIR$/webssh/urls_api.py" />
         <option value="$PROJECT_DIR$/user/models.py" />
         <option value="$PROJECT_DIR$/devops/urls.py" />
+        <option value="$PROJECT_DIR$/webssh/websocket_layer_view.py" />
+        <option value="$PROJECT_DIR$/websocket/routing.py" />
         <option value="$PROJECT_DIR$/webssh/views_api.py" />
+        <option value="$PROJECT_DIR$/webssh/urls.py" />
+        <option value="$PROJECT_DIR$/webssh/forms.py" />
+        <option value="$PROJECT_DIR$/webssh/views.py" />
+        <option value="$PROJECT_DIR$/webssh/ssh.py" />
+        <option value="$PROJECT_DIR$/webssh/websocket_layer.py" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="268" />
-    <option name="y" value="302" />
+    <option name="x" value="-274" />
+    <option name="y" value="-16" />
     <option name="width" value="1940" />
     <option name="height" value="984" />
   </component>
@@ -88,7 +79,7 @@
             <path>
               <item name="devops" type="b2602c69:ProjectViewProjectNode" />
               <item name="devops" type="462c0819:PsiDirectoryNode" />
-              <item name="devops" type="462c0819:PsiDirectoryNode" />
+              <item name="websocket" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="devops" type="b2602c69:ProjectViewProjectNode" />
@@ -208,13 +199,6 @@
     </layout>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/webssh/forms.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="92">
-          <caret line="4" column="10" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/static/webssh/webssh.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="226">
@@ -382,23 +366,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://C:/Program Files/Python37/Lib/site-packages/channels/generic/websocket.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="69" column="57" selection-start-line="69" selection-start-column="52" selection-end-line="69" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/webssh/urls.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="207">
-          <caret line="9" column="52" selection-start-line="9" selection-start-column="44" selection-end-line="9" selection-end-column="52" />
-          <folding>
-            <element signature="e#0#28#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/server/models.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="621">
@@ -416,124 +383,171 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/webssh/views.py">
+    <entry file="file://$PROJECT_DIR$/webtelnet/websocket_layer.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="553">
-          <caret line="48" column="14" selection-start-line="48" selection-start-column="14" selection-end-line="48" selection-end-column="14" />
+        <state relative-caret-position="560">
+          <caret line="209" lean-forward="true" selection-start-line="209" selection-end-line="209" />
           <folding>
-            <element signature="e#0#35#0" expanded="true" />
+            <element signature="e#0#56#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/websocket/routing.py">
+    <entry file="file://$PROJECT_DIR$/user/urls_api.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="230">
-          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        <state relative-caret-position="345">
+          <caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
           <folding>
             <element signature="e#0#28#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/webssh/ssh.py">
+    <entry file="file://$PROJECT_DIR$/user/views_api.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="989">
-          <caret line="91" column="24" lean-forward="true" selection-start-line="91" selection-start-column="24" selection-end-line="91" selection-end-column="24" />
+        <state relative-caret-position="330">
+          <caret line="242" column="33" lean-forward="true" selection-end-line="426" />
           <folding>
-            <element signature="e#0#15#0" expanded="true" />
+            <element signature="e#0#64#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/webtelnet/websocket_layer.py">
+    <entry file="file://$PROJECT_DIR$/webtelnet/models.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/layer.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="560">
-          <caret line="209" lean-forward="true" selection-start-line="209" selection-end-line="209" />
+        <state relative-caret-position="345">
+          <caret line="15" selection-start-line="15" selection-end-line="18" selection-end-column="6" />
           <folding>
-            <element signature="e#0#56#0" expanded="true" />
+            <element signature="e#22#31#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/webssh/websocket_layer.py">
+    <entry file="file://$PROJECT_DIR$/devops/urls.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="437">
+          <caret line="34" column="72" selection-start-line="34" selection-start-column="62" selection-end-line="34" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/webssh/urls_api.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="375">
-          <caret line="230" column="39" lean-forward="true" selection-start-line="230" selection-start-column="39" selection-end-line="230" selection-end-column="39" />
+        <state relative-caret-position="138">
+          <caret line="6" column="71" selection-start-line="6" selection-start-column="58" selection-end-line="6" selection-end-column="71" />
+          <folding>
+            <element signature="e#0#28#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/webssh/websocket_layer_view.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="161">
+          <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
           <folding>
             <element signature="e#0#56#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/user/urls_api.py">
+    <entry file="file://$PROJECT_DIR$/layer_group.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="345">
-          <caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
+        <state relative-caret-position="414">
+          <caret line="19" column="42" selection-start-line="19" selection-start-column="32" selection-end-line="19" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/user/models.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="529">
+          <caret line="78" column="27" selection-start-line="78" selection-start-column="18" selection-end-line="78" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/webssh/urls.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="184">
+          <caret line="8" column="67" selection-start-line="8" selection-start-column="54" selection-end-line="8" selection-end-column="67" />
           <folding>
             <element signature="e#0#28#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/user/views_api.py">
+    <entry file="file://$PROJECT_DIR$/websocket/routing.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="242" column="33" lean-forward="true" selection-end-line="426" />
+        <state relative-caret-position="184">
+          <caret line="8" column="10" lean-forward="true" selection-start-line="8" selection-start-column="10" selection-end-line="8" selection-end-column="22" />
           <folding>
-            <element signature="e#0#64#0" expanded="true" />
+            <element signature="e#0#28#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/webtelnet/models.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/webssh/models.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="41" column="21" selection-start-line="41" selection-start-column="6" selection-end-line="41" selection-end-column="21" />
+        <state relative-caret-position="507">
+          <caret line="55" column="12" selection-start-line="55" selection-start-column="4" selection-end-line="55" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/user/models.py">
+    <entry file="file://$PROJECT_DIR$/webssh/forms.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="437">
-          <caret line="74" column="20" selection-start-line="74" selection-start-column="14" selection-end-line="74" selection-end-column="20" />
+        <state relative-caret-position="207">
+          <caret line="9" column="40" selection-start-line="9" selection-start-column="40" selection-end-line="9" selection-end-column="40" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/layer.py">
+    <entry file="file://$PROJECT_DIR$/webssh/views.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="345">
-          <caret line="15" selection-start-line="15" selection-end-line="18" selection-end-column="6" />
+        <state relative-caret-position="736">
+          <caret line="73" lean-forward="true" selection-start-line="73" selection-end-line="73" />
           <folding>
-            <element signature="e#22#31#0" expanded="true" />
+            <element signature="e#0#35#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/devops/urls.py">
+    <entry file="file://C:/Program Files/Python37/Lib/site-packages/channels/generic/websocket.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="437">
-          <caret line="34" column="72" selection-start-line="34" selection-start-column="62" selection-end-line="34" selection-end-column="72" />
+        <state relative-caret-position="644">
+          <caret line="112" column="12" lean-forward="true" selection-start-line="112" selection-start-column="12" selection-end-line="112" selection-end-column="12" />
+          <folding>
+            <element signature="e#0#11#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/webssh/urls_api.py">
+    <entry file="file://$PROJECT_DIR$/webssh/ssh.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="138">
-          <caret line="6" column="71" selection-start-line="6" selection-start-column="58" selection-end-line="6" selection-end-column="71" />
+        <state relative-caret-position="414">
+          <caret line="120" column="35" selection-start-line="120" selection-start-column="35" selection-end-line="120" selection-end-column="55" />
           <folding>
-            <element signature="e#0#28#0" expanded="true" />
+            <element signature="e#0#15#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/webssh/views_api.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="460">
+          <caret line="33" selection-start-line="33" selection-end-line="37" selection-end-column="12" />
+          <folding>
+            <element signature="e#0#46#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/webssh/websocket_layer.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="736">
-          <caret line="44" lean-forward="true" selection-start-line="44" selection-end-line="44" />
+          <caret line="356" lean-forward="true" selection-start-line="356" selection-end-line="356" />
+          <folding>
+            <element signature="e#0#56#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/README.md b/README.md
index 7bea9d3..33ce204 100644
--- a/README.md
+++ b/README.md
@@ -61,6 +61,8 @@ sh start_docker.sh
 ![效果](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)
 
 
 # TODO LISTS
@@ -93,7 +95,9 @@ sh start_docker.sh
 - [ ] 批量脚本
 - [x] webssh终端
 - [x] webtelnet终端
-- [x] 查看在线会话
+- [x] 查看在线会话列表
+- [x] 实时查看在线会话
+- [ ] 锁定实时在线会话
 - [x] 强制关闭在线会话
 - [ ] 文件上传
 - [ ] 文件下载
diff --git a/db.sqlite3 b/db.sqlite3
index 9845a2a..5cc78ff 100644
Binary files a/db.sqlite3 and b/db.sqlite3 differ
diff --git a/layer.py b/layer.py
index 94a710a..76bc46a 100644
--- a/layer.py
+++ b/layer.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+""" 初始化创建 admin 账号"""
 import os
 import sys
 
@@ -10,14 +11,18 @@ def main():
     # 让django初始化
     import django
     django.setup()
+    
+    from user.models import User
+    from util.tool import hash_code
+    
     from channels.layers import get_channel_layer
     from asgiref.sync import async_to_sync
     channel_layer = get_channel_layer()
-    async_to_sync(channel_layer.send)("specific.FEfncEYP!bFdhrEmvyBIV", {
+    async_to_sync(channel_layer.send)('specific.WjcnLeaL!oejCJLfYFOdT', {
         "type": "chat.message",
-        "text": '{"status":2, "message":"\\n\\rAdministrator forcibly interrupts your connection"}',
+        "text": '{"status":3, "message":"系统即将关闭，请退出当前会话！"}',
     })
-
-
+    
+    
 if __name__ == '__main__':
     main()
diff --git a/layer_group.py b/layer_group.py
new file mode 100644
index 0000000..1d2cf35
--- /dev/null
+++ b/layer_group.py
@@ -0,0 +1,27 @@
+#!/usr/bin/env python
+import os
+import sys
+
+
+def main():
+    # 使用django配置文件进行设置
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'devops.settings')
+    
+    # 让django初始化
+    import django
+    django.setup()
+    
+    from user.models import User
+    from util.tool import hash_code
+    
+    from channels.layers import get_channel_layer
+    from asgiref.sync import async_to_sync
+    channel_layer = get_channel_layer()
+    async_to_sync(channel_layer.group_send)('session_NbxeEnGcUv', {
+        "type": "chat.message",
+        "text": '{"status":3, "message":"系统即将关闭，请退出当前会话！- 来自组"}',
+    })
+    
+    
+if __name__ == '__main__':
+    main()
diff --git a/screenshots/36.PNG b/screenshots/36.PNG
new file mode 100644
index 0000000..ac1bbca
Binary files /dev/null and b/screenshots/36.PNG differ
diff --git a/screenshots/37.JPG b/screenshots/37.JPG
new file mode 100644
index 0000000..7d5bb8b
Binary files /dev/null and b/screenshots/37.JPG differ
diff --git a/static/webssh/webssh.js b/static/webssh/webssh.js
index d213c72..4a00ade 100644
--- a/static/webssh/webssh.js
+++ b/static/webssh/webssh.js
@@ -57,7 +57,7 @@ function websocket() {
         var status = data.status;
         if (status === 0) {
             term.write(message)
-        } else {
+        } else if (status === 1 || status === 2 ) {
             //window.location.reload() 端口连接后刷新页面
 			//term.clear()
 			term.write(message)
@@ -71,7 +71,18 @@ function websocket() {
 			//term.dispose()
 			//$('#django-webssh-terminal').addClass('hide');
 			//$('#form').removeClass('hide');
-        }
+        } else if (status === 3 ) {
+			console.log(message);
+			toastr.options.closeButton = true;
+			toastr.options.showMethod = 'slideDown';
+			toastr.options.hideMethod = 'fadeOut';
+			toastr.options.closeMethod = 'fadeOut';
+			toastr.options.timeOut = 0;	
+			toastr.options.extendedTimeOut = 0;	
+			toastr.options.progressBar = true;
+			toastr.options.positionClass = 'toast-top-right'; 
+			toastr.warning(message);
+		};
     });
 
     /*
@@ -79,13 +90,13 @@ function websocket() {
     * status 为 1 时, resize pty ssh 终端大小, cols 为每行显示的最大字数, rows 为每列显示的最大字数, 忽略 data 参数
     */
     var message = {'status': 0, 'data': null, 'cols': null, 'rows': null};
-
+	
     // 向服务器端发送数据
     term.on('data', function (data) {
         message['status'] = 0;
         message['data'] = data;
         var send_data = JSON.stringify(message);
-        sock.send(send_data)
+        sock.send(send_data);
     });
 
     // 监听浏览器窗口, 根据浏览器窗口大小修改终端大小
diff --git a/static/webssh/webssh.view.js b/static/webssh/webssh.view.js
new file mode 100644
index 0000000..09eadd7
--- /dev/null
+++ b/static/webssh/webssh.view.js
@@ -0,0 +1,115 @@
+function checkwindow() {
+	event.returnValue=false;
+}
+
+function get_connect_info() {
+    var group = $.trim($('#group').text());
+    var connect_info = 'group=' + group;
+    return connect_info
+}
+
+function get_term_size() {
+    var init_width = 9;
+    var init_height = 17;
+
+    var windows_width = $(window).width();
+    var windows_height = $(window).height();
+
+    return {
+        cols: Math.floor(windows_width / init_width),
+        rows: Math.floor(windows_height / init_height),
+    }
+}
+
+function websocket() {
+    var cols = get_term_size().cols;
+    var rows = get_term_size().rows;
+    var connect_info = get_connect_info();
+
+    var term = new Terminal(
+        {
+            cols: cols,
+            rows: rows,
+            useStyle: true,
+            cursorBlink: true
+        }
+        ),
+        protocol = (location.protocol === 'https:') ? 'wss://' : 'ws://',
+        socketURL = protocol + location.hostname + ((location.port) ? (':' + location.port) : '') + '/webssh/view/?' + connect_info;
+
+    var sock;
+    sock = new WebSocket(socketURL);
+
+    // 打开 websocket 连接, 打开 web 终端
+    sock.addEventListener('open', function () {
+        //$('#django-webssh-terminal').removeClass('hide');
+        term.open(document.getElementById('terminal'));
+		//term.focus();
+		//term.write('Connecting...\n\r');
+		$("body").attr("onbeforeunload",'checkwindow()'); //增加刷新关闭提示属性
+		
+    });
+
+    // 读取服务器端发送的数据并写入 web 终端
+    sock.addEventListener('message', function (recv) {
+        var data = JSON.parse(recv.data);
+        var message = data.message;
+        var status = data.status;
+        if (status === 0) {
+            term.write(message)
+        } else if (status === 1 || status === 2 ) {
+            //window.location.reload() 端口连接后刷新页面
+			//term.clear()
+			term.write(message)
+			$("body").removeAttr("onbeforeunload"); //删除刷新关闭提示属性
+			
+			//$(document).keyup(function(event){	// 监听回车按键事件
+			//	if(event.keyCode == 13){
+					//window.location.reload();
+			//	}
+			//});
+			//term.dispose()
+			//$('#django-webssh-terminal').addClass('hide');
+			//$('#form').removeClass('hide');
+        } else if (status === 3 ) {
+			console.log(message);
+			toastr.options.closeButton = true;
+			toastr.options.showMethod = 'slideDown';
+			toastr.options.hideMethod = 'fadeOut';
+			toastr.options.closeMethod = 'fadeOut';
+			toastr.options.timeOut = 0;	
+			toastr.options.extendedTimeOut = 0;	
+			toastr.options.progressBar = true;
+			toastr.options.positionClass = 'toast-top-right'; 
+			toastr.warning(message);
+		} else if (status === 5 ) {
+			term.write(message)
+		};
+    });
+
+    /*
+    * status 为 0 时, 将用户输入的数据通过 websocket 传递给后台, data 为传递的数据, 忽略 cols 和 rows 参数
+    * status 为 1 时, resize pty ssh 终端大小, cols 为每行显示的最大字数, rows 为每列显示的最大字数, 忽略 data 参数
+    */
+    var message = {'status': 0, 'data': null, 'cols': null, 'rows': null};
+	
+    // 向服务器端发送数据
+    term.on('data', function (data) {
+        //message['status'] = 0;
+        //message['data'] = data;
+        //var send_data = JSON.stringify(message);
+        //sock.send(send_data);
+    });
+
+    // 监听浏览器窗口, 根据浏览器窗口大小修改终端大小
+    $(window).resize(function () {
+        var cols = get_term_size().cols;
+        var rows = get_term_size().rows;
+        //message['status'] = 1;
+        //message['cols'] = cols;
+        //message['rows'] = rows;
+        //var send_data = JSON.stringify(message);
+        //sock.send(send_data);
+        term.resize(cols, rows)
+    })
+}
diff --git a/static/webtelnet/webtelnet.js b/static/webtelnet/webtelnet.js
index f314597..086a454 100644
--- a/static/webtelnet/webtelnet.js
+++ b/static/webtelnet/webtelnet.js
@@ -59,7 +59,7 @@ function websocket() {
         var status = data.status;
         if (status === 0) {
             term.write(message)
-        } else {
+        } else if (status === 1 || status === 2 ) {
             //window.location.reload() 端口连接后刷新页面
 			//term.clear()
 			term.write(message)
@@ -73,7 +73,18 @@ function websocket() {
 			//term.dispose()
 			//$('#django-webssh-terminal').addClass('hide');
 			//$('#form').removeClass('hide');
-        }
+        } else if (status === 3 ) {
+			console.log(message);
+			toastr.options.closeButton = true;
+			toastr.options.showMethod = 'slideDown';
+			toastr.options.hideMethod = 'fadeOut';
+			toastr.options.closeMethod = 'fadeOut';
+			toastr.options.timeOut = 0;	
+			toastr.options.extendedTimeOut = 0;	
+			toastr.options.progressBar = true;
+			toastr.options.positionClass = 'toast-top-right'; 
+			toastr.warning(message);
+		};
     });
 
     /*
diff --git a/templates/server/host.html b/templates/server/host.html
index b4b4f8d..199e788 100644
--- a/templates/server/host.html
+++ b/templates/server/host.html
@@ -22,13 +22,15 @@
 	{% endblock navheader %}
 	
 		  {% block content %}
-          <div class="card">
+          <div class="card card-primary">
             <div class="card-header">
               <h3 class="card-title">主机信息</h3>
 				<div class="card-tools">
+				  {% if request.session.issuperuser %}
 				  <a class="btn btn-tool" href="{% url 'server:host_edit' host.id %}" title="编辑">
 					<!--i class="fas fa-wrench"></i-->编辑
 				  </a>
+				  {% endif %}
 				  <button type="button" class="btn btn-tool" data-widget="collapse">
 					<i class="fas fa-minus"></i>
 				  </button>
@@ -52,7 +54,7 @@ <h3 class="card-title">主机信息</h3>
 				<div class="col-3 pt-1 pb-1 border-bottom">系统/型号：</div><div class="col-9 pt-1 pb-1 border-bottom">{{ host.release }}</div>
 				<div class="col-3 pt-1 pb-1 border-bottom">用户名：</div><div class="col-9 pt-1 pb-1 border-bottom">{{ host.remote_user.username }}</div>
 				<div class="col-3 pt-1 pb-1 border-bottom">添加时间：</div><div class="col-9 pt-1 pb-1 border-bottom">{{ host.create_time | date:"Y/m/d H:i:s" }}</div>
-				<div class="col-3 pt-1 pb-1 border-bottom">是否启用：</div><div class="col-9 pt-1 pb-1 border-bottom">{% if host.enabled %}启用{% else %}<span style="color:red">禁用</span>{% endif %}</div>
+				<div class="col-3 pt-1 pb-1 border-bottom">是否启用：</div><div class="col-9 pt-1 pb-1 border-bottom">{% if host.enabled %}<span class="badge badge-success">启用</span>{% else %}<span class="badge badge-danger">禁用</span>{% endif %}</div>
 				<div class="col-3 pt-1 pb-1">备注：</div><div class="col-9 pt-1 pb-1">{{ host.memo | default:'' }}</div>
             </div>
             <!-- /.card-body -->
diff --git a/templates/server/host_add.html b/templates/server/host_add.html
index 78591b3..c8bf1fd 100644
--- a/templates/server/host_add.html
+++ b/templates/server/host_add.html
@@ -22,7 +22,7 @@
 	{% endblock navheader %}
 	
 		  {% block content %}
-          <div class="card">
+          <div class="card card-primary">
             <div class="card-header">
               <h3 class="card-title">添加主机</h3>
 				<div class="card-tools">
@@ -93,7 +93,7 @@ <h3 class="card-title">添加主机</h3>
                       <label class="custom-control-label" for="enabled">启用</label>
                     </div>
 				</div>
-				<div class="offset-2 col-10 pt-2"><button class="btn btn-default" type="reset">重置</button><button class="btn btn-success ml-2" onclick="changeuserprofile(this);">提交</button><span id="feed_error" class="ml-2" style="color:red;"></span></div>
+				<div class="offset-2 col-10 pt-2"><a class="btn btn-default" href="{% url 'server:hosts' %}">返回</a> <button class="btn btn-success ml-2" onclick="changeuserprofile(this);">提交</button><span id="feed_error" class="ml-2" style="color:red;"></span></div>
             </div>
             <!-- /.card-body -->
           </div>
diff --git a/templates/server/host_edit.html b/templates/server/host_edit.html
index 9383fe4..a5e6542 100644
--- a/templates/server/host_edit.html
+++ b/templates/server/host_edit.html
@@ -22,7 +22,7 @@
 	{% endblock navheader %}
 	
 		  {% block content %}
-          <div class="card">
+          <div class="card card-primary">
             <div class="card-header">
               <h3 class="card-title">主机编辑</h3>
 				<div class="card-tools">
@@ -93,7 +93,7 @@ <h3 class="card-title">主机编辑</h3>
                       <label class="custom-control-label" for="enabled">启用</label>
                     </div>
 				</div>
-				<div class="offset-2 col-10 pt-2"><button class="btn btn-default" type="reset">重置</button><button class="btn btn-success ml-2" onclick="changeuserprofile(this);">提交</button><span id="feed_error" class="ml-2" style="color:red;"></span></div>
+				<div class="offset-2 col-10 pt-2"><a class="btn btn-default" href="{% url 'server:hosts' %}">返回</a> <button class="btn btn-success ml-2" onclick="changeuserprofile(this);">提交</button><span id="feed_error" class="ml-2" style="color:red;"></span></div>
             </div>
             <!-- /.card-body -->
           </div>
diff --git a/templates/server/hosts.html b/templates/server/hosts.html
index 2656458..82db7ac 100644
--- a/templates/server/hosts.html
+++ b/templates/server/hosts.html
@@ -21,10 +21,10 @@
 	{% endblock navheader %}
 	
 		  {% block content %}
-          <div class="card">
+          <div class="card card-primary card-outline">
             <div class="card-header">
               <h3 class="card-title">
-				主机列表{% if request.session.issuperuser %}<a href="{% url 'server:host_add' %}" class="btn btn-sm btn-outline-success ml-3 addsoft">新增 + </a>{% endif %}
+				主机列表{% if request.session.issuperuser %}<a href="{% url 'server:host_add' %}" class="btn btn-sm btn-outline-success ml-3 addsoft"><i class="fas fa-plus fa-sm"></i> 新增</a>{% endif %}
 			  </h3>
 				<div class="card-tools">
 				  <button type="button" class="btn btn-tool" data-widget="collapse">
@@ -59,12 +59,12 @@ <h3 class="card-title">
                 <tbody>
 				{% for host in hosts %}
                 <tr id="host-{{ host.id }}">
-				  <td><a href="{% url 'server:host' host.id %}">{{ host.hostname }}</a></td>
+				  <td>{{ host.hostname }}</td>
 				  <td>{{ host.get_type_display }}</td>
 				  <td>{{ host.get_env_display }}</td>
 				  <td>{{ host.ip }}</td>
-				  <td>{% if host.enabled %}启用{% else %}<span style="color:red">禁用</span>{% endif %}</td>
-				  <td>{{ host.get_protocol_display }}</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>{{ host.port }}</td>
 				  <td>{{ host.release }}</td>
 				  {% if host.remote_user %}
@@ -73,7 +73,9 @@ <h3 class="card-title">
 				  <td></td>
 				  {% endif %}
 				  <td>{{ host.create_time|date:"Y/m/d H:i:s" }}</td>
-				  <td><a href="{% url 'server:host' host.id %}">详细</a> {% if request.session.issuperuser %}<a href="{% url 'server:host_edit' host.id %}">编辑</a> <a href="javascript:void(0)" id="{{ host.id }}" title="{{ host.hostname }}" onclick="createdeletemodal(this);">删除</a>{% endif %}</td>
+				  <td><a href="{% url 'server:host' host.id %}" class="btn btn-primary btn-sm"><i class="fas fa-folder"></i> 详细</a>
+				  {% if request.session.issuperuser %}&nbsp;&nbsp;<a href="{% url 'server:host_edit' host.id %}" class="btn btn-info btn-sm"><i class="fas fa-pencil-alt"></i> 编辑</a>&nbsp;&nbsp;<a href="javascript:void(0)" id="{{ host.id }}" title="{{ host.hostname }}" onclick="createdeletemodal(this);" class="btn btn-danger btn-sm"><i class="fas fa-trash"></i> 删除</a>{% endif %}
+				  </td>
                 </tr>
 				{% endfor %}
                 </tbody>
diff --git a/templates/server/user.html b/templates/server/user.html
index d3921aa..4ad6ef5 100644
--- a/templates/server/user.html
+++ b/templates/server/user.html
@@ -22,7 +22,7 @@
 	{% endblock navheader %}
 	
 		  {% block content %}
-          <div class="card">
+          <div class="card card-primary">
             <div class="card-header">
               <h3 class="card-title">用户信息</h3>
 				<div class="card-tools">
@@ -45,7 +45,7 @@ <h3 class="card-title">用户信息</h3>
 				<div class="col-3 pt-1 pb-1 border-bottom">名称：</div><div class="col-9 pt-1 pb-1 border-bottom">{{ user.name }}</div>
 				<div class="col-3 pt-1 pb-1 border-bottom">用户名：</div><div class="col-9 pt-1 pb-1 border-bottom">{{ user.username }}</div>
 				<div class="col-3 pt-1 pb-1 border-bottom">密码：</div><div class="col-9 pt-1 pb-1 border-bottom">{{ user.password }}</div>
-				<div class="col-3 pt-1 pb-1 border-bottom">登陆后是否su跳转超级用户：</div><div class="col-9 pt-1 pb-1 border-bottom">{% if user.enabled %}是{% else %}<span style="color:red">否<span>{% endif %}</div>
+				<div class="col-3 pt-1 pb-1 border-bottom">登陆后是否su跳转超级用户：</div><div class="col-9 pt-1 pb-1 border-bottom">{% if user.enabled %}<span class="badge badge-success">是</span>{% else %}<span class="badge badge-danger">否</span>{% endif %}</div>
 				{% if user.enabled %}
 				<div class="col-3 pt-1 pb-1 border-bottom">超级用户：</div><div class="col-9 pt-1 pb-1 border-bottom">{{ user.superusername | default:'' }}</div>
 				<div class="col-3 pt-1 pb-1 border-bottom">超级密码：</div><div class="col-9 pt-1 pb-1 border-bottom">{{ user.superpassword | default:'' }}</div>
diff --git a/templates/server/user_add.html b/templates/server/user_add.html
index 4484617..42b14e9 100644
--- a/templates/server/user_add.html
+++ b/templates/server/user_add.html
@@ -22,7 +22,7 @@
 	{% endblock navheader %}
 	
 		  {% block content %}
-          <div class="card">
+          <div class="card card-primary">
             <div class="card-header">
               <h3 class="card-title">用户添加</h3>
 				<div class="card-tools">
@@ -42,7 +42,7 @@ <h3 class="card-title">用户添加</h3>
 				<div class="col-12">
 					<div class="alert alert-warning alert-dismissible" style="font-size:0.9rem;">
 						<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-						提示：1.添加后名称不可修改&nbsp;&nbsp;&nbsp;&nbsp;2.su 跳转功能目前只对超级管理员有效。
+						提示：su 跳转功能目前只对超级管理员有效。
 					</div>
 				</div>
 				<div class="col-2 pt-1 pb-1">名称<span style="color:red;"> * </span>：</div><div class="col-10 pt-1 pb-1"><input class="form-control" type="text" id="name" onkeyup="check_name();" onblur="check_name();"></div>
@@ -67,7 +67,7 @@ <h3 class="card-title">用户添加</h3>
 				<div class="offset-2 col-10 pb-1"><small id="superpassword_error" style="color:red;"></small></div>
 				
 				<div class="col-2 pt-1 pb-1">备注：</div><div class="col-10 pt-1 pb-1"><textarea id="memo" class="form-control"></textarea></div>
-				<div class="offset-2 col-10 pt-2"><button class="btn btn-default" type="reset">重置</button><button class="btn btn-success ml-2" onclick="changeuserprofile(this);">提交</button><span id="feed_error" class="ml-2" style="color:red;"></span></div>
+				<div class="offset-2 col-10 pt-2"><a class="btn btn-default" href="{% url 'server:users' %}">返回</a> <button class="btn btn-success ml-2" onclick="changeuserprofile(this);">提交</button><span id="feed_error" class="ml-2" style="color:red;"></span></div>
             </div>
             <!-- /.card-body -->
           </div>
diff --git a/templates/server/user_edit.html b/templates/server/user_edit.html
index 53d83fc..48d5b62 100644
--- a/templates/server/user_edit.html
+++ b/templates/server/user_edit.html
@@ -22,7 +22,7 @@
 	{% endblock navheader %}
 	
 		  {% block content %}
-          <div class="card">
+          <div class="card card-primary">
             <div class="card-header">
               <h3 class="card-title">用户信息</h3>
 				<div class="card-tools">
@@ -60,7 +60,7 @@ <h3 class="card-title">用户信息</h3>
 				<div class="offset-2 col-10 pb-1"><small id="superpassword_error" style="color:red;"></small></div>
 				
 				<div class="col-2 pt-1 pb-1">备注：</div><div class="col-10 pt-1 pb-1"><textarea id="memo" class="form-control">{{ user.memo | default:'' }}</textarea></div>
-				<div class="offset-2 col-10 pt-2"><button class="btn btn-default" type="reset">重置</button><button class="btn btn-success ml-2" onclick="changeuserprofile(this);">提交</button><span id="feed_error" class="ml-2" style="color:red;"></span></div>
+				<div class="offset-2 col-10 pt-2"><a class="btn btn-default" href="{% url 'server:users' %}">返回</a> <button class="btn btn-success ml-2" onclick="changeuserprofile(this);">提交</button><span id="feed_error" class="ml-2" style="color:red;"></span></div>
             </div>
             <!-- /.card-body -->
           </div>
diff --git a/templates/server/users.html b/templates/server/users.html
index f4be06a..956cf45 100644
--- a/templates/server/users.html
+++ b/templates/server/users.html
@@ -21,10 +21,10 @@
 	{% endblock navheader %}
 	
 		  {% block content %}
-          <div class="card">
+          <div class="card card-primary card-outline">
             <div class="card-header">
               <h3 class="card-title">
-				用户列表<a href="{% url 'server:user_add' %}" class="btn btn-sm btn-outline-success ml-3 addsoft">新增 + </a>
+				用户列表<a href="{% url 'server:user_add' %}" class="btn btn-sm btn-outline-success ml-3 addsoft"><i class="fas fa-plus fa-sm"></i> 新增</a>
 			  </h3>
 				<div class="card-tools">
 				  <button type="button" class="btn btn-tool" data-widget="collapse">
@@ -46,7 +46,7 @@ <h3 class="card-title">
 				  <th>名称</th>
 				  <th>用户名</th>
 				  <th>已绑定主机数</th>
-				  <th>备注</th>
+				  <th>登陆后是否 su 跳转</th>
 				  <th>添加时间</th>
 				  <th>操作</th>
                 </tr>
@@ -54,16 +54,16 @@ <h3 class="card-title">
                 <tbody>
 				{% for user in users %}
                 <tr id="user-{{ user.id }}">
-				  <td><a href="{% url 'server:user' user.id %}">{{ user.name }}</a></td>
+				  <td>{{ user.name }}</td>
 				  <td>{{ user.username }}</td>
 				  <td>{{ user.remoteuserbindhost_set.all.count }}</td>
-				  <td>{{ user.memo | default:'' }}</td>
+				  <td>{% if user.enabled %}<span class="badge badge-success">是</span>{% else %}<span class="badge badge-danger">否</span>{% endif %}</td>
 				  <td>{{ user.create_time|date:"Y/m/d H:i:s" }}</td>
-				  <td><a href="{% url 'server:user' user.id %}">详细</a>&nbsp;&nbsp;<a href="{% url 'server:user_edit' user.id %}">编辑</a> 
+				  <td><a href="{% url 'server:user' user.id %}" class="btn btn-primary btn-sm"><i class="fas fa-folder"></i> 详细</a>&nbsp;&nbsp;<a href="{% url 'server:user_edit' user.id %}" class="btn btn-info btn-sm"><i class="fas fa-pencil-alt"></i> 编辑</a> 
 				  {% if user.remoteuserbindhost_set.all.count == 0 %}
-				  &nbsp;&nbsp;<a href="javascript:void(0)" id="{{ user.id }}" title="{{ user.name }}" onclick="createdeletemodal(this);">删除</a>
+				  &nbsp;&nbsp;<a href="javascript:void(0)" id="{{ user.id }}" title="{{ user.name }}" onclick="createdeletemodal(this);" class="btn btn-danger btn-sm"><i class="fas fa-trash"></i> 删除</a>
 				  {% else %}
-				  &nbsp;&nbsp;删除
+				  &nbsp;&nbsp;<a href="javascript:void(0)" class="btn btn-danger btn-sm disabled"><i class="fas fa-trash"></i> 删除</a>
 				  {% endif %}
 				  </td>
                 </tr>
@@ -74,7 +74,7 @@ <h3 class="card-title">
 				  <th>名称</th>
 				  <th>用户名</th>
 				  <th>已绑定主机数</th>
-				  <th>备注</th>
+				  <th>登陆后是否 su 跳转</th>
 				  <th>添加时间</th>
 				  <th>操作</th>
                 </tr>
diff --git a/templates/user/group.html b/templates/user/group.html
index 3b72bc7..800ee21 100644
--- a/templates/user/group.html
+++ b/templates/user/group.html
@@ -22,7 +22,7 @@
 	{% endblock navheader %}
 	
 		  {% block content %}
-          <div class="card">
+          <div class="card card-primary">
             <div class="card-header">
               <h3 class="card-title">组信息</h3>
 				<div class="card-tools">
diff --git a/templates/user/group_add.html b/templates/user/group_add.html
index 4c76295..7b70043 100644
--- a/templates/user/group_add.html
+++ b/templates/user/group_add.html
@@ -22,7 +22,7 @@
 	{% endblock navheader %}
 	
 		  {% block content %}
-          <div class="card">
+          <div class="card card-primary">
             <div class="card-header">
               <h3 class="card-title">组</h3>
 				<div class="card-tools">
@@ -39,12 +39,6 @@ <h3 class="card-title">组</h3>
             </div>
             <!-- /.card-header -->
             <div class="card-body row">
-				<div class="col-12">
-					<div class="alert alert-warning alert-dismissible" style="font-size:0.9rem;">
-						<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-						提示：添加后组名不可修改.
-					</div>
-				</div>
 				<div class="col-2 pt-1 pb-1">组名<span style="color:red;"> * </span>：</div><div class="col-10 pt-1 pb-1"><input class="form-control" type="text" id="groupname" onkeyup="check_groupname();" onblur="check_groupname();"></div>
 				<div class="offset-2 col-10 pb-1"><small id="groupname_error" style="color:red;"></small></div>
 				
@@ -87,7 +81,7 @@ <h3 class="card-title">组</h3>
 				</div>
 				
 				<div class="col-2 pt-1 pb-1">备注：</div><div class="col-10 pt-1 pb-1"><textarea id="memo" class="form-control">{{ group.memo | default:'' }}</textarea></div>
-				<div class="offset-2 col-10 pt-2"><button class="btn btn-default" type="reset">重置</button><button class="btn btn-success ml-2" onclick="changeuserprofile(this);">提交</button><span id="feed_error" class="ml-2" style="color:red;"></span></div>
+				<div class="offset-2 col-10 pt-2"><a class="btn btn-default" href="{% url 'user:groups' %}">返回</a> <button class="btn btn-success ml-2" onclick="changeuserprofile(this);">提交</button><span id="feed_error" class="ml-2" style="color:red;"></span></div>
             </div>
             <!-- /.card-body -->
           </div>
diff --git a/templates/user/group_edit.html b/templates/user/group_edit.html
index 2ce55d9..9793a61 100644
--- a/templates/user/group_edit.html
+++ b/templates/user/group_edit.html
@@ -22,7 +22,7 @@
 	{% endblock navheader %}
 	
 		  {% block content %}
-          <div class="card">
+          <div class="card card-primary">
             <div class="card-header">
               <h3 class="card-title">组信息</h3>
 				<div class="card-tools">
@@ -86,7 +86,7 @@ <h3 class="card-title">组信息</h3>
 				</div>
 				
 				<div class="col-2 pt-1 pb-1">备注：</div><div class="col-10 pt-1 pb-1"><textarea id="memo" class="form-control">{{ group.memo | default:'' }}</textarea></div>
-				<div class="offset-2 col-10 pt-2"><button class="btn btn-default" type="reset">重置</button><button class="btn btn-success ml-2" onclick="changeuserprofile(this);">提交</button></div>
+				<div class="offset-2 col-10 pt-2"><a class="btn btn-default" href="{% url 'user:groups' %}">返回</a> <button class="btn btn-success ml-2" onclick="changeuserprofile(this);">提交</button></div>
             </div>
             <!-- /.card-body -->
           </div>
diff --git a/templates/user/groups.html b/templates/user/groups.html
index 55acdc5..ad06a71 100644
--- a/templates/user/groups.html
+++ b/templates/user/groups.html
@@ -21,9 +21,9 @@
 	{% endblock navheader %}
 	
 		  {% block content %}
-          <div class="card">
+          <div class="card card-primary card-outline">
             <div class="card-header">
-              <h3 class="card-title">组<a href="{% url 'user:group_add' %}" class="btn btn-sm btn-outline-success ml-3 addsoft">新增 + </a></h3>
+              <h3 class="card-title">组<a href="{% url 'user:group_add' %}" class="btn btn-sm btn-outline-success ml-3 addsoft"><i class="fas fa-plus fa-sm"></i> 新增</a></h3>
 				<div class="card-tools">
 				  <button type="button" class="btn btn-tool" data-widget="collapse">
 					<i class="fas fa-minus"></i>
@@ -51,16 +51,16 @@ <h3 class="card-title">组<a href="{% url 'user:group_add' %}" class="btn btn-sm
                 <tbody>
 				{% for group in groups %}
                 <tr id="group-{{ group.id }}">
-				  <td><a href="{% url 'user:group' group.id %}">{{ group.group_name }}</a></td>
+				  <td>{{ group.group_name }}</td>
 				  <td>{{ group.user_set.all.count }}</td>
 				  <td>{{ group.remote_user_bind_hosts.all.count }}</td>
 				  <td>{{ group.create_time|date:"Y/m/d H:i:s" }}</td>
 				  <td>
-				  <a href="{% url 'user:group' group.id %}">详细</a>&nbsp;&nbsp;<a href="{% url 'user:group_edit' group.id %}">编辑</a>
+				  <a href="{% url 'user:group' group.id %}" class="btn btn-primary btn-sm"><i class="fas fa-folder"></i> 详细</a>&nbsp;&nbsp;<a href="{% url 'user:group_edit' group.id %}" class="btn btn-info btn-sm"><i class="fas fa-pencil-alt"></i> 编辑</a>
 				  {% if group.user_set.all.count == 0 and group.remote_user_bind_hosts.all.count == 0 %}
-				  &nbsp;&nbsp;<a href="javascript:void(0)" id="{{ group.id }}" title="{{ group.group_name }}" onclick="createdeletemodal(this);">删除</a>
+				  &nbsp;&nbsp;<a href="javascript:void(0)" id="{{ group.id }}" title="{{ group.group_name }}" onclick="createdeletemodal(this);" class="btn btn-danger btn-sm"><i class="fas fa-trash"></i> 删除</a>
 				  {% else %}
-				  &nbsp;&nbsp;删除
+				  &nbsp;&nbsp;<a href="javascript:void(0)" class="btn btn-danger btn-sm disabled"><i class="fas fa-trash"></i> 删除</a>
 				  {% endif %}
 				  </td>
                 </tr>
diff --git a/templates/user/logs.html b/templates/user/logs.html
index 67429a6..ef06082 100644
--- a/templates/user/logs.html
+++ b/templates/user/logs.html
@@ -21,7 +21,7 @@
 	{% endblock navheader %}
 	
 		  {% block content %}
-          <div class="card">
+          <div class="card card-primary card-outline">
             <div class="card-header">
               <h3 class="card-title">用户日志</h3>
 				<div class="card-tools">
@@ -53,7 +53,7 @@ <h3 class="card-title">用户日志</h3>
 				{% for log in logs %}
                 <tr>
 				  <td>{{ log.user | default:'' }}</td>
-				  <td>{{ log.get_event_type_display }}</td>
+				  <td><span class="badge badge-success">{{ log.get_event_type_display }}</span></td>
 				  <td>{{ log.detail }}</td>
 				  <td>{{ log.address }}</td>
 				  <td>{{ log.useragent | truncatechars_html:30 }}...</td>
diff --git a/templates/user/profile.html b/templates/user/profile.html
index 59d2c3f..7ca6216 100644
--- a/templates/user/profile.html
+++ b/templates/user/profile.html
@@ -20,7 +20,7 @@
 	{% endblock navheader %}
 	
 		  {% block content %}
-          <div class="card">
+          <div class="card card-primary">
             <div class="card-header">
               <h3 class="card-title">个人信息</h3>
 				<div class="card-tools">
diff --git a/templates/user/profile_edit.html b/templates/user/profile_edit.html
index b08ae1f..7a30a36 100644
--- a/templates/user/profile_edit.html
+++ b/templates/user/profile_edit.html
@@ -20,7 +20,7 @@
 	{% endblock navheader %}
 	
 		  {% block content %}
-          <div class="card">
+          <div class="card card-primary">
             <div class="card-header">
               <h3 class="card-title">个人信息</h3>
 				<div class="card-tools">
@@ -62,7 +62,7 @@ <h3 class="card-title">个人信息</h3>
                   </select>
 				</div>
 				<div class="col-2 pt-1 pb-1">备注：</div><div class="col-10 pt-1 pb-1"><textarea id="memo" class="form-control">{{ user.memo | default:'' }}</textarea></div>
-				<div class="offset-2 col-10 pt-2"><button class="btn btn-default" type="reset">重置</button><button class="btn btn-success ml-2" onclick="changeuserprofile(this);">提交</button><span id="feed_error" class="ml-2" style="color:red;"></span></div>
+				<div class="offset-2 col-10 pt-2"><a class="btn btn-default" href="{% url 'user:profile' %}">返回</a> <button class="btn btn-success ml-2" onclick="changeuserprofile(this);">提交</button><span id="feed_error" class="ml-2" style="color:red;"></span></div>
             </div>
             <!-- /.card-body -->
           </div>
diff --git a/templates/user/user.html b/templates/user/user.html
index 8202094..ad4eb51 100644
--- a/templates/user/user.html
+++ b/templates/user/user.html
@@ -23,7 +23,7 @@
 	{% endblock navheader %}
 	
 		  {% block content %}
-          <div class="card">
+          <div class="card card-primary">
             <div class="card-header">
               <h3 class="card-title">用户信息</h3>
 				<div class="card-tools">
@@ -50,7 +50,7 @@ <h3 class="card-title">用户信息</h3>
 				<div class="col-3 pt-1 pb-1 border-bottom">微信：</div><div class="col-9 pt-1 pb-1 border-bottom">{{ user.weixin | default:'' }}</div>
 				<div class="col-3 pt-1 pb-1 border-bottom">QQ：</div><div class="col-9 pt-1 pb-1 border-bottom">{{ user.qq | default:'' }}</div>
 				<div class="col-3 pt-1 pb-1 border-bottom">性别：</div><div class="col-9 pt-1 pb-1 border-bottom">{{ user.get_sex_display }}</div>
-				<div class="col-3 pt-1 pb-1 border-bottom">是否启用：</div><div class="col-9 pt-1 pb-1 border-bottom">{% if user.enabled %}启用{% else %}<span style="color:red">禁用<span>{% endif %}</div>
+				<div class="col-3 pt-1 pb-1 border-bottom">是否启用：</div><div class="col-9 pt-1 pb-1 border-bottom">{% if user.enabled %}<span class="badge badge-success">启用</span>{% else %}<span class="badge badge-danger">禁用</span>{% endif %}</div>
 				<div class="col-3 pt-1 pb-1 border-bottom">角色：</div><div class="col-9 pt-1 pb-1 border-bottom">{{ user.get_role_display }}</div>
 				<div class="col-3 pt-1 pb-1 border-bottom">所属组：</div><div class="col-9 pt-1 pb-1 border-bottom">{% if user.groups.all %}{% for group in user.groups.all %}<a href="{% url 'user:group' group.id %}" class="btn btn-sm btn-success btn-flat">{{ group.group_name }}</a>&nbsp;&nbsp;{% endfor %}{% else %}{% endif %}</div>
 				{% count_user_hosts user.username as hosts_count %}
diff --git a/templates/user/user_add.html b/templates/user/user_add.html
index e1102df..2703597 100644
--- a/templates/user/user_add.html
+++ b/templates/user/user_add.html
@@ -22,119 +22,117 @@
 	{% endblock navheader %}
 	
 		  {% block content %}
-          <div class="card">
-            <div class="card-header">
-              <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>
-				  </button>
-				  <button type="button" class="btn btn-tool" data-widget="maximize">
-				  <i class="fas fa-expand"></i>
-                  </button>
-				  <button type="button" class="btn btn-tool" data-widget="remove">
-					<i class="fas fa-times"></i>
-				  </button>
-				</div>
-            </div>
-            <!-- /.card-header -->
-            <div class="card-body row">
-				<div class="col-12">
-					<div class="alert alert-warning alert-dismissible" style="font-size:0.9rem;">
-						<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-						提示：添加后用户名不可修改.
+		  <div class="row">
+			  <div class="col-md-6">
+				  <div class="card card-primary">
+					<div class="card-header">
+					  <h3 class="card-title">必填</h3>
 					</div>
-				</div>
-				<div class="col-2 pt-1 pb-1">用户名<span style="color:red;"> * </span>：</div><div class="col-10 pt-1 pb-1"><input class="form-control" type="text" id="username" onkeyup="check_username();" onblur="check_newpasswd();"></div>
-				<div class="offset-2 col-10 pb-1"><small id="username_error" style="color:red;"></small></div>
-				
-				<div class="col-2 pt-1 pb-1">密码<span style="color:red;"> * </span>：</div><div class="col-10 pt-1 pb-1"><input type="password" class="form-control" id="newpasswd" onkeyup="check_newpasswd();" onblur="check_newpasswd();" maxlength="256"></div>
-				<div class="offset-2 col-10 pb-1"><small id="newpasswd_error" style="color:red;"></small></div>
-				
-				<div class="col-2 pt-1 pb-1">确认密码<span style="color:red;"> * </span>：</div><div class="col-10 pt-1 pb-1"><input type="password" class="form-control" id="newpasswdagain" onkeyup="check_newpasswdagain();" onblur="check_newpasswdagain();" maxlength="256"></div>
-				<div class="offset-2 col-10 pb-1"><small id="newpasswdagain_error" style="color:red;"></small></div>
+					<!-- /.card-header -->
+					<div class="card-body row">
+						<div class="col-2 pt-1 pb-1">用户名<span style="color:red;"> * </span>：</div><div class="col-10 pt-1 pb-1"><input class="form-control" type="text" id="username" onkeyup="check_username();" onblur="check_newpasswd();"></div>
+						<div class="offset-2 col-10 pb-1"><small id="username_error" style="color:red;"></small></div>
+						
+						<div class="col-2 pt-1 pb-1">密码<span style="color:red;"> * </span>：</div><div class="col-10 pt-1 pb-1"><input type="password" class="form-control" id="newpasswd" onkeyup="check_newpasswd();" onblur="check_newpasswd();" maxlength="256"></div>
+						<div class="offset-2 col-10 pb-1"><small id="newpasswd_error" style="color:red;"></small></div>
+						
+						<div class="col-2 pt-1 pb-1">确认密码<span style="color:red;"> * </span>：</div><div class="col-10 pt-1 pb-1"><input type="password" class="form-control" id="newpasswdagain" onkeyup="check_newpasswdagain();" onblur="check_newpasswdagain();" maxlength="256"></div>
+						<div class="offset-2 col-10 pb-1"><small id="newpasswdagain_error" style="color:red;"></small></div>
 
-				<div class="col-2 pt-1 pb-1">昵称<span style="color:red;"> * </span>：</div><div class="col-10 pt-1 pb-1"><input class="form-control" type="text" id="nickname" onkeyup="check_nickname();" onblur="check_nickname();"></div>
-				<div class="offset-2 col-10 pb-1"><small id="nickname_error" style="color:red;"></small></div>
-				
-				<div class="col-2 pt-1 pb-1">邮箱<span style="color:red;"> * </span>：</div><div class="col-10 pt-1 pb-1"><input class="form-control" type="text" id="email" onkeyup="check_email();" onblur="check_email();"></div>
-				<div class="offset-2 col-10 pb-1"><small id="email_error" style="color:red;"></small></div>
-				
-				<div class="col-2 pt-1 pb-1">手机：</div><div class="col-10 pt-1 pb-1"><input class="form-control" type="text" id="phone" onkeyup="check_phone();" onblur="check_phone();"></div>
-				<div class="offset-2 col-10 pb-1"><small id="phone_error" style="color:red;"></small></div>
-				
-				<div class="col-2 pt-1 pb-1">微信：</div><div class="col-10 pt-1 pb-1"><input class="form-control" type="text" id="weixin" onkeyup="check_weixin();" onblur="check_weixin();"></div>
-				<div class="offset-2 col-10 pb-1"><small id="weixin_error" style="color:red;"></small></div>
-				
-				<div class="col-2 pt-1 pb-1">QQ：</div><div class="col-10 pt-1 pb-1"><input class="form-control" type="text" id="qq" onkeyup="check_qq();" onblur="check_qq();"></div>
-				<div class="offset-2 col-10 pb-1"><small id="qq_error" style="color:red;"></small></div>
-				
-				<div class="col-2 pt-1 pb-1">用户组：</div>
-				<div class="col-5 pt-1 pb-1">
-				  <div class="form-group">
-                    <span>所属组</span>
-                    <select multiple class="form-control" id="group_select_left" style="min-height:150px">
-                    </select>
-                  </div>
-				</div>
-				<div class="col-5 pt-1 pb-1">
-				  <div class="form-group">
-                    <span>其他组</span>
-                    <select multiple class="form-control" id="group_select_right" style="min-height:150px">
-					  {% for group in all_groups %}
-					  <option value="{{ group.id }}">{{ group.group_name }}</option>
-					  {% endfor %}
-                    </select>
-                  </div>
-				</div>
-				
-				<div class="col-2 pt-1 pb-1">主机：</div>
-				<div class="col-5 pt-1 pb-1">
-				  <div class="form-group">
-                    <span>拥有主机</span>
-                    <select multiple class="form-control" id="host_select_left" style="min-height:150px">
-                    </select>
-                  </div>
-				</div>
-				<div class="col-5 pt-1 pb-1">
-				  <div class="form-group">
-                    <span>其他主机</span>
-                    <select multiple class="form-control" id="host_select_right" style="min-height:150px">
-					  {% for host in all_hosts %}
-					  <option value="{{ host.id }}">{{ host.hostname }}_{{ host.ip }}_{{ host.remote_user.username }}</option>
-					  {% endfor %}
-                    </select>
-                  </div>
-				</div>
-				
-				<div class="col-2 pt-1 pb-2">性别：</div>
-				<div class="col-10 pt-1 pb-2">
-				  <select class="form-control" id="sex" style="width: 100%;">
-					{% for sex in sex_choices %}
-                    <option value="{{ sex.0 }}">{{ sex.1 }}</option>
-					{% endfor %}
-                  </select>
-				</div>
-				<div class="col-2 pt-1 pb-2">角色：</div>
-				<div class="col-10 pt-1 pb-2">
-				  <select class="form-control" id="role" style="width: 100%;">
-					{% for role in role_choices %}
-					<option value="{{ role.0 }}">{{ role.1 }}</option>
-					{% endfor %}
-                  </select>
-				</div>
-				<div class="col-2 pt-1 pb-1">备注：</div><div class="col-10 pt-1 pb-1"><textarea id="memo" class="form-control"></textarea></div>
-				<div class="offset-2 col-10 pt-1 pb-1">
-					<div class="custom-switch custom-switch-on-success">
-                      <input type="checkbox" class="custom-control-input" id="enabled" checked>
-                      <label class="custom-control-label" for="enabled">启用</label>
-                    </div>
-				</div>
-				<div class="offset-2 col-10 pt-2"><button class="btn btn-default" type="reset">重置</button><button class="btn btn-success ml-2" onclick="changeuserprofile(this);">提交</button><span id="feed_error" class="ml-2" style="color:red;"></span></div>
-            </div>
-            <!-- /.card-body -->
-          </div>
-          <!-- /.card --> 
+						<div class="col-2 pt-1 pb-1">昵称<span style="color:red;"> * </span>：</div><div class="col-10 pt-1 pb-1"><input class="form-control" type="text" id="nickname" onkeyup="check_nickname();" onblur="check_nickname();"></div>
+						<div class="offset-2 col-10 pb-1"><small id="nickname_error" style="color:red;"></small></div>
+						
+						<div class="col-2 pt-1 pb-1">邮箱<span style="color:red;"> * </span>：</div><div class="col-10 pt-1 pb-1"><input class="form-control" type="text" id="email" onkeyup="check_email();" onblur="check_email();"></div>
+						<div class="offset-2 col-10 pb-1"><small id="email_error" style="color:red;"></small></div>
+						
+						<div class="col-2 pt-1 pb-2">性别：</div>
+						<div class="col-10 pt-1 pb-2">
+						  <select class="form-control" id="sex" style="width: 100%;">
+							{% for sex in sex_choices %}
+							<option value="{{ sex.0 }}">{{ sex.1 }}</option>
+							{% endfor %}
+						  </select>
+						</div>
+						<div class="col-2 pt-1 pb-2">角色：</div>
+						<div class="col-10 pt-1 pb-2">
+						  <select class="form-control" id="role" style="width: 100%;">
+							{% for role in role_choices %}
+							<option value="{{ role.0 }}">{{ role.1 }}</option>
+							{% endfor %}
+						  </select>
+						</div>
+						<div class="offset-2 col-10 pt-1 pb-1">
+							<div class="custom-switch custom-switch-on-success">
+							  <input type="checkbox" class="custom-control-input" id="enabled" checked>
+							  <label class="custom-control-label" for="enabled">启用</label>
+							</div>
+						</div>
+						<div class="offset-2 col-10 pt-2"><a class="btn btn-default" href="{% url 'user:users' %}">返回</a> <button class="btn btn-success ml-2" onclick="changeuserprofile(this);">提交</button><span id="feed_error" class="ml-2" style="color:red;"></span></div>
+					</div>
+					<!-- /.card-body -->
+				  </div>
+				  <!-- /.card --> 
+			  </div>
+			  <div class="col-md-6">
+				  <div class="card card-secondary">
+					<div class="card-header">
+					  <h3 class="card-title">选填</h3>
+					</div>
+					<!-- /.card-header -->
+					<div class="card-body row">
+						<div class="col-2 pt-1 pb-1">手机：</div><div class="col-10 pt-1 pb-1"><input class="form-control" type="text" id="phone" onkeyup="check_phone();" onblur="check_phone();"></div>
+						<div class="offset-2 col-10 pb-1"><small id="phone_error" style="color:red;"></small></div>
+						
+						<div class="col-2 pt-1 pb-1">微信：</div><div class="col-10 pt-1 pb-1"><input class="form-control" type="text" id="weixin" onkeyup="check_weixin();" onblur="check_weixin();"></div>
+						<div class="offset-2 col-10 pb-1"><small id="weixin_error" style="color:red;"></small></div>
+						
+						<div class="col-2 pt-1 pb-1">QQ：</div><div class="col-10 pt-1 pb-1"><input class="form-control" type="text" id="qq" onkeyup="check_qq();" onblur="check_qq();"></div>
+						<div class="offset-2 col-10 pb-1"><small id="qq_error" style="color:red;"></small></div>
+						
+						<div class="col-2 pt-1 pb-1">用户组：</div>
+						<div class="col-5 pt-1 pb-1">
+						  <div class="form-group">
+							<span>所属组</span>
+							<select multiple class="form-control" id="group_select_left" style="min-height:150px">
+							</select>
+						  </div>
+						</div>
+						<div class="col-5 pt-1 pb-1">
+						  <div class="form-group">
+							<span>其他组</span>
+							<select multiple class="form-control" id="group_select_right" style="min-height:150px">
+							  {% for group in all_groups %}
+							  <option value="{{ group.id }}">{{ group.group_name }}</option>
+							  {% endfor %}
+							</select>
+						  </div>
+						</div>
+						
+						<div class="col-2 pt-1 pb-1">主机：</div>
+						<div class="col-5 pt-1 pb-1">
+						  <div class="form-group">
+							<span>拥有主机</span>
+							<select multiple class="form-control" id="host_select_left" style="min-height:150px">
+							</select>
+						  </div>
+						</div>
+						<div class="col-5 pt-1 pb-1">
+						  <div class="form-group">
+							<span>其他主机</span>
+							<select multiple class="form-control" id="host_select_right" style="min-height:150px">
+							  {% for host in all_hosts %}
+							  <option value="{{ host.id }}">{{ host.hostname }}_{{ host.ip }}_{{ host.remote_user.username }}</option>
+							  {% endfor %}
+							</select>
+						  </div>
+						</div>
+						<div class="col-2 pt-1 pb-1">备注：</div><div class="col-10 pt-1 pb-1"><textarea id="memo" class="form-control"></textarea></div>
+					</div>
+					<!-- /.card-body -->
+				  </div>
+				  <!-- /.card --> 
+			  </div>
+		  </div>
 		  {% endblock content %}
 
 {% block js %}
diff --git a/templates/user/user_edit.html b/templates/user/user_edit.html
index 0fd687e..b59abe8 100644
--- a/templates/user/user_edit.html
+++ b/templates/user/user_edit.html
@@ -22,112 +22,118 @@
 	{% endblock navheader %}
 	
 		  {% block content %}
-          <div class="card">
-            <div class="card-header">
-              <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>
-				  </button>
-				  <button type="button" class="btn btn-tool" data-widget="maximize">
-				  <i class="fas fa-expand"></i>
-                  </button>
-				  <button type="button" class="btn btn-tool" data-widget="remove">
-					<i class="fas fa-times"></i>
-				  </button>
-				</div>
-            </div>
-            <!-- /.card-header -->
-            <div class="card-body row">
-				<input type="text" id="userid" value="{{ user.id }}" hidden>
-				<div class="col-2 pt-1 pb-1">用户名：</div><div class="col-10 pt-1 pb-1"><input class="form-control" type="text" id="username" value="{{ user.username }}" disabled></div>
-				<div class="col-2 pt-1 pb-1">昵称<span style="color:red;"> * </span>：</div><div class="col-10 pt-1 pb-1"><input class="form-control" type="text" id="nickname"  value="{{ user.nickname }}" onkeyup="check_nickname();" onblur="check_nickname();"></div>
-				<div class="offset-2 col-10 pb-1"><small id="nickname_error" style="color:red;"></small></div>
-				
-				<div class="col-2 pt-1 pb-1">邮箱<span style="color:red;"> * </span>：</div><div class="col-10 pt-1 pb-1"><input class="form-control" type="text" id="email" value="{{ user.email }}" onkeyup="check_email();" onblur="check_email();"></div>
-				<div class="offset-2 col-10 pb-1"><small id="email_error" style="color:red;"></small></div>
-				
-				<div class="col-2 pt-1 pb-1">手机：</div><div class="col-10 pt-1 pb-1"><input class="form-control" type="text" id="phone" value="{{ user.phone | default:'' }}" onkeyup="check_phone();" onblur="check_phone();"></div>
-				<div class="offset-2 col-10 pb-1"><small id="phone_error" style="color:red;"></small></div>
-				
-				<div class="col-2 pt-1 pb-1">微信：</div><div class="col-10 pt-1 pb-1"><input class="form-control" type="text" id="weixin" value="{{ user.weixin | default:'' }}" onkeyup="check_weixin();" onblur="check_weixin();"></div>
-				<div class="offset-2 col-10 pb-1"><small id="weixin_error" style="color:red;"></small></div>
-				
-				<div class="col-2 pt-1 pb-1">QQ：</div><div class="col-10 pt-1 pb-1"><input class="form-control" type="text" id="qq" value="{{ user.qq | default:'' }}" onkeyup="check_qq();" onblur="check_qq();"></div>
-				<div class="offset-2 col-10 pb-1"><small id="qq_error" style="color:red;"></small></div>
-				
-				<div class="col-2 pt-1 pb-1">用户组：</div>
-				<div class="col-5 pt-1 pb-1">
-				  <div class="form-group">
-                    <span>所属组</span>
-                    <select multiple class="form-control" id="group_select_left" style="min-height:150px">
-					  {% for group in user.groups.all %}
-					  <option value="{{ group.id }}">{{ group.group_name }}</option>
-					  {% endfor %}
-                    </select>
-                  </div>
-				</div>
-				<div class="col-5 pt-1 pb-1">
-				  <div class="form-group">
-                    <span>其他组</span>
-                    <select multiple class="form-control" id="group_select_right" style="min-height:150px">
-					  {% for group in other_groups %}
-					  <option value="{{ group.id }}">{{ group.group_name }}</option>
-					  {% endfor %}
-                    </select>
-                  </div>
-				</div>
-				
-				<div class="col-2 pt-1 pb-1">主机：</div>
-				<div class="col-5 pt-1 pb-1">
-				  <div class="form-group">
-                    <span>拥有主机</span>
-                    <select multiple class="form-control" id="host_select_left" style="min-height:150px">
-					  {% for host in user.remote_user_bind_hosts.all %}
-					  <option value="{{ host.id }}">{{ host.hostname }}_{{ host.ip }}_{{ host.remote_user.username }}</option>
-					  {% endfor %}
-                    </select>
-                  </div>
-				</div>
-				<div class="col-5 pt-1 pb-1">
-				  <div class="form-group">
-                    <span>其他主机</span>
-                    <select multiple class="form-control" id="host_select_right" style="min-height:150px">
-					  {% for host in other_hosts %}
-					  <option value="{{ host.id }}">{{ host.hostname }}_{{ host.ip }}_{{ host.remote_user.username }}</option>
-					  {% endfor %}
-                    </select>
-                  </div>
-				</div>
-				
-				<div class="col-2 pt-1 pb-2">性别：</div>
-				<div class="col-10 pt-1 pb-2">
-				  <select class="form-control" id="sex" style="width: 100%;">
-					{% for sex in sex_choices %}
-                    <option value="{{ sex.0 }}" {% if user.sex == sex.0 %}selected="selected"{% endif %}>{{ sex.1 }}</option>
-					{% endfor %}
-                  </select>
-				</div>
-				<div class="col-2 pt-1 pb-2">角色：</div>
-				<div class="col-10 pt-1 pb-2">
-				  <select class="form-control" id="role" style="width: 100%;">
-					{% for role in role_choices %}
-					<option value="{{ role.0 }}" {% if user.role == role.0 %}selected="selected"{% endif %}>{{ role.1 }}</option>
-					{% endfor %}
-                  </select>
-				</div>
-				<div class="col-2 pt-1 pb-1">备注：</div><div class="col-10 pt-1 pb-1"><textarea id="memo" class="form-control">{{ user.memo | default:'' }}</textarea></div>
-				<div class="offset-2 col-10 pt-1 pb-1">
-					<div class="custom-switch custom-switch-on-success">
-                      <input type="checkbox" class="custom-control-input" id="enabled" {% if user.enabled %}checked{% endif %}>
-                      <label class="custom-control-label" for="enabled">启用</label>
-                    </div>
-				</div>
-				<div class="offset-2 col-10 pt-2"><button class="btn btn-default" type="reset">重置</button><button class="btn btn-success ml-2" onclick="changeuserprofile(this);">提交</button><span id="feed_error" class="ml-2" style="color:red;"></span></div>
-            </div>
-            <!-- /.card-body -->
-          </div>
-          <!-- /.card --> 
+		  <div class="row">
+			  <div class="col-md-6">
+				  <div class="card card-primary">
+					<div class="card-header">
+					  <h3 class="card-title">用户信息</h3>
+					</div>
+					<!-- /.card-header -->
+					<div class="card-body row">
+						<input type="text" id="userid" value="{{ user.id }}" hidden>
+						<div class="col-2 pt-1 pb-1">用户名：</div><div class="col-10 pt-1 pb-1"><input class="form-control" type="text" id="username" value="{{ user.username }}" disabled></div>
+						<div class="col-2 pt-1 pb-1">昵称<span style="color:red;"> * </span>：</div><div class="col-10 pt-1 pb-1"><input class="form-control" type="text" id="nickname"  value="{{ user.nickname }}" onkeyup="check_nickname();" onblur="check_nickname();"></div>
+						<div class="offset-2 col-10 pb-1"><small id="nickname_error" style="color:red;"></small></div>
+						
+						<div class="col-2 pt-1 pb-1">邮箱<span style="color:red;"> * </span>：</div><div class="col-10 pt-1 pb-1"><input class="form-control" type="text" id="email" value="{{ user.email }}" onkeyup="check_email();" onblur="check_email();"></div>
+						<div class="offset-2 col-10 pb-1"><small id="email_error" style="color:red;"></small></div>
+
+						<div class="col-2 pt-1 pb-2">性别：</div>
+						<div class="col-10 pt-1 pb-2">
+						  <select class="form-control" id="sex" style="width: 100%;">
+							{% for sex in sex_choices %}
+							<option value="{{ sex.0 }}" {% if user.sex == sex.0 %}selected="selected"{% endif %}>{{ sex.1 }}</option>
+							{% endfor %}
+						  </select>
+						</div>
+						<div class="col-2 pt-1 pb-2">角色：</div>
+						<div class="col-10 pt-1 pb-2">
+						  <select class="form-control" id="role" style="width: 100%;">
+							{% for role in role_choices %}
+							<option value="{{ role.0 }}" {% if user.role == role.0 %}selected="selected"{% endif %}>{{ role.1 }}</option>
+							{% endfor %}
+						  </select>
+						</div>
+						<div class="offset-2 col-10 pt-1 pb-1">
+							<div class="custom-switch custom-switch-on-success">
+							  <input type="checkbox" class="custom-control-input" id="enabled" {% if user.enabled %}checked{% endif %}>
+							  <label class="custom-control-label" for="enabled">启用</label>
+							</div>
+						</div>
+						<div class="offset-2 col-10 pt-2"><a class="btn btn-default" href="{% url 'user:users' %}">返回</a> <button class="btn btn-success ml-2" onclick="changeuserprofile(this);">提交</button><span id="feed_error" class="ml-2" style="color:red;"></span></div>
+					</div>
+					<!-- /.card-body -->
+				  </div>
+				  <!-- /.card -->
+			  </div>
+			  
+			  <div class="col-md-6">
+				  <div class="card card-secondary">
+					<div class="card-header">
+					  <h3 class="card-title">选填</h3>
+					</div>
+					<!-- /.card-header -->
+					<div class="card-body row">
+						<div class="col-2 pt-1 pb-1">手机：</div><div class="col-10 pt-1 pb-1"><input class="form-control" type="text" id="phone" value="{{ user.phone | default:'' }}" onkeyup="check_phone();" onblur="check_phone();"></div>
+						<div class="offset-2 col-10 pb-1"><small id="phone_error" style="color:red;"></small></div>
+						
+						<div class="col-2 pt-1 pb-1">微信：</div><div class="col-10 pt-1 pb-1"><input class="form-control" type="text" id="weixin" value="{{ user.weixin | default:'' }}" onkeyup="check_weixin();" onblur="check_weixin();"></div>
+						<div class="offset-2 col-10 pb-1"><small id="weixin_error" style="color:red;"></small></div>
+						
+						<div class="col-2 pt-1 pb-1">QQ：</div><div class="col-10 pt-1 pb-1"><input class="form-control" type="text" id="qq" value="{{ user.qq | default:'' }}" onkeyup="check_qq();" onblur="check_qq();"></div>
+						<div class="offset-2 col-10 pb-1"><small id="qq_error" style="color:red;"></small></div>
+						
+						<div class="col-2 pt-1 pb-1">用户组：</div>
+						<div class="col-5 pt-1 pb-1">
+						  <div class="form-group">
+							<span>所属组</span>
+							<select multiple class="form-control" id="group_select_left" style="min-height:150px">
+							  {% for group in user.groups.all %}
+							  <option value="{{ group.id }}">{{ group.group_name }}</option>
+							  {% endfor %}
+							</select>
+						  </div>
+						</div>
+						<div class="col-5 pt-1 pb-1">
+						  <div class="form-group">
+							<span>其他组</span>
+							<select multiple class="form-control" id="group_select_right" style="min-height:150px">
+							  {% for group in other_groups %}
+							  <option value="{{ group.id }}">{{ group.group_name }}</option>
+							  {% endfor %}
+							</select>
+						  </div>
+						</div>
+						
+						<div class="col-2 pt-1 pb-1">主机：</div>
+						<div class="col-5 pt-1 pb-1">
+						  <div class="form-group">
+							<span>拥有主机</span>
+							<select multiple class="form-control" id="host_select_left" style="min-height:150px">
+							  {% for host in user.remote_user_bind_hosts.all %}
+							  <option value="{{ host.id }}">{{ host.hostname }}_{{ host.ip }}_{{ host.remote_user.username }}</option>
+							  {% endfor %}
+							</select>
+						  </div>
+						</div>
+						<div class="col-5 pt-1 pb-1">
+						  <div class="form-group">
+							<span>其他主机</span>
+							<select multiple class="form-control" id="host_select_right" style="min-height:150px">
+							  {% for host in other_hosts %}
+							  <option value="{{ host.id }}">{{ host.hostname }}_{{ host.ip }}_{{ host.remote_user.username }}</option>
+							  {% endfor %}
+							</select>
+						  </div>
+						</div>
+						<div class="col-2 pt-1 pb-1">备注：</div><div class="col-10 pt-1 pb-1"><textarea id="memo" class="form-control">{{ user.memo | default:'' }}</textarea></div>
+					</div>
+					<!-- /.card-body -->
+				  </div>
+				  <!-- /.card -->
+			  </div>
+			  
+		  </div>
 		  {% endblock content %}
 
 {% block js %}
diff --git a/templates/user/users.html b/templates/user/users.html
index bf185ee..32c5c2d 100644
--- a/templates/user/users.html
+++ b/templates/user/users.html
@@ -26,9 +26,9 @@
 	{% endblock navheader %}
 	
 		  {% block content %}
-          <div class="card">
+          <div class="card card-primary card-outline">
             <div class="card-header">
-              <h3 class="card-title">用户<a href="{% url 'user:user_add' %}" class="btn btn-sm btn-outline-success ml-3 addsoft">新增 + </a></h3>
+              <h3 class="card-title">用户<a href="{% url 'user:user_add' %}" class="btn btn-sm btn-outline-success ml-3 addsoft"><i class="fas fa-plus fa-sm"></i> 新增</a></h3>
 				<div class="card-tools">
 				  <button type="button" class="btn btn-tool" data-widget="collapse">
 					<i class="fas fa-minus"></i>
@@ -61,15 +61,15 @@ <h3 class="card-title">用户<a href="{% url 'user:user_add' %}" class="btn btn-
                 <tbody>
 				{% for user in users %}
                 <tr id="user-{{ user.id }}">
-				  <td><a href="{% url 'user:user' user.id %}">{{ user.username }}</a></td>
+				  <td>{{ user.username }}</td>
 				  <td>{{ user.nickname }}</td>
 				  <td>{{ user.email }}</td>
 				  {% count_user_hosts user.username as hosts_count %}
 				  <td>{{ hosts_count }}</td>
 				  {% if user.enabled %}
-				  <td>启用</td>
+				  <td><span class="badge badge-success">启用</span></td>
 				  {% else %}
-				  <td style="color:red;">禁用</td>
+				  <td><span class="badge badge-danger">禁用</span></td>
 				  {% endif %}
 				  <td>{{ user.get_role_display }}</td>
 				  
@@ -79,11 +79,11 @@ <h3 class="card-title">用户<a href="{% url 'user:user_add' %}" class="btn btn-
 				  <td>{{ user.create_time|date:"Y/m/d H:i:s" }}</td>
 				  <td>{{ user.last_login_time|date:"Y/m/d H:i:s"|default:''}}</td>
 				  <td>
-				  <a href="{% url 'user:user' user.id %}">详细</a>&nbsp;&nbsp;<a href="{% url 'user:user_edit' user.id %}">编辑</a>
+				  <a href="{% url 'user:user' user.id %}" class="btn btn-primary btn-sm"><i class="fas fa-folder"></i> 详细</a>&nbsp;&nbsp;<a href="{% url 'user:user_edit' user.id %}" class="btn btn-info btn-sm"><i class="fas fa-pencil-alt"></i> 编辑</a>
 				  {% if user.groups.all.count == 0 and user.remote_user_bind_hosts.all.count == 0 %}
-				  &nbsp;&nbsp;<a href="javascript:void(0)" id="{{ user.id }}" title="{{ user.username }}" onclick="createdeletemodal(this);">删除</a>
+				  &nbsp;&nbsp;<a href="javascript:void(0)" id="{{ user.id }}" title="{{ user.username }}" onclick="createdeletemodal(this);" class="btn btn-danger btn-sm"><i class="fas fa-trash"></i> 删除</a>
 				  {% else %}
-				  &nbsp;&nbsp;删除
+				  &nbsp;&nbsp;<a href="javascript:void(0)" class="btn btn-danger btn-sm disabled"><i class="fas fa-trash"></i> 删除</a>
 				  {% endif %}
 				  </td>
                 </tr>
diff --git a/templates/webssh/hosts.html b/templates/webssh/hosts.html
index 5d8dad0..10abcac 100644
--- a/templates/webssh/hosts.html
+++ b/templates/webssh/hosts.html
@@ -21,7 +21,7 @@
 	{% endblock navheader %}
 	
 		  {% block content %}
-          <div class="card">
+          <div class="card card-primary card-outline">
             <div class="card-header">
               <h3 class="card-title">web终端</h3>
 				<div class="card-tools">
@@ -60,7 +60,7 @@ <h3 class="card-title">web终端</h3>
 				  <td>{{ host.get_type_display }}</td>
 				  <td>{{ host.get_env_display }}</td>
 				  <td>{{ host.ip }}</td>
-				  <td>{{ host.get_protocol_display }}</td>
+				  <td><span class="badge badge-success">{{ host.get_protocol_display }}</span></td>
 				  <td>{{ host.port }}</td>
 				  <td>{{ host.release }}</td>
 				  {% if host.remote_user %}
@@ -80,10 +80,10 @@ <h3 class="card-title">web终端</h3>
 					{% endif %}
 						{% csrf_token %}
 						<input type="text" name="hostid" value="{{ host.id }}" hidden>
-						<button type="submit" class="btn btn-block btn-sm btn-success btn-flat">连接</button>
+						<button type="submit" class="btn btn-block btn-sm btn-success btn-flat"><i class="fas fa-network-wired"></i> 连接</button>
 					</form>
 					{% else %}
-					<button class="btn btn-block btn-sm btn-secondary btn-flat disabled">连接</button>
+					<button class="btn btn-block btn-sm btn-secondary btn-flat disabled"><i class="fas fa-network-wired"></i> 连接</button>
 					{% endif %}
 					
 				  </td>
diff --git a/templates/webssh/logs.html b/templates/webssh/logs.html
index 25aaaa2..c79055d 100644
--- a/templates/webssh/logs.html
+++ b/templates/webssh/logs.html
@@ -21,7 +21,7 @@
 	{% endblock navheader %}
 	
 		  {% block content %}
-          <div class="card">
+          <div class="card card-primary card-outline">
             <div class="card-header">
               <h3 class="card-title">web终端日志</h3>
 				<div class="card-tools">
@@ -60,7 +60,7 @@ <h3 class="card-title">web终端日志</h3>
 				  <td>{{ log.user | default:'' }}</td>
 				  <td>{{ log.hostname }}</td>
 				  <td>{{ log.ip }}</td>
-				  <td>{{ log.protocol }}</td>
+				  <td><span class="badge badge-success">{{ log.protocol }}</span></td>
 				  <td>{{ log.port }}</td>
 				  <td>{{ log.username }}</td>
 				  <td>{{ log.cmd | linebreaksbr | truncatechars_html:15 | default:'' }}<br>...</td>
diff --git a/templates/webssh/sessions.html b/templates/webssh/sessions.html
index b8cb9c1..ad0b349 100644
--- a/templates/webssh/sessions.html
+++ b/templates/webssh/sessions.html
@@ -21,7 +21,7 @@
 	{% endblock navheader %}
 	
 		  {% block content %}
-          <div class="card">
+          <div class="card card-primary card-outline">
             <div class="card-header">
               <h3 class="card-title">在线会话</h3>
 				<div class="card-tools">
@@ -38,7 +38,7 @@ <h3 class="card-title">在线会话</h3>
             </div>
             <!-- /.card-header -->
             <div class="card-body table-responsive">
-              <table id="datatables-lists" class="table table-bordered table-striped table-sm">
+              <table id="datatables-lists" class="table table-bordered table-hover">
                 <thead>
                 <tr>
 				  <th>ID</th>
@@ -63,7 +63,16 @@ <h3 class="card-title">在线会话</h3>
 				  <td>{{ session.username }}</td>
 				  <td><button class="btn btn-sm btn-success btn-flat">{{ session.get_protocol_display }}</button></td>
 				  <td>{{ session.create_time | date:"Y/m/d H:i:s" }}</td>
-				  <td><a href="javascript:void(0)" id="{{ session.id }}" title="{{ session.name }}" class="btn btn-block btn-sm btn-danger btn-flat" onclick="createdeletemodal(this);">断开</a></td>
+				  <td>
+
+					<form method="post" action="{% url 'webssh:terminal_view' %}" target="_blank" style="display:inline;">
+					{% csrf_token %}
+					<input type="text" name="sessionname" value="{{ session.name  }}" hidden>
+					<input type="text" name="group" value="{{ session.group  }}" hidden>
+					<button type="submit" class="btn btn-sm btn-success btn-flat"><i class="fas fa-folder"></i> 查看</button>
+					</form>&nbsp;&nbsp;
+					<a href="javascript:void(0)" id="{{ session.id }}" title="{{ session.name }}" group="{{ session.group }}" class="btn btn-sm btn-danger btn-flat" onclick="createdeletemodal(this);"><i class="far fa-times-circle"></i> 断开</a>
+				  </td>
                 </tr>
 				{% endfor %}
                 </tbody>
@@ -138,12 +147,13 @@ <h3 class="card-title">在线会话</h3>
 		var thisObj = $(event);	//js对象转jquery对象  
 		var session_id = thisObj.attr('id');
 		var session_name = thisObj.attr("title");
+		var session_group = thisObj.attr("group");
 		// 生成弹出框，使用 \ 换行
 		$("#modal-container").html('<div id="modal-delete-' + session_id + '" class="iziModal"><div class="container-fluid"><div class="row">\
 									<div class="col-12 p-3"><h5 class="text-center mt-3">确定要强制关闭会话 "' + session_name + '" 吗？</h5></div><div class="col-6 p-3">\
 									<button type="button" class="btn btn-block btn-secondary btn-flat" data-iziModal-close>取消</button></div><div class="col-6 p-3">\
 									<a href="javascript:void(0)"><button type="button" class="btn btn-block btn-success btn-flat" id="' + session_id + '-yes" title="\
-									' + session_name + '" onclick="deletethis(this);">确定</button></a></div></div></div></div>');
+									' + session_name + '" group="' + session_group + '" onclick="deletethis(this);">确定</button></a></div></div></div></div>');
 		
 		// 初始化弹出框
 		$("#modal-delete-" + session_id).iziModal({
@@ -170,6 +180,7 @@ <h3 class="card-title">在线会话</h3>
 		var thisObj = $(event);	//js对象转jquery对象
 		var session_id = thisObj.attr('id').split("-")[0];
 		var session_name = thisObj.attr("title");
+		var session_group = thisObj.attr("group");
 		csrfmiddlewaretoken = '{{ request.COOKIES.csrftoken }}';
 		$.ajax({
 			url: "{% url 'webssh_api:session_close' %}",
@@ -179,6 +190,7 @@ <h3 class="card-title">在线会话</h3>
 			data: {
 				'csrfmiddlewaretoken': csrfmiddlewaretoken,
 				'id': session_id,
+				'group': session_group,
 			},
 			timeout: 10000,
 			cache: true,
@@ -252,7 +264,7 @@ <h3 class="card-title">在线会话</h3>
 				$('#modal-delete-' + session_id).iziModal('close');
 				
 				// 消息框
-				toastr.success('成功关闭会话 "' + user_name + '"');
+				toastr.success('成功关闭会话 "' + session_name + '"');
 			}
 		};
 	}
diff --git a/templates/webssh/terminal.html b/templates/webssh/terminal.html
index 2ad3a19..85a4e36 100644
--- a/templates/webssh/terminal.html
+++ b/templates/webssh/terminal.html
@@ -12,6 +12,9 @@
   <!-- Theme style -->
   <link rel="stylesheet" href="{% static 'adminlte/dist/css/adminlte.min.css' %}">
   
+  <!-- Toastr -->
+  <link rel="stylesheet" href="{% static 'adminlte/plugins/toastr/toastr.min.css' %}">
+  
   <!-- webssh -->
   <link rel="stylesheet" href="{% static 'webssh/xterm.css' %}">
   <!--link rel="stylesheet" href="{% static 'webssh/style.css' %}"-->
@@ -33,6 +36,9 @@
 <!-- AdminLTE App -->
 <script src="{% static 'adminlte/dist/js/adminlte.min.js' %}"></script>
 
+<!-- Toastr -->
+<script src="{% static 'adminlte/plugins/toastr/toastr.min.js' %}"></script>
+
 <!-- webssh -->
 <script src="{% static 'webssh/xterm.js' %}"></script>
 <script src="{% static 'webssh/webssh.js' %}"></script>
diff --git a/templates/webssh/terminal_view.html b/templates/webssh/terminal_view.html
new file mode 100644
index 0000000..cbd3e85
--- /dev/null
+++ b/templates/webssh/terminal_view.html
@@ -0,0 +1,51 @@
+{% load static %}
+
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <title>{{ session.user }} - {{ session.username }}@{{ session.host }}:{{ session.port }} - {{ session.name }}</title>
+  <!-- Tell the browser to be responsive to screen width -->
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+
+  <!-- Theme style -->
+  <link rel="stylesheet" href="{% static 'adminlte/dist/css/adminlte.min.css' %}">
+  
+  <!-- Toastr -->
+  <link rel="stylesheet" href="{% static 'adminlte/plugins/toastr/toastr.min.css' %}">
+  
+  <!-- webssh -->
+  <link rel="stylesheet" href="{% static 'webssh/xterm.css' %}">
+  <!--link rel="stylesheet" href="{% static 'webssh/style.css' %}"-->
+
+</head>
+<body>
+
+<span id="group" hidden>{{ session.group }}</span>
+
+<div id="terminal"></div>
+
+<!-- jQuery -->
+<script src="{% static 'adminlte/plugins/jquery/jquery.min.js' %}"></script>
+<!-- Bootstrap 4 -->
+<script src="{% static 'adminlte/plugins/bootstrap/js/bootstrap.bundle.min.js' %}"></script>
+
+<!-- FastClick -->
+<script src="{% static 'adminlte/plugins/fastclick/fastclick.js' %}"></script>
+<!-- AdminLTE App -->
+<script src="{% static 'adminlte/dist/js/adminlte.min.js' %}"></script>
+
+<!-- Toastr -->
+<script src="{% static 'adminlte/plugins/toastr/toastr.min.js' %}"></script>
+
+<!-- webssh -->
+<script src="{% static 'webssh/xterm.js' %}"></script>
+<script src="{% static 'webssh/webssh.view.js' %}"></script>
+
+<script>
+	websocket();
+</script>
+
+</body>
+</html>
diff --git a/templates/webtelnet/terminal.html b/templates/webtelnet/terminal.html
index 2cea53c..5c8bf90 100644
--- a/templates/webtelnet/terminal.html
+++ b/templates/webtelnet/terminal.html
@@ -12,6 +12,9 @@
   <!-- Theme style -->
   <link rel="stylesheet" href="{% static 'adminlte/dist/css/adminlte.min.css' %}">
   
+  <!-- Toastr -->
+  <link rel="stylesheet" href="{% static 'adminlte/plugins/toastr/toastr.min.css' %}">
+  
   <!-- webtelnet -->
   <link rel="stylesheet" href="{% static 'webssh/xterm.css' %}">
   <!--link rel="stylesheet" href="{% static 'webssh/style.css' %}"-->
@@ -33,6 +36,9 @@
 <!-- AdminLTE App -->
 <script src="{% static 'adminlte/dist/js/adminlte.min.js' %}"></script>
 
+<!-- Toastr -->
+<script src="{% static 'adminlte/plugins/toastr/toastr.min.js' %}"></script>
+
 <!-- webtelnet -->
 <script src="{% static 'webssh/xterm.js' %}"></script>
 <script src="{% static 'webtelnet/webtelnet.js' %}"></script>
diff --git a/user/migrations/0005_auto_20190816_1344.py b/user/migrations/0005_auto_20190816_1344.py
new file mode 100644
index 0000000..24cd5ea
--- /dev/null
+++ b/user/migrations/0005_auto_20190816_1344.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.3 on 2019-08-16 13:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user', '0004_auto_20190812_0922'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='loginlog',
+            name='event_type',
+            field=models.SmallIntegerField(choices=[(1, '登陆'), (2, '退出'), (3, '登陆错误'), (4, '修改密码失败'), (5, '修改密码成功'), (6, '添加用户'), (7, '删除用户'), (8, '添加组'), (9, '删除组'), (10, '更新用户'), (11, '更新组'), (12, '添加主机'), (13, '删除主机'), (14, '更新主机'), (15, '添加主机用户'), (16, '删除主机用户'), (17, '更新主机用户'), (18, '停止在线会话')], default=1, verbose_name='事件类型'),
+        ),
+    ]
diff --git a/user/migrations/__pycache__/0005_auto_20190816_1344.cpython-37.pyc b/user/migrations/__pycache__/0005_auto_20190816_1344.cpython-37.pyc
new file mode 100644
index 0000000..8a888b8
Binary files /dev/null and b/user/migrations/__pycache__/0005_auto_20190816_1344.cpython-37.pyc differ
diff --git a/websocket/__pycache__/routing.cpython-37.pyc b/websocket/__pycache__/routing.cpython-37.pyc
index 27b00b5..2acca64 100644
Binary files a/websocket/__pycache__/routing.cpython-37.pyc and b/websocket/__pycache__/routing.cpython-37.pyc differ
diff --git a/websocket/routing.py b/websocket/routing.py
index 8fbca7b..c9343e0 100644
--- a/websocket/routing.py
+++ b/websocket/routing.py
@@ -1,10 +1,11 @@
 from django.urls import path
 # from webssh.websocket import WebSSH
-from webssh.websocket_layer import WebSSH
+from webssh.websocket_layer import WebSSH, WebSSH_view
 # from webtelnet.websocket import WebTelnet
 from webtelnet.websocket_layer import WebTelnet
 
 websocket_urlpatterns = [
     path('webssh/', WebSSH),
+    path('webssh/view/', WebSSH_view),
     path('webtelnet/', WebTelnet),
 ]
diff --git a/webssh/__pycache__/forms.cpython-37.pyc b/webssh/__pycache__/forms.cpython-37.pyc
index de0c666..7e4a70f 100644
Binary files a/webssh/__pycache__/forms.cpython-37.pyc and b/webssh/__pycache__/forms.cpython-37.pyc differ
diff --git a/webssh/__pycache__/models.cpython-37.pyc b/webssh/__pycache__/models.cpython-37.pyc
index 5accd21..0dadfc8 100644
Binary files a/webssh/__pycache__/models.cpython-37.pyc and b/webssh/__pycache__/models.cpython-37.pyc differ
diff --git a/webssh/__pycache__/ssh.cpython-37.pyc b/webssh/__pycache__/ssh.cpython-37.pyc
index aff4fdc..a7d24bf 100644
Binary files a/webssh/__pycache__/ssh.cpython-37.pyc and b/webssh/__pycache__/ssh.cpython-37.pyc differ
diff --git a/webssh/__pycache__/urls.cpython-37.pyc b/webssh/__pycache__/urls.cpython-37.pyc
index e2015ed..bd8cf3e 100644
Binary files a/webssh/__pycache__/urls.cpython-37.pyc and b/webssh/__pycache__/urls.cpython-37.pyc differ
diff --git a/webssh/__pycache__/views.cpython-37.pyc b/webssh/__pycache__/views.cpython-37.pyc
index f136f5d..31e157a 100644
Binary files a/webssh/__pycache__/views.cpython-37.pyc and b/webssh/__pycache__/views.cpython-37.pyc differ
diff --git a/webssh/__pycache__/views_api.cpython-37.pyc b/webssh/__pycache__/views_api.cpython-37.pyc
index 3dd650c..0b2fc53 100644
Binary files a/webssh/__pycache__/views_api.cpython-37.pyc and b/webssh/__pycache__/views_api.cpython-37.pyc differ
diff --git a/webssh/__pycache__/websocket_layer.cpython-37.pyc b/webssh/__pycache__/websocket_layer.cpython-37.pyc
index bb44d84..30aa050 100644
Binary files a/webssh/__pycache__/websocket_layer.cpython-37.pyc and b/webssh/__pycache__/websocket_layer.cpython-37.pyc differ
diff --git a/webssh/forms.py b/webssh/forms.py
index 27bdefa..0c58dc2 100644
--- a/webssh/forms.py
+++ b/webssh/forms.py
@@ -4,3 +4,7 @@
 class HostForm(forms.Form):
     hostid = forms.IntegerField(label="主机id")
 
+
+class HostViewForm(forms.Form):
+    sessionname = forms.CharField(label="会话名称")
+    group = forms.CharField(label="会话组")
diff --git a/webssh/migrations/0005_auto_20190816_1344.py b/webssh/migrations/0005_auto_20190816_1344.py
new file mode 100644
index 0000000..6b758d8
--- /dev/null
+++ b/webssh/migrations/0005_auto_20190816_1344.py
@@ -0,0 +1,22 @@
+# Generated by Django 2.2.3 on 2019-08-16 13:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('webssh', '0004_auto_20190813_1247'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='terminalsession',
+            options={'ordering': ['-create_time'], 'verbose_name': '在线会话', 'verbose_name_plural': '在线会话'},
+        ),
+        migrations.AddField(
+            model_name='terminalsession',
+            name='group',
+            field=models.CharField(default='chat_default', max_length=512, verbose_name='会话组'),
+        ),
+    ]
diff --git a/webssh/migrations/__pycache__/0005_auto_20190816_1344.cpython-37.pyc b/webssh/migrations/__pycache__/0005_auto_20190816_1344.cpython-37.pyc
new file mode 100644
index 0000000..0233275
Binary files /dev/null and b/webssh/migrations/__pycache__/0005_auto_20190816_1344.cpython-37.pyc differ
diff --git a/webssh/models.py b/webssh/models.py
index 55b4855..5191b9e 100644
--- a/webssh/models.py
+++ b/webssh/models.py
@@ -49,6 +49,7 @@ class TerminalSession(models.Model):
         (6, 'ftp'),
     )
     name = models.CharField(max_length=512, verbose_name='会话名称')
+    group = models.CharField(default='chat_default', max_length=512, verbose_name='会话组')
     user = models.CharField(max_length=128, verbose_name='用户')
     host = models.GenericIPAddressField(verbose_name='主机')
     port = models.SmallIntegerField(default=22, verbose_name='端口')
diff --git a/webssh/ssh.py b/webssh/ssh.py
index 62f2d58..db36cb7 100644
--- a/webssh/ssh.py
+++ b/webssh/ssh.py
@@ -2,6 +2,7 @@
 import threading
 from threading import Thread
 from .tools import get_key_obj
+from asgiref.sync import async_to_sync
 import socket
 import json
 import time
@@ -11,7 +12,8 @@ class SSH:
     def __init__(self, websocker, message):
         self.websocker = websocker
         self.message = message
-        self.cmd = ''
+        self.cmd = ''       # 多行命令
+        self.cmd_tmp = ''   # 一行命令
         self.res = ''
     
     # term 可以使用 ansi, linux, vt100, xterm, dumb，除了 dumb外其他都有颜色显示
@@ -41,7 +43,13 @@ def connect(self, host, user, password=None, ssh_key=None, port=22, timeout=30,
                 self.message['status'] = 0
                 self.message['message'] = recv
                 message = json.dumps(self.message)
-                self.websocker.send(message)
+                if self.websocker.send_flag == 0:
+                    self.websocker.send(message)
+                elif self.websocker.send_flag == 1:
+                    async_to_sync(self.websocker.channel_layer.group_send)(self.websocker.group, {
+                        "type": "chat.message",
+                        "text": message,
+                    })
                 self.res += recv
             
             # 创建3个线程将服务器返回的数据发送到django websocket（1个线程都可以）
@@ -54,7 +62,13 @@ def connect(self, host, user, password=None, ssh_key=None, port=22, timeout=30,
             self.cmd += self.message['message']
             self.res += self.message['message']
             message = json.dumps(self.message)
-            self.websocker.send(message)
+            if self.websocker.send_flag == 0:
+                self.websocker.send(message)
+            elif self.websocker.send_flag == 1:
+                async_to_sync(self.websocker.channel_layer.group_send)(self.websocker.group, {
+                    "type": "chat.message",
+                    "text": message,
+                })
             self.websocker.close(3001)
 
     def resize_pty(self, cols, rows):
@@ -71,9 +85,14 @@ def su_root(self, superuser, superpassword, wait_time=1):
     def django_to_ssh(self, data):
         try:
             self.channel.send(data)
-            if data == '\r':
+            if data == '\r':    # 记录命令
                 data = '\n'
-            self.cmd += data
+                if self.cmd_tmp.strip() != '':
+                    self.cmd_tmp += data
+                    self.cmd += self.cmd_tmp
+                    self.cmd_tmp = ''
+            else:
+                self.cmd_tmp += data
         except:
             self.close()
 
@@ -87,7 +106,13 @@ def websocket_to_django(self):
                 self.message['message'] = data
                 self.res += data
                 message = json.dumps(self.message)
-                self.websocker.send(message)
+                if self.websocker.send_flag == 0:
+                    self.websocker.send(message)
+                elif self.websocker.send_flag == 1:
+                    async_to_sync(self.websocker.channel_layer.group_send)(self.websocker.group, {
+                        "type": "chat.message",
+                        "text": message,
+                    })
         except:
             self.close()
 
@@ -95,7 +120,13 @@ def close(self):
         self.message['status'] = 1
         self.message['message'] = 'Connection closed...'
         message = json.dumps(self.message)
-        self.websocker.send(message)
+        if self.websocker.send_flag == 0:
+            self.websocker.send(message)
+        elif self.websocker.send_flag == 1:
+            async_to_sync(self.websocker.channel_layer.group_send)(self.websocker.group, {
+                "type": "chat.message",
+                "text": message,
+            })
         self.websocker.close()
         self.channel.close()
 
diff --git a/webssh/urls.py b/webssh/urls.py
index 3649988..1b067c8 100644
--- a/webssh/urls.py
+++ b/webssh/urls.py
@@ -6,6 +6,7 @@
 urlpatterns = [
     path('hosts/', views.hosts, name='hosts'),
     path('terminal/', views.terminal, name='terminal'),
+    path('terminal/view/', views.terminal_view, name='terminal_view'),
     path('logs/', views.logs, name='logs'),
     path('sessions/', views.sessions, name='sessions'),
 ]
diff --git a/webssh/views.py b/webssh/views.py
index f56b8a9..d14e681 100644
--- a/webssh/views.py
+++ b/webssh/views.py
@@ -4,7 +4,9 @@
 from util.tool import login_required, post_required, admin_required
 from django.http import JsonResponse
 from django.db.models import Q
-from .forms import HostForm
+from .forms import HostForm, HostViewForm
+from channels.layers import get_channel_layer
+from asgiref.sync import async_to_sync
 # Create your views here.
 
 
@@ -46,6 +48,20 @@ def sessions(request):
     return render(request, 'webssh/sessions.html', locals())
 
 
+@login_required
+@post_required
+def terminal_view(request):
+    hostview_form = HostViewForm(request.POST)
+    error_message = '请检查填写的内容!'
+    if hostview_form.is_valid():
+        name = hostview_form.cleaned_data.get('sessionname')
+        group = hostview_form.cleaned_data.get('group')
+        session = TerminalSession.objects.get(name=name, group=group)
+        return render(request, 'webssh/terminal_view.html', locals())
+
+    return JsonResponse({"code": 406, "err": error_message})
+
+
 # 每次重启时清空在线会话表
 def cls_terminalsession():
     try:
diff --git a/webssh/views_api.py b/webssh/views_api.py
index ba3850a..5d9c5a9 100644
--- a/webssh/views_api.py
+++ b/webssh/views_api.py
@@ -25,13 +25,18 @@ def login_event_log(user, event_type, detail, address, useragent):
 @post_required
 def session_close(request):
     pk = request.POST.get('id', None)
-    if not pk:
+    group = request.POST.get('group', None)
+    if not pk or not group:
         error_message = '不合法的请求参数!'
         return JsonResponse({"code": 400, "err": error_message})
     terminalsession = get_object_or_404(TerminalSession, pk=pk)
     try:
         channel_layer = get_channel_layer()
-        async_to_sync(channel_layer.send)(terminalsession.name, {
+        # async_to_sync(channel_layer.send)(terminalsession.name, {
+        #     "type": "chat.message",
+        #     "text": '{"status":2, "message":"\\n\\rAdministrator forcibly interrupts your connection"}',
+        # })
+        async_to_sync(channel_layer.group_send)(group, {
             "type": "chat.message",
             "text": '{"status":2, "message":"\\n\\rAdministrator forcibly interrupts your connection"}',
         })
diff --git a/webssh/websocket_layer.py b/webssh/websocket_layer.py
index 23615c8..cacd351 100644
--- a/webssh/websocket_layer.py
+++ b/webssh/websocket_layer.py
@@ -8,11 +8,14 @@
 from server.models import RemoteUserBindHost
 from webssh.models import TerminalLog, TerminalLogDetail, TerminalSession
 from django.db.models import Q
+from channels.layers import get_channel_layer
+from asgiref.sync import async_to_sync
 import os
 import json
 import re
 import time
 import traceback
+import random
 
 try:
     session_exipry_time = settings.CUSTOM_SESSION_EXIPRY_TIME
@@ -56,6 +59,8 @@ def __init__(self, *args, **kwargs):
         self.session = None
         self.remote_host = None
         self.start_time = None
+        self.send_flag = 0      # 0 发送自身通道，1 发送 group 通道，作用为当管理员查看会话时，进入 group 通道
+        self.group = 'session_' + ''.join(random.sample('zyxwvutsrqponmlkjihgfedcbaZYXWVUTSRQPONMLKJIHGFEDCBA', 10))
     
     def connect(self):
         """
@@ -63,13 +68,20 @@ def connect(self):
         :return:
         """
         self.accept()
+        async_to_sync(self.channel_layer.group_add)(self.group, self.channel_name)  # 加入组
         self.start_time = timezone.now()
         self.session = self.scope.get('session', None)
         if not self.session.get('islogin', None):    # 未登录直接断开 websocket 连接
             self.message['status'] = 2
             self.message['message'] = 'You are not login in...'
             message = json.dumps(self.message)
-            self.send(message)
+            if self.send_flag == 0:
+                self.send(message)
+            elif self.send_flag == 1:
+                async_to_sync(self.channel_layer.group_send)(self.group, {
+                    "type": "chat.message",
+                    "text": message,
+                })
             self.close(3001)
 
         self.check_login()
@@ -95,7 +107,13 @@ def connect(self):
                     self.message['status'] = 2
                     self.message['message'] = 'Host is not exist...'
                     message = json.dumps(self.message)
-                    self.send(message)
+                    if self.send_flag == 0:
+                        self.send(message)
+                    elif self.send_flag == 1:
+                        async_to_sync(self.channel_layer.group_send)(self.group, {
+                            "type": "chat.message",
+                            "text": message,
+                        })
                     self.close(3001)
             self.remote_host = RemoteUserBindHost.objects.get(id=hostid)
             if not self.remote_host.enabled:
@@ -103,7 +121,13 @@ def connect(self):
                     self.message['status'] = 2
                     self.message['message'] = 'Host is disabled...'
                     message = json.dumps(self.message)
-                    self.send(message)
+                    if self.send_flag == 0:
+                        self.send(message)
+                    elif self.send_flag == 1:
+                        async_to_sync(self.channel_layer.group_send)(self.group, {
+                            "type": "chat.message",
+                            "text": message,
+                        })
                     self.close(3001)
                 except BaseException:
                     pass
@@ -111,7 +135,13 @@ def connect(self):
             self.message['status'] = 2
             self.message['message'] = 'Host is not exist...'
             message = json.dumps(self.message)
-            self.send(message)
+            if self.send_flag == 0:
+                self.send(message)
+            elif self.send_flag == 1:
+                async_to_sync(self.channel_layer.group_send)(self.group, {
+                    "type": "chat.message",
+                    "text": message,
+                })
             self.close(3001)
         host = self.remote_host.ip
         port = self.remote_host.port
@@ -152,6 +182,7 @@ def connect(self):
                     )
         data = {
             'name': self.channel_name,
+            'group': self.group,
             'user': self.session.get('username'),
             'host': host,
             'username': user,
@@ -169,6 +200,8 @@ def disconnect(self, close_code):
         except:
             pass
         finally:
+            async_to_sync(self.channel_layer.group_discard)(self.group, self.channel_name)
+
             # 过滤点结果中的颜色字符
             self.ssh.res = re.sub(r'(\[\d{2};\d{2}m|\[0m)', '', self.ssh.res)
             # print('命令: ')
@@ -194,7 +227,7 @@ def disconnect(self, close_code):
                     user_agent,
                     self.start_time,
                 )
-            TerminalSession.objects.filter(name=self.channel_name).delete()
+            TerminalSession.objects.filter(name=self.channel_name, group=self.group).delete()
 
     def receive(self, text_data=None, bytes_data=None):
         data = json.loads(text_data)
@@ -217,7 +250,13 @@ def check_login(self):
             self.message['status'] = 2
             self.message['message'] = 'Your login is expired...'
             message = json.dumps(self.message)
-            self.send(message)
+            if self.send_flag == 0:
+                self.send(message)
+            elif self.send_flag == 1:
+                async_to_sync(self.channel_layer.group_send)(self.group, {
+                    "type": "chat.message",
+                    "text": message,
+                })
             self.close(3001)
         else:
             self.scope['session']['lasttime'] = now
@@ -227,11 +266,91 @@ def check_login(self):
     def chat_message(self, data):
         try:
             message = json.loads(data['text'])
-            if message['status'] == 2:
+            if message['status'] == 0:
+                self.send(data['text'])
+            elif message['status'] == 1 or message['status'] == 2:      # 会话关闭
                 self.send(data['text'])
                 self.close()
+            elif message['status'] == 3:    # 测试客户端显示消息框
+                self.send(data['text'])
+            elif message['status'] == 4:    # 有管理员进入查看模式
+                self.send_flag = 1
+                channel_layer = get_channel_layer()
+                message = dict()
+                message['status'] = 5
+                message['message'] = self.ssh.res
+                async_to_sync(channel_layer.group_send)(self.group, {
+                    "type": "chat.message",
+                    "text": json.dumps(message),
+                })
             else:
+                pass
+        except BaseException:
+            print(traceback.format_exc())
+
+
+class WebSSH_view(WebsocketConsumer):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.message = {'status': 0, 'message': None}
+        self.session = None
+        self.group = None
+
+    def connect(self):
+        self.accept()
+        self.session = self.scope.get('session', None)
+        if not self.session.get('islogin', None):  # 未登录直接断开 websocket 连接
+            self.message['status'] = 2
+            self.message['message'] = 'You are not login in...'
+            message = json.dumps(self.message)
+            self.send(message)
+            self.close()
+        query_string = self.scope.get('query_string').decode()
+        args = QueryDict(query_string=query_string, encoding='utf-8')
+        self.group = args.get('group')
+
+        try:
+            TerminalSession.objects.get(group=self.group)
+        except BaseException:
+            self.message['status'] = 2
+            self.message['message'] = 'session group is not exist...'
+            message = json.dumps(self.message)
+            self.send(message)
+            self.close()
+        async_to_sync(self.channel_layer.group_add)(self.group, self.channel_name)  # 加入组
+        message = dict()
+        message['status'] = 4
+        message['message'] = self.channel_name
+        channel_layer = get_channel_layer()
+        async_to_sync(channel_layer.group_send)(self.group, {
+            "type": "chat.message",
+            "text": json.dumps(message),
+        })
+
+    def disconnect(self, close_code):
+        try:
+            async_to_sync(self.channel_layer.group_discard)(self.group, self.channel_name)
+        except:
+            pass
+
+    def receive(self, text_data=None, bytes_data=None):
+        pass
+
+    # 会话外使用 channels.layers 设置 type 为 chat.message 调用此函数
+    def chat_message(self, data):
+        try:
+            message = json.loads(data['text'])
+            if message['status'] == 0:
                 self.send(data['text'])
+            elif message['status'] == 1 or message['status'] == 2:      # 会话关闭
+                self.send(data['text'])
+                self.close()
+            elif message['status'] == 3:    # 测试客户端显示消息框
+                self.send(data['text'])
+            elif message['status'] == 5:    # 进入查看会话模式
+                self.send(data['text'])
+            else:
+                pass
         except BaseException:
             print(traceback.format_exc())
 
diff --git a/webtelnet/__pycache__/telnet.cpython-37.pyc b/webtelnet/__pycache__/telnet.cpython-37.pyc
index bd18597..63d8736 100644
Binary files a/webtelnet/__pycache__/telnet.cpython-37.pyc and b/webtelnet/__pycache__/telnet.cpython-37.pyc differ
diff --git a/webtelnet/__pycache__/websocket_layer.cpython-37.pyc b/webtelnet/__pycache__/websocket_layer.cpython-37.pyc
index 79ba1a1..a6131d4 100644
Binary files a/webtelnet/__pycache__/websocket_layer.cpython-37.pyc and b/webtelnet/__pycache__/websocket_layer.cpython-37.pyc differ
diff --git a/webtelnet/telnet.py b/webtelnet/telnet.py
index 6575afa..78166af 100644
--- a/webtelnet/telnet.py
+++ b/webtelnet/telnet.py
@@ -11,7 +11,8 @@ class Telnet:
     def __init__(self, websocker, message):
         self.websocker = websocker
         self.message = message
-        self.cmd = ''
+        self.cmd = ''       # 多行命令
+        self.cmd_tmp = ''   # 一行命令
         self.res = ''
         self.tn = telnetlib.Telnet()
 
@@ -70,7 +71,12 @@ def django_to_ssh(self, data):
             self.tn.write(data.encode('utf-8'))
             if data == '\r':
                 data = '\n'
-            self.cmd += data
+                if self.cmd_tmp.strip() != '':
+                    self.cmd_tmp += data
+                    self.cmd += self.cmd_tmp
+                    self.cmd_tmp = ''
+            else:
+                self.cmd_tmp += data
         except:
             self.close()
 
diff --git a/webtelnet/websocket_layer.py b/webtelnet/websocket_layer.py
index 9aaf7a5..1513d07 100644
--- a/webtelnet/websocket_layer.py
+++ b/webtelnet/websocket_layer.py
@@ -202,6 +202,8 @@ def chat_message(self, data):
             if message['status'] == 2:
                 self.send(data['text'])
                 self.close()
+            elif message['status'] == 3:
+                self.send(data['text'])
             else:
                 self.send(data['text'])
         except BaseException: