Merge pull request #698 from TencentBlueKing/master

src/dashboard-front/src/app.vue

@@ -104,7 +104,7 @@ const user = useUser();
 // 跑马灯数据
 const showNoticeAlert = ref(true);
 const enableShowNotice = ref(false);
-const noticeApi = ref(`${BK_DASHBOARD_URL}/notice/`);
+const noticeApi = ref(`${BK_DASHBOARD_URL}/notice/announcements/`);
 const curLeavePageData = ref({});
 
 // getUser()

src/dashboard/apigateway/apigateway/apis/web/permission/views.py

@@ -22,6 +22,7 @@
 from typing import Any, List
 
 from blue_krill.async_utils.django_utils import apply_async_on_commit
+from django.conf import settings
 from django.db import transaction
 from django.utils.decorators import method_decorator
 from django.utils.translation import gettext as _
@@ -70,7 +71,7 @@ def get_queryset(self):
 
         # 仅展示资源存在的权限
         resource_ids = Resource.objects.filter(gateway=self.request.gateway).values_list("id", flat=True)
-        return queryset.filter(gateway=self.request.gateway, resource_id__in=resource_ids)
+        return queryset.filter(gateway=self.request.gateway, resource_id__in=resource_ids).exclude(bk_app_code=settings.DEFAULT_TEST_APP['bk_app_code'])
 
 
 @method_decorator(

src/dashboard/apigateway/apigateway/apis/web/resource_version/serializers.py

@@ -118,6 +118,7 @@ class ResourceVersionListOutputSLZ(serializers.Serializer):
     schema_version = serializers.CharField(help_text="资源版本协议版本：1.0/2.0")
     comment = serializers.CharField(help_text="版本日志")
     created_time = serializers.DateTimeField(help_text="创建时间")
+    created_by = serializers.CharField(help_text="创建人")
 
     def get_released_stages(self, obj):
         return self.context["released_stages"].get(obj["id"], [])

src/dashboard/apigateway/apigateway/apis/web/resource_version/views.py

@@ -76,9 +76,9 @@ def list(self, request, *args, **kwargs):
         queryset = ResourceVersion.objects.filter(gateway=request.gateway)
         if query:
             queryset = queryset.filter(version__icontains=query)
-        data = queryset.values("id", "version", "schema_version", "comment", "name", "title", "created_time").order_by(
-            "-id"
-        )
+        data = queryset.values(
+            "id", "version", "schema_version", "comment", "name", "title", "created_time", "created_by"
+        ).order_by("-id")
 
         page = self.paginate_queryset(data)
         resource_version_ids = [rv["id"] for rv in page]

src/dashboard/apigateway/apigateway/tests/apis/web/resource_version/test_serializers.py

@@ -50,10 +50,11 @@ def test_to_representation(self):
             gateway=gateway,
             version="1.0.1",
             created_time=arrow.get("2019-01-01 12:30:00").datetime,
+            created_by="x"
         )
 
         queryset = ResourceVersion.objects.filter(gateway=gateway).values(
-            "id", "version", "schema_version", "comment", "created_time"
+            "id", "version", "schema_version", "comment", "created_time", "created_by"
         )
 
         slz = serializers.ResourceVersionListOutputSLZ(
@@ -92,6 +93,7 @@ def test_to_representation(self):
                         "name": "test",
                     },
                 ],
+                "created_by": "x",
                 "created_time": "2019-01-01 20:30:00",
             },
         ]

src/dashboard/apigateway/apigateway/tests/apis/web/resource_version/test_views.py

@@ -76,6 +76,7 @@ def test_list(self, request_view, fake_gateway):
                 "comment": resource_version.comment,
                 "sdk_count": 1,
                 "created_time": dummy_time.str,
+                "created_by": resource_version.created_by,
             },
         ]
         expected_release_stages = [