From aa3bc7b53af780daf2b91ec9598948fa9e4618eb Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 7 Aug 2018 16:20:22 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/jumpserver/settings.py | 9 ++++-----
 apps/templates/_nav.html    | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/apps/jumpserver/settings.py b/apps/jumpserver/settings.py
index b1c4fb3bf..e4a932775 100644
--- a/apps/jumpserver/settings.py
+++ b/apps/jumpserver/settings.py
@@ -261,10 +261,10 @@ LOGGING = {
             'handlers': ['console', 'file'],
             'level': "INFO",
         },
-        'django.db': {
-            'handlers': ['console', 'file'],
-            'level': 'DEBUG'
-        }
+        # 'django.db': {
+        #     'handlers': ['console', 'file'],
+        #     'level': 'DEBUG'
+        # }
     }
 }
 
@@ -322,7 +322,6 @@ REST_FRAMEWORK = {
         'common.permissions.IsOrgAdmin',
     ),
     'DEFAULT_AUTHENTICATION_CLASSES': (
-        'rest_framework.authentication.BasicAuthentication',
         'users.authentication.AccessKeyAuthentication',
         'users.authentication.AccessTokenAuthentication',
         'users.authentication.PrivateTokenAuthentication',
diff --git a/apps/templates/_nav.html b/apps/templates/_nav.html
index be9633054..5505b493e 100644
--- a/apps/templates/_nav.html
+++ b/apps/templates/_nav.html
@@ -80,7 +80,7 @@
 {#        <li id="download"><a href="">{% trans 'File download' %}</a></li>#}
 {#    </ul>#}
 {#</li>#}
-{% if XPACK_ENABLED %}
+{% if XPACK_PLUGINS %}
 <li id="xpack">
     <a>
         <i class="fa fa-sitemap" style="width: 14px"></i> <span class="nav-label">{% trans 'XPack' %}</span><span class="fa arrow"></span>