From d1c79e516a0ea42413f67befc94f5b01a6f9aa7b Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 4 May 2022 10:04:20 +0800 Subject: [PATCH] =?UTF-8?q?vsc=E8=BF=9C=E7=A8=8B=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 0 apps/auth1/__init__.py | 0 apps/auth1/admin.py | 0 apps/auth1/apps.py | 0 apps/auth1/authentication.py | 0 apps/auth1/errors.py | 0 apps/auth1/migrations/__init__.py | 0 apps/auth1/models.py | 0 apps/auth1/serializers.py | 0 apps/auth1/tests.py | 0 apps/auth1/urls.py | 0 apps/auth1/views.py | 0 apps/develop/__init__.py | 0 apps/develop/admin.py | 0 apps/develop/apps.py | 0 apps/develop/migrations/__init__.py | 0 apps/develop/models.py | 0 apps/develop/serializers.py | 0 apps/develop/tasks.py | 0 apps/develop/tests.py | 0 apps/develop/urls.py | 0 apps/develop/views.py | 0 apps/hrm/__init__.py | 0 apps/hrm/admin.py | 0 apps/hrm/apps.py | 0 apps/hrm/errors.py | 0 apps/hrm/filters.py | 0 apps/hrm/migrations/0001_initial.py | 0 .../0002_alter_employee_third_info.py | 0 apps/hrm/migrations/__init__.py | 0 apps/hrm/models.py | 0 apps/hrm/serializers.py | 0 apps/hrm/services.py | 0 apps/hrm/signals.py | 0 apps/hrm/tasks.py | 0 apps/hrm/tests.py | 0 apps/hrm/urls.py | 0 apps/hrm/views.py | 8 ++--- apps/monitor/__init__.py | 0 apps/monitor/admin.py | 0 apps/monitor/apps.py | 0 apps/monitor/consumers.py | 0 apps/monitor/errors.py | 0 apps/monitor/migrations/0001_initial.py | 0 .../migrations/0002_alter_drfrequestlog_id.py | 0 .../0003_alter_drfrequestlog_view_method.py | 0 apps/monitor/migrations/__init__.py | 0 apps/monitor/models.py | 0 apps/monitor/routing.py | 0 apps/monitor/templates/monitor/index.html | 0 apps/monitor/templates/monitor/room.html | 0 apps/monitor/templates/monitor/video.html | 0 apps/monitor/tests.py | 0 apps/monitor/urls.py | 0 apps/monitor/views.py | 0 apps/system/__init__.py | 0 apps/system/admin.py | 0 apps/system/apps.py | 0 apps/system/errors.py | 0 apps/system/filters.py | 0 apps/system/migrations/0001_initial.py | 0 .../migrations/0002_auto_20220411_2148.py | 0 .../migrations/0003_remove_user_phone.py | 0 .../migrations/0004_auto_20220421_1511.py | 0 apps/system/migrations/__init__.py | 0 apps/system/models.py | 0 apps/system/serializers.py | 0 apps/system/signals.py | 0 apps/system/tasks.py | 0 apps/system/tests.py | 0 apps/system/urls.py | 0 apps/system/views.py | 4 +-- apps/third/__init__.py | 0 apps/third/admin.py | 0 apps/third/apps.py | 0 apps/third/clients.py | 0 apps/third/erros.py | 0 apps/third/migrations/__init__.py | 0 apps/third/models.py | 0 apps/third/serializers.py | 0 apps/third/tapis.py | 0 apps/third/tests.py | 0 apps/third/urls.py | 0 apps/third/views.py | 0 apps/utils/__init__.py | 0 apps/utils/admin.py | 0 apps/utils/apps.py | 0 apps/utils/constants.py | 0 apps/utils/dahua.py | 0 apps/utils/errors.py | 0 apps/utils/exceptions.py | 0 apps/utils/filters.py | 0 apps/utils/mixins.py | 0 apps/utils/models.py | 0 apps/utils/pagination.py | 0 apps/utils/permission.py | 0 apps/utils/queryset.py | 0 apps/utils/request.py | 0 apps/utils/serializers.py | 0 apps/utils/snowflake.py | 0 apps/utils/tools.py | 0 apps/utils/urls.py | 0 apps/utils/views.py | 0 apps/utils/viewsets.py | 9 +++-- apps/utils/xunxi.py | 0 apps/wf/__init__.py | 0 apps/wf/admin.py | 0 apps/wf/apps.py | 0 apps/wf/filters.py | 0 apps/wf/models.py | 0 apps/wf/scripts.py | 0 apps/wf/serializers.py | 0 apps/wf/services.py | 0 apps/wf/tests.py | 0 apps/wf/urls.py | 0 apps/wf/views.py | 31 +++++++++--------- log/.gitignore | 0 manage.py | 0 media/default/alarm.mp3 | Bin media/default/avatar.png | Bin media/default/test.png | Bin media/default/test2.jpg | Bin requirements.txt | 0 server/__init__.py | 0 server/asgi.py | 0 server/celery.py | 0 server/conf.example.py | 0 server/settings.py | 0 server/urls.py | 0 server/wsgi.py | 0 130 files changed, 26 insertions(+), 26 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 apps/auth1/__init__.py mode change 100644 => 100755 apps/auth1/admin.py mode change 100644 => 100755 apps/auth1/apps.py mode change 100644 => 100755 apps/auth1/authentication.py mode change 100644 => 100755 apps/auth1/errors.py mode change 100644 => 100755 apps/auth1/migrations/__init__.py mode change 100644 => 100755 apps/auth1/models.py mode change 100644 => 100755 apps/auth1/serializers.py mode change 100644 => 100755 apps/auth1/tests.py mode change 100644 => 100755 apps/auth1/urls.py mode change 100644 => 100755 apps/auth1/views.py mode change 100644 => 100755 apps/develop/__init__.py mode change 100644 => 100755 apps/develop/admin.py mode change 100644 => 100755 apps/develop/apps.py mode change 100644 => 100755 apps/develop/migrations/__init__.py mode change 100644 => 100755 apps/develop/models.py mode change 100644 => 100755 apps/develop/serializers.py mode change 100644 => 100755 apps/develop/tasks.py mode change 100644 => 100755 apps/develop/tests.py mode change 100644 => 100755 apps/develop/urls.py mode change 100644 => 100755 apps/develop/views.py mode change 100644 => 100755 apps/hrm/__init__.py mode change 100644 => 100755 apps/hrm/admin.py mode change 100644 => 100755 apps/hrm/apps.py mode change 100644 => 100755 apps/hrm/errors.py mode change 100644 => 100755 apps/hrm/filters.py mode change 100644 => 100755 apps/hrm/migrations/0001_initial.py mode change 100644 => 100755 apps/hrm/migrations/0002_alter_employee_third_info.py mode change 100644 => 100755 apps/hrm/migrations/__init__.py mode change 100644 => 100755 apps/hrm/models.py mode change 100644 => 100755 apps/hrm/serializers.py mode change 100644 => 100755 apps/hrm/services.py mode change 100644 => 100755 apps/hrm/signals.py mode change 100644 => 100755 apps/hrm/tasks.py mode change 100644 => 100755 apps/hrm/tests.py mode change 100644 => 100755 apps/hrm/urls.py mode change 100644 => 100755 apps/hrm/views.py mode change 100644 => 100755 apps/monitor/__init__.py mode change 100644 => 100755 apps/monitor/admin.py mode change 100644 => 100755 apps/monitor/apps.py mode change 100644 => 100755 apps/monitor/consumers.py mode change 100644 => 100755 apps/monitor/errors.py mode change 100644 => 100755 apps/monitor/migrations/0001_initial.py mode change 100644 => 100755 apps/monitor/migrations/0002_alter_drfrequestlog_id.py mode change 100644 => 100755 apps/monitor/migrations/0003_alter_drfrequestlog_view_method.py mode change 100644 => 100755 apps/monitor/migrations/__init__.py mode change 100644 => 100755 apps/monitor/models.py mode change 100644 => 100755 apps/monitor/routing.py mode change 100644 => 100755 apps/monitor/templates/monitor/index.html mode change 100644 => 100755 apps/monitor/templates/monitor/room.html mode change 100644 => 100755 apps/monitor/templates/monitor/video.html mode change 100644 => 100755 apps/monitor/tests.py mode change 100644 => 100755 apps/monitor/urls.py mode change 100644 => 100755 apps/monitor/views.py mode change 100644 => 100755 apps/system/__init__.py mode change 100644 => 100755 apps/system/admin.py mode change 100644 => 100755 apps/system/apps.py mode change 100644 => 100755 apps/system/errors.py mode change 100644 => 100755 apps/system/filters.py mode change 100644 => 100755 apps/system/migrations/0001_initial.py mode change 100644 => 100755 apps/system/migrations/0002_auto_20220411_2148.py mode change 100644 => 100755 apps/system/migrations/0003_remove_user_phone.py mode change 100644 => 100755 apps/system/migrations/0004_auto_20220421_1511.py mode change 100644 => 100755 apps/system/migrations/__init__.py mode change 100644 => 100755 apps/system/models.py mode change 100644 => 100755 apps/system/serializers.py mode change 100644 => 100755 apps/system/signals.py mode change 100644 => 100755 apps/system/tasks.py mode change 100644 => 100755 apps/system/tests.py mode change 100644 => 100755 apps/system/urls.py mode change 100644 => 100755 apps/system/views.py mode change 100644 => 100755 apps/third/__init__.py mode change 100644 => 100755 apps/third/admin.py mode change 100644 => 100755 apps/third/apps.py mode change 100644 => 100755 apps/third/clients.py mode change 100644 => 100755 apps/third/erros.py mode change 100644 => 100755 apps/third/migrations/__init__.py mode change 100644 => 100755 apps/third/models.py mode change 100644 => 100755 apps/third/serializers.py mode change 100644 => 100755 apps/third/tapis.py mode change 100644 => 100755 apps/third/tests.py mode change 100644 => 100755 apps/third/urls.py mode change 100644 => 100755 apps/third/views.py mode change 100644 => 100755 apps/utils/__init__.py mode change 100644 => 100755 apps/utils/admin.py mode change 100644 => 100755 apps/utils/apps.py mode change 100644 => 100755 apps/utils/constants.py mode change 100644 => 100755 apps/utils/dahua.py mode change 100644 => 100755 apps/utils/errors.py mode change 100644 => 100755 apps/utils/exceptions.py mode change 100644 => 100755 apps/utils/filters.py mode change 100644 => 100755 apps/utils/mixins.py mode change 100644 => 100755 apps/utils/models.py mode change 100644 => 100755 apps/utils/pagination.py mode change 100644 => 100755 apps/utils/permission.py mode change 100644 => 100755 apps/utils/queryset.py mode change 100644 => 100755 apps/utils/request.py mode change 100644 => 100755 apps/utils/serializers.py mode change 100644 => 100755 apps/utils/snowflake.py mode change 100644 => 100755 apps/utils/tools.py mode change 100644 => 100755 apps/utils/urls.py mode change 100644 => 100755 apps/utils/views.py mode change 100644 => 100755 apps/utils/viewsets.py mode change 100644 => 100755 apps/utils/xunxi.py mode change 100644 => 100755 apps/wf/__init__.py mode change 100644 => 100755 apps/wf/admin.py mode change 100644 => 100755 apps/wf/apps.py mode change 100644 => 100755 apps/wf/filters.py mode change 100644 => 100755 apps/wf/models.py mode change 100644 => 100755 apps/wf/scripts.py mode change 100644 => 100755 apps/wf/serializers.py mode change 100644 => 100755 apps/wf/services.py mode change 100644 => 100755 apps/wf/tests.py mode change 100644 => 100755 apps/wf/urls.py mode change 100644 => 100755 apps/wf/views.py mode change 100644 => 100755 log/.gitignore mode change 100644 => 100755 manage.py mode change 100644 => 100755 media/default/alarm.mp3 mode change 100644 => 100755 media/default/avatar.png mode change 100644 => 100755 media/default/test.png mode change 100644 => 100755 media/default/test2.jpg mode change 100644 => 100755 requirements.txt mode change 100644 => 100755 server/__init__.py mode change 100644 => 100755 server/asgi.py mode change 100644 => 100755 server/celery.py mode change 100644 => 100755 server/conf.example.py mode change 100644 => 100755 server/settings.py mode change 100644 => 100755 server/urls.py mode change 100644 => 100755 server/wsgi.py diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/apps/auth1/__init__.py b/apps/auth1/__init__.py old mode 100644 new mode 100755 diff --git a/apps/auth1/admin.py b/apps/auth1/admin.py old mode 100644 new mode 100755 diff --git a/apps/auth1/apps.py b/apps/auth1/apps.py old mode 100644 new mode 100755 diff --git a/apps/auth1/authentication.py b/apps/auth1/authentication.py old mode 100644 new mode 100755 diff --git a/apps/auth1/errors.py b/apps/auth1/errors.py old mode 100644 new mode 100755 diff --git a/apps/auth1/migrations/__init__.py b/apps/auth1/migrations/__init__.py old mode 100644 new mode 100755 diff --git a/apps/auth1/models.py b/apps/auth1/models.py old mode 100644 new mode 100755 diff --git a/apps/auth1/serializers.py b/apps/auth1/serializers.py old mode 100644 new mode 100755 diff --git a/apps/auth1/tests.py b/apps/auth1/tests.py old mode 100644 new mode 100755 diff --git a/apps/auth1/urls.py b/apps/auth1/urls.py old mode 100644 new mode 100755 diff --git a/apps/auth1/views.py b/apps/auth1/views.py old mode 100644 new mode 100755 diff --git a/apps/develop/__init__.py b/apps/develop/__init__.py old mode 100644 new mode 100755 diff --git a/apps/develop/admin.py b/apps/develop/admin.py old mode 100644 new mode 100755 diff --git a/apps/develop/apps.py b/apps/develop/apps.py old mode 100644 new mode 100755 diff --git a/apps/develop/migrations/__init__.py b/apps/develop/migrations/__init__.py old mode 100644 new mode 100755 diff --git a/apps/develop/models.py b/apps/develop/models.py old mode 100644 new mode 100755 diff --git a/apps/develop/serializers.py b/apps/develop/serializers.py old mode 100644 new mode 100755 diff --git a/apps/develop/tasks.py b/apps/develop/tasks.py old mode 100644 new mode 100755 diff --git a/apps/develop/tests.py b/apps/develop/tests.py old mode 100644 new mode 100755 diff --git a/apps/develop/urls.py b/apps/develop/urls.py old mode 100644 new mode 100755 diff --git a/apps/develop/views.py b/apps/develop/views.py old mode 100644 new mode 100755 diff --git a/apps/hrm/__init__.py b/apps/hrm/__init__.py old mode 100644 new mode 100755 diff --git a/apps/hrm/admin.py b/apps/hrm/admin.py old mode 100644 new mode 100755 diff --git a/apps/hrm/apps.py b/apps/hrm/apps.py old mode 100644 new mode 100755 diff --git a/apps/hrm/errors.py b/apps/hrm/errors.py old mode 100644 new mode 100755 diff --git a/apps/hrm/filters.py b/apps/hrm/filters.py old mode 100644 new mode 100755 diff --git a/apps/hrm/migrations/0001_initial.py b/apps/hrm/migrations/0001_initial.py old mode 100644 new mode 100755 diff --git a/apps/hrm/migrations/0002_alter_employee_third_info.py b/apps/hrm/migrations/0002_alter_employee_third_info.py old mode 100644 new mode 100755 diff --git a/apps/hrm/migrations/__init__.py b/apps/hrm/migrations/__init__.py old mode 100644 new mode 100755 diff --git a/apps/hrm/models.py b/apps/hrm/models.py old mode 100644 new mode 100755 diff --git a/apps/hrm/serializers.py b/apps/hrm/serializers.py old mode 100644 new mode 100755 diff --git a/apps/hrm/services.py b/apps/hrm/services.py old mode 100644 new mode 100755 diff --git a/apps/hrm/signals.py b/apps/hrm/signals.py old mode 100644 new mode 100755 diff --git a/apps/hrm/tasks.py b/apps/hrm/tasks.py old mode 100644 new mode 100755 diff --git a/apps/hrm/tests.py b/apps/hrm/tests.py old mode 100644 new mode 100755 diff --git a/apps/hrm/urls.py b/apps/hrm/urls.py old mode 100644 new mode 100755 diff --git a/apps/hrm/views.py b/apps/hrm/views.py old mode 100644 new mode 100755 index a6a0556b..197bf7b7 --- a/apps/hrm/views.py +++ b/apps/hrm/views.py @@ -47,7 +47,7 @@ class EmployeeViewSet(CustomModelViewSet): search_fields = ['name', 'number', 'user__username'] ordering = ['-pk'] - @action(methods=['post'], detail=True, perms_map={'post': 'employee.notworkremark'} + @action(methods=['post'], detail=True, perms_map={'post': 'employee:notworkremark'} , serializer_class=EmployeeNotWorkRemarkSerializer) def not_work_remark(self, request, pk=None): """ @@ -79,7 +79,7 @@ class EmployeeViewSet(CustomModelViewSet): raise ParseError(**NO_NEED_LEVEL_REMARK) @transaction.atomic - @action(methods=['post'], detail=False, perms_map={'post': 'employee.channel_authority'} + @action(methods=['post'], detail=False, perms_map={'post': 'employee:channel_authority'} , serializer_class=ChannelAuthoritySerializer) def channel_authority(self, request, pk=None): """门通道授权 @@ -114,7 +114,7 @@ class EmployeeViewSet(CustomModelViewSet): return Response() @transaction.atomic - @action(methods=['post'], detail=False, perms_map={'post': 'employee.face_bind_1'} + @action(methods=['post'], detail=False, perms_map={'post': 'employee:face_bind_1'} , serializer_class=serializers.Serializer) def face_bind_1(self, request, pk=None): """同步人脸库1 @@ -153,7 +153,7 @@ class EmployeeViewSet(CustomModelViewSet): dhClient.request(**dhapis['face_bind'], json=json_data) return Response() - @action(methods=['get'], detail=False, perms_map={'get': 'employee.face_bind_1'} + @action(methods=['get'], detail=False, perms_map={'get': 'employee:face_bind_1'} , serializer_class=serializers.Serializer) def face_status_1(self, request, pk=None): """人像下发状态 diff --git a/apps/monitor/__init__.py b/apps/monitor/__init__.py old mode 100644 new mode 100755 diff --git a/apps/monitor/admin.py b/apps/monitor/admin.py old mode 100644 new mode 100755 diff --git a/apps/monitor/apps.py b/apps/monitor/apps.py old mode 100644 new mode 100755 diff --git a/apps/monitor/consumers.py b/apps/monitor/consumers.py old mode 100644 new mode 100755 diff --git a/apps/monitor/errors.py b/apps/monitor/errors.py old mode 100644 new mode 100755 diff --git a/apps/monitor/migrations/0001_initial.py b/apps/monitor/migrations/0001_initial.py old mode 100644 new mode 100755 diff --git a/apps/monitor/migrations/0002_alter_drfrequestlog_id.py b/apps/monitor/migrations/0002_alter_drfrequestlog_id.py old mode 100644 new mode 100755 diff --git a/apps/monitor/migrations/0003_alter_drfrequestlog_view_method.py b/apps/monitor/migrations/0003_alter_drfrequestlog_view_method.py old mode 100644 new mode 100755 diff --git a/apps/monitor/migrations/__init__.py b/apps/monitor/migrations/__init__.py old mode 100644 new mode 100755 diff --git a/apps/monitor/models.py b/apps/monitor/models.py old mode 100644 new mode 100755 diff --git a/apps/monitor/routing.py b/apps/monitor/routing.py old mode 100644 new mode 100755 diff --git a/apps/monitor/templates/monitor/index.html b/apps/monitor/templates/monitor/index.html old mode 100644 new mode 100755 diff --git a/apps/monitor/templates/monitor/room.html b/apps/monitor/templates/monitor/room.html old mode 100644 new mode 100755 diff --git a/apps/monitor/templates/monitor/video.html b/apps/monitor/templates/monitor/video.html old mode 100644 new mode 100755 diff --git a/apps/monitor/tests.py b/apps/monitor/tests.py old mode 100644 new mode 100755 diff --git a/apps/monitor/urls.py b/apps/monitor/urls.py old mode 100644 new mode 100755 diff --git a/apps/monitor/views.py b/apps/monitor/views.py old mode 100644 new mode 100755 diff --git a/apps/system/__init__.py b/apps/system/__init__.py old mode 100644 new mode 100755 diff --git a/apps/system/admin.py b/apps/system/admin.py old mode 100644 new mode 100755 diff --git a/apps/system/apps.py b/apps/system/apps.py old mode 100644 new mode 100755 diff --git a/apps/system/errors.py b/apps/system/errors.py old mode 100644 new mode 100755 diff --git a/apps/system/filters.py b/apps/system/filters.py old mode 100644 new mode 100755 diff --git a/apps/system/migrations/0001_initial.py b/apps/system/migrations/0001_initial.py old mode 100644 new mode 100755 diff --git a/apps/system/migrations/0002_auto_20220411_2148.py b/apps/system/migrations/0002_auto_20220411_2148.py old mode 100644 new mode 100755 diff --git a/apps/system/migrations/0003_remove_user_phone.py b/apps/system/migrations/0003_remove_user_phone.py old mode 100644 new mode 100755 diff --git a/apps/system/migrations/0004_auto_20220421_1511.py b/apps/system/migrations/0004_auto_20220421_1511.py old mode 100644 new mode 100755 diff --git a/apps/system/migrations/__init__.py b/apps/system/migrations/__init__.py old mode 100644 new mode 100755 diff --git a/apps/system/models.py b/apps/system/models.py old mode 100644 new mode 100755 diff --git a/apps/system/serializers.py b/apps/system/serializers.py old mode 100644 new mode 100755 diff --git a/apps/system/signals.py b/apps/system/signals.py old mode 100644 new mode 100755 diff --git a/apps/system/tasks.py b/apps/system/tasks.py old mode 100644 new mode 100755 diff --git a/apps/system/tests.py b/apps/system/tests.py old mode 100644 new mode 100755 diff --git a/apps/system/urls.py b/apps/system/urls.py old mode 100644 new mode 100755 diff --git a/apps/system/views.py b/apps/system/views.py old mode 100644 new mode 100755 index b5d41739..1ec5758e --- a/apps/system/views.py +++ b/apps/system/views.py @@ -69,7 +69,7 @@ class PTaskViewSet(CustomModelViewSet): select_related_fields = ['interval', 'crontab'] ordering = ['-create_time'] - @action(methods=['put'], detail=True, perms_map={'put': 'ptask.update'}) + @action(methods=['put'], detail=True, perms_map={'put': 'ptask:update'}) def toggle(self, request, pk=None): """修改启用禁用状态 @@ -263,7 +263,7 @@ class UserPostViewSet(CreateModelMixin, DestroyModelMixin, ListModelMixin, Custo 用户/岗位关系 """ - perms_map = {'get': '*', 'post': 'user.update', 'delete': 'user.update'} + perms_map = {'get': '*', 'post': 'user:update', 'delete': 'user:update'} queryset = UserPost.objects.select_related('user', 'post', 'dept').all() serializer_class = UserPostSerializer create_serializer_class = UserPostCreateSerializer diff --git a/apps/third/__init__.py b/apps/third/__init__.py old mode 100644 new mode 100755 diff --git a/apps/third/admin.py b/apps/third/admin.py old mode 100644 new mode 100755 diff --git a/apps/third/apps.py b/apps/third/apps.py old mode 100644 new mode 100755 diff --git a/apps/third/clients.py b/apps/third/clients.py old mode 100644 new mode 100755 diff --git a/apps/third/erros.py b/apps/third/erros.py old mode 100644 new mode 100755 diff --git a/apps/third/migrations/__init__.py b/apps/third/migrations/__init__.py old mode 100644 new mode 100755 diff --git a/apps/third/models.py b/apps/third/models.py old mode 100644 new mode 100755 diff --git a/apps/third/serializers.py b/apps/third/serializers.py old mode 100644 new mode 100755 diff --git a/apps/third/tapis.py b/apps/third/tapis.py old mode 100644 new mode 100755 diff --git a/apps/third/tests.py b/apps/third/tests.py old mode 100644 new mode 100755 diff --git a/apps/third/urls.py b/apps/third/urls.py old mode 100644 new mode 100755 diff --git a/apps/third/views.py b/apps/third/views.py old mode 100644 new mode 100755 diff --git a/apps/utils/__init__.py b/apps/utils/__init__.py old mode 100644 new mode 100755 diff --git a/apps/utils/admin.py b/apps/utils/admin.py old mode 100644 new mode 100755 diff --git a/apps/utils/apps.py b/apps/utils/apps.py old mode 100644 new mode 100755 diff --git a/apps/utils/constants.py b/apps/utils/constants.py old mode 100644 new mode 100755 diff --git a/apps/utils/dahua.py b/apps/utils/dahua.py old mode 100644 new mode 100755 diff --git a/apps/utils/errors.py b/apps/utils/errors.py old mode 100644 new mode 100755 diff --git a/apps/utils/exceptions.py b/apps/utils/exceptions.py old mode 100644 new mode 100755 diff --git a/apps/utils/filters.py b/apps/utils/filters.py old mode 100644 new mode 100755 diff --git a/apps/utils/mixins.py b/apps/utils/mixins.py old mode 100644 new mode 100755 diff --git a/apps/utils/models.py b/apps/utils/models.py old mode 100644 new mode 100755 diff --git a/apps/utils/pagination.py b/apps/utils/pagination.py old mode 100644 new mode 100755 diff --git a/apps/utils/permission.py b/apps/utils/permission.py old mode 100644 new mode 100755 diff --git a/apps/utils/queryset.py b/apps/utils/queryset.py old mode 100644 new mode 100755 diff --git a/apps/utils/request.py b/apps/utils/request.py old mode 100644 new mode 100755 diff --git a/apps/utils/serializers.py b/apps/utils/serializers.py old mode 100644 new mode 100755 diff --git a/apps/utils/snowflake.py b/apps/utils/snowflake.py old mode 100644 new mode 100755 diff --git a/apps/utils/tools.py b/apps/utils/tools.py old mode 100644 new mode 100755 diff --git a/apps/utils/urls.py b/apps/utils/urls.py old mode 100644 new mode 100755 diff --git a/apps/utils/views.py b/apps/utils/views.py old mode 100644 new mode 100755 diff --git a/apps/utils/viewsets.py b/apps/utils/viewsets.py old mode 100644 new mode 100755 index 72ed89c8..af696e07 --- a/apps/utils/viewsets.py +++ b/apps/utils/viewsets.py @@ -106,11 +106,10 @@ class CustomModelViewSet(CreateModelMixin # 增加默认权限标识 if not self.perms_map: basename = self.basename - self.perms_map = {'get':'*', 'post':'{}.create'.format(basename) - ,'put':'{}.update'.format(basename) - ,'patch':'{}.update'.format(basename) - ,'delete':'{}.delete'.format(basename) - ,'deletes':'{}.delete'.format(basename)} + self.perms_map = {'get':'*', 'post':'{}:create'.format(basename) + ,'put':'{}:update'.format(basename) + ,'patch':'{}:update'.format(basename) + ,'delete':'{}:delete'.format(basename)} for k, v in self.perms_map.items(): if v not in ALL_PERMS and v!='*': ALL_PERMS.append(v) diff --git a/apps/utils/xunxi.py b/apps/utils/xunxi.py old mode 100644 new mode 100755 diff --git a/apps/wf/__init__.py b/apps/wf/__init__.py old mode 100644 new mode 100755 diff --git a/apps/wf/admin.py b/apps/wf/admin.py old mode 100644 new mode 100755 diff --git a/apps/wf/apps.py b/apps/wf/apps.py old mode 100644 new mode 100755 diff --git a/apps/wf/filters.py b/apps/wf/filters.py old mode 100644 new mode 100755 diff --git a/apps/wf/models.py b/apps/wf/models.py old mode 100644 new mode 100755 diff --git a/apps/wf/scripts.py b/apps/wf/scripts.py old mode 100644 new mode 100755 diff --git a/apps/wf/serializers.py b/apps/wf/serializers.py old mode 100644 new mode 100755 diff --git a/apps/wf/services.py b/apps/wf/services.py old mode 100644 new mode 100755 diff --git a/apps/wf/tests.py b/apps/wf/tests.py old mode 100644 new mode 100755 diff --git a/apps/wf/urls.py b/apps/wf/urls.py old mode 100644 new mode 100755 diff --git a/apps/wf/views.py b/apps/wf/views.py old mode 100644 new mode 100755 index 9a72b605..d1df1a35 --- a/apps/wf/views.py +++ b/apps/wf/views.py @@ -4,6 +4,7 @@ from django.db.models import query from rest_framework.utils import serializer_helpers from rest_framework.views import APIView from apps.system.models import User +from apps.utils.viewsets import CustomModelViewSet from apps.wf.filters import TicketFilterSet from django.core.exceptions import AppRegistryNotReady from rest_framework.response import Response @@ -31,8 +32,8 @@ class FromCodeListView(APIView): return Response(GetParticipants.all_funcs) class WorkflowViewSet(CreateUpdateModelAMixin, ModelViewSet): - perms_map = {'get': '*', 'post': 'workflow_create', - 'put': 'workflow_update', 'delete': 'workflow_delete'} + perms_map = {'get': '*', 'post': 'workflow:create', + 'put': 'workflow:update', 'delete': 'workflow:delete'} queryset = Workflow.objects.all() serializer_class = WorkflowSerializer search_fields = ['name', 'description'] @@ -40,7 +41,7 @@ class WorkflowViewSet(CreateUpdateModelAMixin, ModelViewSet): ordering_fields = ['create_time'] ordering = ['-create_time'] - @action(methods=['get'], detail=True, perms_map={'get':'workflow_update'}, pagination_class=None, serializer_class=StateSerializer) + @action(methods=['get'], detail=True, perms_map={'get':'workflow:update'}, pagination_class=None, serializer_class=StateSerializer) def states(self, request, pk=None): """ 工作流下的状态节点 @@ -49,7 +50,7 @@ class WorkflowViewSet(CreateUpdateModelAMixin, ModelViewSet): serializer = self.serializer_class(instance=WfService.get_worlflow_states(wf), many=True) return Response(serializer.data) - @action(methods=['get'], detail=True, perms_map={'get':'workflow_update'}, pagination_class=None, serializer_class=TransitionSerializer) + @action(methods=['get'], detail=True, perms_map={'get':'workflow:update'}, pagination_class=None, serializer_class=TransitionSerializer) def transitions(self, request, pk=None): """ 工作流下的流转规则 @@ -58,7 +59,7 @@ class WorkflowViewSet(CreateUpdateModelAMixin, ModelViewSet): serializer = self.serializer_class(instance=WfService.get_workflow_transitions(wf), many=True) return Response(serializer.data) - @action(methods=['get'], detail=True, perms_map={'get':'workflow_update'}, pagination_class=None, serializer_class=CustomFieldSerializer) + @action(methods=['get'], detail=True, perms_map={'get':'workflow:update'}, pagination_class=None, serializer_class=CustomFieldSerializer) def customfields(self, request, pk=None): """ 工作流下的自定义字段 @@ -67,7 +68,7 @@ class WorkflowViewSet(CreateUpdateModelAMixin, ModelViewSet): serializer = self.serializer_class(instance=CustomField.objects.filter(workflow=wf, is_deleted=False).order_by('sort'), many=True) return Response(serializer.data) - @action(methods=['get'], detail=True, perms_map={'get':'workflow_init'}) + @action(methods=['get'], detail=True, perms_map={'get':'workflow:init'}) def init(self, request, pk=None): """ 新建工单初始化 @@ -88,8 +89,8 @@ class WorkflowViewSet(CreateUpdateModelAMixin, ModelViewSet): return Response(ret) class StateViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, DestroyModelMixin, GenericViewSet): - perms_map = {'get':'*', 'post':'workflow_update', - 'put':'workflow_update', 'delete':'workflow_update'} + perms_map = {'get':'*', 'post':'workflow:update', + 'put':'workflow:update', 'delete':'workflow:update'} queryset = State.objects.all() serializer_class = StateSerializer search_fields = ['name'] @@ -97,8 +98,8 @@ class StateViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, Destr ordering = ['sort'] class TransitionViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, DestroyModelMixin, GenericViewSet): - perms_map = {'get':'*', 'post':'workflow_update', - 'put':'workflow_update', 'delete':'workflow_update'} + perms_map = {'get':'*', 'post':'workflow:update', + 'put':'workflow:update', 'delete':'workflow:update'} queryset = Transition.objects.all() serializer_class = TransitionSerializer search_fields = ['name'] @@ -106,8 +107,8 @@ class TransitionViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, ordering = ['id'] class CustomFieldViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, DestroyModelMixin, GenericViewSet): - perms_map = {'get':'*', 'post':'workflow_update', - 'put':'workflow_update', 'delete':'workflow_update'} + perms_map = {'get':'*', 'post':'workflow:update', + 'put':'workflow:update', 'delete':'workflow:update'} queryset = CustomField.objects.all() serializer_class = CustomFieldSerializer search_fields = ['field_name'] @@ -120,7 +121,7 @@ class CustomFieldViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, return super().get_serializer_class() class TicketViewSet(CreateUpdateCustomMixin, CreateModelMixin, ListModelMixin, RetrieveModelMixin, GenericViewSet): - perms_map = {'get':'*', 'post':'ticket_create'} + perms_map = {'get':'*', 'post':'ticket:create'} queryset = Ticket.objects.all() serializer_class = TicketSerializer search_fields = ['title'] @@ -351,8 +352,8 @@ class TicketViewSet(CreateUpdateCustomMixin, CreateModelMixin, ListModelMixin, R else: return Response('工单不可关闭', status=status.HTTP_400_BAD_REQUEST) - @action(methods=['post'], detail=False, perms_map={'post':'ticket_deletes'}, serializer_class=TicketDestorySerializer) - def destory(self, request, pk=None): + @action(methods=['post'], detail=False, perms_map={'post':'ticket:destorys'}, serializer_class=TicketDestorySerializer) + def destorys(self, request, pk=None): """ 批量物理删除 """ diff --git a/log/.gitignore b/log/.gitignore old mode 100644 new mode 100755 diff --git a/manage.py b/manage.py old mode 100644 new mode 100755 diff --git a/media/default/alarm.mp3 b/media/default/alarm.mp3 old mode 100644 new mode 100755 diff --git a/media/default/avatar.png b/media/default/avatar.png old mode 100644 new mode 100755 diff --git a/media/default/test.png b/media/default/test.png old mode 100644 new mode 100755 diff --git a/media/default/test2.jpg b/media/default/test2.jpg old mode 100644 new mode 100755 diff --git a/requirements.txt b/requirements.txt old mode 100644 new mode 100755 diff --git a/server/__init__.py b/server/__init__.py old mode 100644 new mode 100755 diff --git a/server/asgi.py b/server/asgi.py old mode 100644 new mode 100755 diff --git a/server/celery.py b/server/celery.py old mode 100644 new mode 100755 diff --git a/server/conf.example.py b/server/conf.example.py old mode 100644 new mode 100755 diff --git a/server/settings.py b/server/settings.py old mode 100644 new mode 100755 diff --git a/server/urls.py b/server/urls.py old mode 100644 new mode 100755 diff --git a/server/wsgi.py b/server/wsgi.py old mode 100644 new mode 100755