云存上传日志

Controller/CloudStorage.py

@@ -589,6 +589,18 @@ class CloudStorageView(View):
                     fg=fg,
                     sec=sec,
                 )
+                ip = '127.0.0.1'
+                content = json.loads(json.dumps(request_dict))
+                log = {
+                    'ip': ip,
+                    'user_id': 2,
+                    'status': 200,
+                    'time': int(time.time()),
+                    'url': 'CloudStorage',
+                    'content': json.dumps(content),
+                    'operation': '{}上传云存视频'.format(UID),
+                }
+                LogModel.objects.create(**log)
                 end_time_stamp = datetime.datetime.fromtimestamp(int(end_time))
                 end_time_str = datetime.datetime(end_time_stamp.year, end_time_stamp.month, 1)
                 end_time_stamp = CommonService.str_to_timestamp(end_time_str.strftime('%Y-%m-%d %H:%M:%S'))
@@ -601,18 +613,7 @@ class CloudStorageView(View):
                 else:
                     VodHlsSummary.objects.create(uid=UID, time=end_time_stamp,
                                                  upload_duration=sec, upload_frequency=1)
-                ip = '127.0.0.1'
-                content = json.loads(json.dumps(request_dict))
-                log = {
-                    'ip': ip,
-                    'user_id': 2,
-                    'status': 200,
-                    'time': int(time.time()),
-                    'url': 'deviceManagement/resetPrimaryUser',
-                    'content': json.dumps(content),
-                    'operation': '{}上传云存视频'.format(UID),
-                }
-                LogModel.objects.create(**log)
+
                 res = {'code': 0, 'msg': '存储成功'}
                 return HttpResponse(json.dumps(res, ensure_ascii=False),
                                     content_type="application/json,charset=utf-8")

Controller/CloudVod.py

@@ -638,6 +638,18 @@ class CloudVodView(View):
         endTime = int(storeTime) + storeDay * 86400
         VodHlsModel.objects.create(uid=UID, channel=channel, time=storeTime,
                                    endTime=endTime, bucket_id=bucketID, sec=sec)
+        ip = '127.0.0.1'
+        content = json.loads(json.dumps(request_dict))
+        log = {
+            'ip': ip,
+            'user_id': 2,
+            'status': 200,
+            'time': int(time.time()),
+            'url': 'CloudVod',
+            'content': json.dumps(content),
+            'operation': '{}上传云存视频'.format(UID),
+        }
+        LogModel.objects.create(**log)
         end_time_stamp = datetime.datetime.fromtimestamp(int(endTime))
         end_time_str = datetime.datetime(end_time_stamp.year, end_time_stamp.month, 1)
         end_time_stamp = CommonService.str_to_timestamp(end_time_str.strftime('%Y-%m-%d %H:%M:%S'))
@@ -650,18 +662,7 @@ class CloudVodView(View):
         else:
             VodHlsSummary.objects.create(uid=UID, time=end_time_stamp,
                                          upload_duration=sec, upload_frequency=1)
-        ip = '127.0.0.1'
-        content = json.loads(json.dumps(request_dict))
-        log = {
-            'ip': ip,
-            'user_id': 2,
-            'status': 200,
-            'time': int(time.time()),
-            'url': 'deviceManagement/resetPrimaryUser',
-            'content': json.dumps(content),
-            'operation': '{}上传云存视频'.format(UID),
-        }
-        LogModel.objects.create(**log)
+
         return response.json(0)
 
     def do_filter_playlist(self, request_dict, userID, response):