From 6ce813faf8fd6c94b33f67cd80045216803b0888 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com>
Date: Tue, 31 Jul 2018 10:27:55 +0800
Subject: [PATCH] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8Dcoco=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E5=A4=B1=E8=B4=A5(load=5Fconfig=5Ffrom=5Fserver)?=
 =?UTF-8?q?=E3=80=81=E7=A1=AC=E4=BB=B6=E5=88=B7=E6=96=B0=EF=BC=8C=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E8=BF=9E=E6=8E=A5=EF=BC=8Cstr=20=E6=B2=A1=E6=9C=89=20?=
 =?UTF-8?q?decode(=E2=80=A6=20(#1613)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [Bugfix] 修复coco启动失败(load_config_from_server)、硬件刷新，测试连接，str 没有 decode() method的bug

* [Bugfix] (task任务系统)修复资产连接性测试、硬件刷新和系统用户连接性测试失败等bug
---
 apps/ops/apps.py               | 4 ++++
 apps/ops/models/adhoc.py       | 3 ++-
 apps/terminal/urls/api_urls.py | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/ops/apps.py b/apps/ops/apps.py
index d5d6879b1..8a70780f0 100644
--- a/apps/ops/apps.py
+++ b/apps/ops/apps.py
@@ -7,5 +7,9 @@ class OpsConfig(AppConfig):
     name = 'ops'
 
     def ready(self):
+        from orgs.models import Organization
+        from orgs.utils import set_current_org
+        set_current_org(Organization.root())
+
         super().ready()
         from .celery import signal_handler
diff --git a/apps/ops/models/adhoc.py b/apps/ops/models/adhoc.py
index beba34fe6..9668819b9 100644
--- a/apps/ops/models/adhoc.py
+++ b/apps/ops/models/adhoc.py
@@ -263,7 +263,8 @@ class AdHoc(models.Model):
         }
         :return:
         """
-        self._become = signer.sign(json.dumps(item)).decode('utf-8')
+        # self._become = signer.sign(json.dumps(item)).decode('utf-8')
+        self._become = signer.sign(json.dumps(item))
 
     @property
     def options(self):
diff --git a/apps/terminal/urls/api_urls.py b/apps/terminal/urls/api_urls.py
index a24834396..f99c8b14a 100644
--- a/apps/terminal/urls/api_urls.py
+++ b/apps/terminal/urls/api_urls.py
@@ -25,7 +25,7 @@ urlpatterns = [
     path('tasks/kill-session/', api.KillSessionAPI.as_view(), name='kill-session'),
     path('terminal/<uuid:terminal>/access-key', api.TerminalTokenApi.as_view(),
          name='terminal-access-key'),
-    path('terminal/config', api.TerminalConfig.as_view(), name='terminal-config'),
+    path('terminal/config/', api.TerminalConfig.as_view(), name='terminal-config'),
     # v2: get session's replay
     # path('v2/sessions/<uuid:pk>/replay/',
     #     api.SessionReplayV2ViewSet.as_view({'get': 'retrieve'}),