From d3ef7176ae04d6dae5a20f9496f43dae8a8011dd Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 25 Aug 2021 13:40:34 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=A7=82=E7=9C=8B?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/apps/vod/models.py | 2 +- server/server/settings_dev.py | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/server/apps/vod/models.py b/server/apps/vod/models.py index bb131f8..508aafd 100644 --- a/server/apps/vod/models.py +++ b/server/apps/vod/models.py @@ -28,7 +28,7 @@ class ViewRecord(BaseModel): user = models.ForeignKey(User, on_delete=models.CASCADE, verbose_name='观看人', related_name='viewrecord_user') views = models.IntegerField(verbose_name='观看次数', default=0) current = models.IntegerField(verbose_name='当前观看进度(秒)', default=0) - video = models.ForeignKey(Video, verbose_name='点播视频', on_delete=models.CASCADE) + video = models.ForeignKey(Video, verbose_name='点播视频', on_delete=models.CASCADE, related_name='record_video') class Meta: diff --git a/server/server/settings_dev.py b/server/server/settings_dev.py index c6c83b7..dca12b6 100644 --- a/server/server/settings_dev.py +++ b/server/server/settings_dev.py @@ -1,20 +1,20 @@ from .settings import * DEBUG = True DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.postgresql', - 'NAME': 'cma', - 'USER': 'postgres', - 'PASSWORD': 'zctest1234', - 'HOST': '47.95.0.242', - 'PORT': '5432', - } # 'default': { # 'ENGINE': 'django.db.backends.postgresql', # 'NAME': 'cma', - # 'USER': 'cma', - # 'PASSWORD': 'cma123', - # 'HOST': '172.16.80.102', + # 'USER': 'postgres', + # 'PASSWORD': 'zctest1234', + # 'HOST': '47.95.0.242', # 'PORT': '5432', # } + 'default': { + 'ENGINE': 'django.db.backends.postgresql', + 'NAME': 'cma', + 'USER': 'cma', + 'PASSWORD': 'cma123', + 'HOST': '172.16.80.102', + 'PORT': '5432', + } } From 135c3d65b98d509b97f61e829aa0753c7523de3b Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 25 Aug 2021 13:40:34 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=A7=82=E7=9C=8B?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/apps/vod/models.py | 2 +- server/apps/vod/views.py | 2 +- server/server/settings_dev.py | 22 +++++++++++----------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/server/apps/vod/models.py b/server/apps/vod/models.py index bb131f8..508aafd 100644 --- a/server/apps/vod/models.py +++ b/server/apps/vod/models.py @@ -28,7 +28,7 @@ class ViewRecord(BaseModel): user = models.ForeignKey(User, on_delete=models.CASCADE, verbose_name='观看人', related_name='viewrecord_user') views = models.IntegerField(verbose_name='观看次数', default=0) current = models.IntegerField(verbose_name='当前观看进度(秒)', default=0) - video = models.ForeignKey(Video, verbose_name='点播视频', on_delete=models.CASCADE) + video = models.ForeignKey(Video, verbose_name='点播视频', on_delete=models.CASCADE, related_name='record_video') class Meta: diff --git a/server/apps/vod/views.py b/server/apps/vod/views.py index df7ddfb..a115d4e 100644 --- a/server/apps/vod/views.py +++ b/server/apps/vod/views.py @@ -52,7 +52,7 @@ class VideoViewSet(PageOrNot, CreateUpdateModelAMixin, ModelViewSet): """ 个人观看记录 """ - queryset = ViewRecord.objects.filter(user=request.user) + queryset = ViewRecord.objects.filter(user=request.user).order_by('-id') page = self.paginate_queryset(queryset) if page is not None: serializer = VRecordSerializer(page, many=True) diff --git a/server/server/settings_dev.py b/server/server/settings_dev.py index c6c83b7..dca12b6 100644 --- a/server/server/settings_dev.py +++ b/server/server/settings_dev.py @@ -1,20 +1,20 @@ from .settings import * DEBUG = True DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.postgresql', - 'NAME': 'cma', - 'USER': 'postgres', - 'PASSWORD': 'zctest1234', - 'HOST': '47.95.0.242', - 'PORT': '5432', - } # 'default': { # 'ENGINE': 'django.db.backends.postgresql', # 'NAME': 'cma', - # 'USER': 'cma', - # 'PASSWORD': 'cma123', - # 'HOST': '172.16.80.102', + # 'USER': 'postgres', + # 'PASSWORD': 'zctest1234', + # 'HOST': '47.95.0.242', # 'PORT': '5432', # } + 'default': { + 'ENGINE': 'django.db.backends.postgresql', + 'NAME': 'cma', + 'USER': 'cma', + 'PASSWORD': 'cma123', + 'HOST': '172.16.80.102', + 'PORT': '5432', + } } From a588efb21d937b3e73302ebe5aaa989177488224 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 27 Aug 2021 15:30:12 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/apps/ability/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/apps/ability/views.py b/server/apps/ability/views.py index 89aef5f..90cb1fa 100644 --- a/server/apps/ability/views.py +++ b/server/apps/ability/views.py @@ -59,7 +59,7 @@ class AbilityContentViewSet(CreateUpdateCustomMixin, ModelViewSet): serializer.save(update_by = self.request.user) class AbilityRecordViewSet(PageOrNot, CreateUpdateCustomMixin, ModelViewSet): - perms_map = {'get': '*', 'post': 'record_create', + perms_map = {'get': '*', 'post': 'record_update', 'put': 'record_update', 'delete': 'record_delete'} queryset = Record.objects.filter(content__cate=2) serializer_class = RecordSerializer From 976858a6a38712ce289b6509868c0f412c6f769b Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 27 Aug 2021 15:35:35 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E6=8A=A5=E9=80=81?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/apps/ability/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/apps/ability/views.py b/server/apps/ability/views.py index 90cb1fa..e712820 100644 --- a/server/apps/ability/views.py +++ b/server/apps/ability/views.py @@ -59,8 +59,8 @@ class AbilityContentViewSet(CreateUpdateCustomMixin, ModelViewSet): serializer.save(update_by = self.request.user) class AbilityRecordViewSet(PageOrNot, CreateUpdateCustomMixin, ModelViewSet): - perms_map = {'get': '*', 'post': 'record_update', - 'put': 'record_update', 'delete': 'record_delete'} + perms_map = {'get': '*', 'post': '*', + 'put': '*', 'delete': 'record_delete'} queryset = Record.objects.filter(content__cate=2) serializer_class = RecordSerializer search_fields = ['content__name'] From 125b03f5f8bc043ed4870a5e9e74a88c88d33861 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 27 Aug 2021 15:39:26 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E6=8A=A5=E9=80=81?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/apps/ability/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/apps/ability/views.py b/server/apps/ability/views.py index e712820..a447c4f 100644 --- a/server/apps/ability/views.py +++ b/server/apps/ability/views.py @@ -60,7 +60,7 @@ class AbilityContentViewSet(CreateUpdateCustomMixin, ModelViewSet): class AbilityRecordViewSet(PageOrNot, CreateUpdateCustomMixin, ModelViewSet): perms_map = {'get': '*', 'post': '*', - 'put': '*', 'delete': 'record_delete'} + 'put': '*', 'delete': '*'} queryset = Record.objects.filter(content__cate=2) serializer_class = RecordSerializer search_fields = ['content__name']