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', + } }