Commit 6ce813fa authored by BaiJiangJie's avatar BaiJiangJie Committed by 老广

[Bugfix] 修复coco启动失败(load_config_from_server)、硬件刷新,测试连接,str 没有 decode(… (#1613)

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

* [Bugfix] (task任务系统)修复资产连接性测试、硬件刷新和系统用户连接性测试失败等bug
parent 23815f87
...@@ -7,5 +7,9 @@ class OpsConfig(AppConfig): ...@@ -7,5 +7,9 @@ class OpsConfig(AppConfig):
name = 'ops' name = 'ops'
def ready(self): def ready(self):
from orgs.models import Organization
from orgs.utils import set_current_org
set_current_org(Organization.root())
super().ready() super().ready()
from .celery import signal_handler from .celery import signal_handler
...@@ -263,7 +263,8 @@ class AdHoc(models.Model): ...@@ -263,7 +263,8 @@ class AdHoc(models.Model):
} }
:return: :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 @property
def options(self): def options(self):
......
...@@ -25,7 +25,7 @@ urlpatterns = [ ...@@ -25,7 +25,7 @@ urlpatterns = [
path('tasks/kill-session/', api.KillSessionAPI.as_view(), name='kill-session'), 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'), 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 # v2: get session's replay
# path('v2/sessions/<uuid:pk>/replay/', # path('v2/sessions/<uuid:pk>/replay/',
# api.SessionReplayV2ViewSet.as_view({'get': 'retrieve'}), # api.SessionReplayV2ViewSet.as_view({'get': 'retrieve'}),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment