Merge branch 'wangyong'

jasset/views.py

@@ -4,6 +4,8 @@ import ast
 
 from django.db.models import Q
 from django.template import RequestContext
+from django.shortcuts import get_object_or_404
+
 from jperm.models import Perm
 from jumpserver.api import *
 
@@ -26,6 +28,8 @@ def get_host_groups(groups):
         if group:
             group = group[0]
             ret.append(group)
+    group_all = get_object_or_404(BisGroup, name='ALL')
+    ret.append(group_all)
     return ret
 
 

jumpserver.conf

@@ -23,7 +23,7 @@ root_pw = secret234
 
 
 [websocket]
-web_socket_host = 192.168.20.209:3000
+web_socket_host = 192.168.8.66:3000
 
 
 [mail]