Merge branch 'dev' into lang

Controller/CloudStorage.py

@@ -1879,7 +1879,7 @@ def deleteVodHls(request):
 
     response = ResponseObject()
     i = int(request.GET.get('i', 5))
-    nowTime = int(time.time())
+    nowTime = int(time.time()) - 3 * 30 * 24 * 60 * 60  # 保留3个月的数据
     for i in range(i):
         vh_qs = VodHlsModel.objects.filter(endTime__lte=str(nowTime))[0:10000]
         id_list = vh_qs.values_list("id", flat=True)

Controller/UserController.py

@@ -2849,10 +2849,10 @@ class alexaUidView(TemplateView):
             uid_dict = {}
             uid_list = []
             for uid_q in uid_qs:
-                # 追加
-                uid_list.append(uid_q['UID'])
-                # 给uid_q['UID']赋值
-                uid_dict[uid_q['UID']] = {'nick': uid_q['NickName'], 'password': uid_q['View_Password']}
+                # uid转大写
+                UID = uid_q['UID'].upper()
+                uid_list.append(UID)
+                uid_dict[UID] = {'nick': uid_q['NickName'], 'password': uid_q['View_Password']}
 
             us_qs = UidSetModel.objects.filter(uid__in=uid_list, is_alexa=1).values('id', 'uid', 'region_alexa', 'channel')
             if not us_qs.exists():