Merge branch 'test' of 13.56.215.252:/web/rpo/AnsjerFormal into dev

# Conflicts:
#	Controller/CloudStorage.py

Controller/CloudStorage.py

@@ -18,6 +18,7 @@ import urllib
 import boto3
 import oss2
 import paypalrestsdk
+import threading
 from aliyunsdkcore import client
 from aliyunsdksts.request.v20150401 import AssumeRoleRequest
 from boto3.session import Session
@@ -444,6 +445,8 @@ class CloudStorageView(View):
         vod_play_list = []
 
 
+
+
         print(int(time.time()))
         for vod in vh_qs:
             bucket__mold = vod["bucket__mold"]