新加入bgm链接字段

Controller/CloudPhoto/CloudPhotoController.py

@@ -8,12 +8,11 @@
 """
 import logging
 import time
-from Ansjer.config import ACCESS_KEY_ID, SECRET_ACCESS_KEY, REGION_NAME, PUSH_BUCKET
+
 from django.db import transaction
 from django.views import View
 
 from Model.models import DeviceCloudPhotoInfo, Device_Info, CloudPhotoBGM
-from Object.AWS.AmazonS3Util import AmazonS3Util
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 
@@ -79,8 +78,7 @@ class CronCloudPhotoView(View):
         """
         获取背景音乐列表
         """
-        photo_bgm = CloudPhotoBGM.objects.filter(is_show=1).values('name')
+        photo_bgm = CloudPhotoBGM.objects.filter(is_show=1).values('name', 'link').order_by('sort')
         if not photo_bgm.exists():
             return response.json(0, [])
-        AmazonS3Util(ACCESS_KEY_ID, SECRET_ACCESS_KEY, REGION_NAME)
-        return response.json(0, [])
+        return response.json(0, list(photo_bgm))

Model/models.py

@@ -3061,6 +3061,7 @@ class CloudPhotoBGM(models.Model):
     id = models.AutoField(primary_key=True, verbose_name='主键')
     is_show = models.SmallIntegerField(default=1, verbose_name=u'是否显示')  # 0: 否, 1: 是
     name = models.CharField(default='', max_length=128, verbose_name=u'音乐名称')
+    link = models.CharField(default='', max_length=255, verbose_name=u'音乐链接')
     sort = models.IntegerField(default=99, blank=True, verbose_name=u'排序，越小越靠前')
     created_time = models.IntegerField(default=0, verbose_name='创建时间')