zcdsj
/
cma_search
mirror of https://e.coding.net/ctcdevteam/cma_search.git
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search

This commit is contained in:
shilixia 2021-08-27 15:42:51 +08:00
parent f7738a9ed9 125b03f5f8
commit 8a9f789bb6
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/apps/ability/views.py
View File

@ -59,8 +59,8 @@ class AbilityContentViewSet(CreateUpdateCustomMixin, ModelViewSet):
serializer.save(update_by = self.request.user) serializer.save(update_by = self.request.user)
class AbilityRecordViewSet(PageOrNot, CreateUpdateCustomMixin, ModelViewSet): class AbilityRecordViewSet(PageOrNot, CreateUpdateCustomMixin, ModelViewSet):
perms_map = {'get': '*', 'post': 'record_create', perms_map = {'get': '*', 'post': '*',
'put': 'record_update', 'delete': 'record_delete'} 'put': '*', 'delete': '*'}
queryset = Record.objects.filter(content__cate=2) queryset = Record.objects.filter(content__cate=2)
serializer_class = RecordSerializer serializer_class = RecordSerializer
search_fields = ['content__name'] search_fields = ['content__name']

2
server/apps/vod/models.py
View File

@ -28,7 +28,7 @@ class ViewRecord(BaseModel):
user = models.ForeignKey(User, on_delete=models.CASCADE, verbose_name='观看人', related_name='viewrecord_user') user = models.ForeignKey(User, on_delete=models.CASCADE, verbose_name='观看人', related_name='viewrecord_user')
views = models.IntegerField(verbose_name='观看次数', default=0) views = models.IntegerField(verbose_name='观看次数', default=0)
current = 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: class Meta:

2
server/apps/vod/views.py
View File

@ -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) page = self.paginate_queryset(queryset)
if page is not None: if page is not None:
serializer = VRecordSerializer(page, many=True) serializer = VRecordSerializer(page, many=True)

22
server/server/settings_dev.py
View File

@ -1,20 +1,20 @@
from .settings import * from .settings import *
DEBUG = True DEBUG = True
DATABASES = { DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql',
'NAME': 'cma',
'USER': 'postgres',
'PASSWORD': 'zctest1234',
'HOST': '47.95.0.242',
'PORT': '5432',
}
# 'default': { # 'default': {
# 'ENGINE': 'django.db.backends.postgresql', # 'ENGINE': 'django.db.backends.postgresql',
# 'NAME': 'cma', # 'NAME': 'cma',
# 'USER': 'cma', # 'USER': 'postgres',
# 'PASSWORD': 'cma123', # 'PASSWORD': 'zctest1234',
# 'HOST': '172.16.80.102', # 'HOST': '47.95.0.242',
# 'PORT': '5432', # 'PORT': '5432',
# } # }
'default': {
'ENGINE': 'django.db.backends.postgresql',
'NAME': 'cma',
'USER': 'cma',
'PASSWORD': 'cma123',
'HOST': '172.16.80.102',
'PORT': '5432',
}
} }