Merge: v3 to dev (#9160)

* fix: 修改 ConnectionTokenSecretSerializer

* perf: connect token secret (#9155)

Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>

* feat: 作业迁移至个人级别

* perf: asset enabled (#9157)

Co-authored-by: feng <1304903146@qq.com>

* perf: 修改ConnectionTokenSecret Gateway数据结构; 修改Domain Gateway Model方法

* perf: ConnectionTokenSecret  返回 domain 信息

* refactor: 移动 Gateway Model 到 asset 目录下

* refactor: 移动 Gateway Model 单独到 gateway 文件中

* perf: 修改 GatewaySerializer 目录

* perf: 修改 GatewaySerializer 目录

Co-authored-by: fit2bot <68588906+fit2bot@users.noreply.github.com>
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
This commit is contained in:
Jiangjie.Bai
2022-12-06 11:03:14 +08:00
committed by GitHub
parent 9ef5f17d5e
commit 7842e3e5ab
23 changed files with 284 additions and 243 deletions

View File

@@ -2,7 +2,9 @@ import os
import zipfile
from django.conf import settings
from rest_framework_bulk import BulkModelViewSet
from common.mixins import CommonApiMixin
from orgs.mixins.api import OrgBulkModelViewSet
from ..exception import PlaybookNoValidEntry
from ..models import Playbook
@@ -17,7 +19,7 @@ def unzip_playbook(src, dist):
fz.extract(file, dist)
class PlaybookViewSet(OrgBulkModelViewSet):
class PlaybookViewSet(CommonApiMixin, BulkModelViewSet):
serializer_class = PlaybookSerializer
permission_classes = ()
model = Playbook