From c032294b14612010d9b329b1340aed8a09a1fff6 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 31 Jul 2018 11:00:21 +0800
Subject: [PATCH] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/common/fields.py          | 2 +-
 apps/terminal/urls/api_urls.py | 2 +-
 apps/users/models/user.py      | 2 +-
 requirements/requirements.txt  | 4 +---
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/apps/common/fields.py b/apps/common/fields.py
index 355344cd9..dec3dba92 100644
--- a/apps/common/fields.py
+++ b/apps/common/fields.py
@@ -62,7 +62,7 @@ class EncryptMixin:
     def get_prep_value(self, value):
         if value is None:
             return value
-        return signer.sign(value).decode('utf-8')
+        return signer.sign(value)
 
 
 class EncryptTextField(EncryptMixin, models.TextField):
diff --git a/apps/terminal/urls/api_urls.py b/apps/terminal/urls/api_urls.py
index a24834396..e7b52be26 100644
--- a/apps/terminal/urls/api_urls.py
+++ b/apps/terminal/urls/api_urls.py
@@ -23,7 +23,7 @@ urlpatterns = [
          api.SessionReplayV2ViewSet.as_view({'get': 'retrieve', 'post': 'create'}),
          name='session-replay'),
     path('tasks/kill-session/', api.KillSessionAPI.as_view(), name='kill-session'),
-    path('terminal/<uuid:terminal>/access-key', api.TerminalTokenApi.as_view(),
+    path('terminal/<uuid:terminal>/access-key/', api.TerminalTokenApi.as_view(),
          name='terminal-access-key'),
     path('terminal/config', api.TerminalConfig.as_view(), name='terminal-config'),
     # v2: get session's replay
diff --git a/apps/users/models/user.py b/apps/users/models/user.py
index 589352732..e34a79582 100644
--- a/apps/users/models/user.py
+++ b/apps/users/models/user.py
@@ -118,7 +118,7 @@ class User(AbstractUser):
 
     @otp_secret_key.setter
     def otp_secret_key(self, item):
-        self._otp_secret_key = signer.sign(item).decode('utf-8')
+        self._otp_secret_key = signer.sign(item)
 
     def get_absolute_url(self):
         return reverse('users:user-detail', args=(self.id,))
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 9d84d16cd..4373a83da 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -14,8 +14,7 @@ coreapi==2.3.3
 coreschema==0.0.4
 cryptography==2.1.4
 decorator==4.1.2
-#Django==1.11
-#Django==2.0.7
+Django==2.0.7
 django-auth-ldap==1.3.0
 django-bootstrap3==9.1.0
 django-celery-beat==1.1.1
@@ -25,7 +24,6 @@ django-ranged-response==0.2.0
 django-redis-cache==1.7.1
 django-rest-swagger==2.1.2
 django-simple-captcha==0.5.6
-#djangorestframework==3.7.3
 djangorestframework==3.8.2
 djangorestframework-bulk==0.2.1
 docutils==0.14