修改美洲设备获取sts域名

Controller/CloudStorage.py

@@ -456,7 +456,7 @@ class CloudStorageView(View):
                                            addTime=now_time, type=1)
             return JsonResponse(status=200, data=res)
         except Exception as e:
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     @staticmethod
     def do_query_vod_list(request_dict, user_id, response):  # 获取视频播放列表
@@ -681,7 +681,7 @@ class CloudStorageView(View):
             res = {'code': 0, 'msg': '存储成功'}
             return HttpResponse(json.dumps(res, ensure_ascii=False), content_type='application/json,charset=utf-8')
         except Exception as e:
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     @staticmethod
     def do_change_vod_status(request_dict, user_id, response):  # 修改云存状态
@@ -722,11 +722,12 @@ class CloudStorageView(View):
         uid_obj = UidTokenObject()
         uid_obj.generate(data={'uid': uid, 'channel': channel})
 
+        urls = 'http://vod.neutral2.com/'   # SERVER_DOMAIN_SSL,美洲暂用此域名请求到aws,解决设备获取sts超时问题
         # 欧洲域名固定返回欧洲域名
-        urls = SERVER_DOMAIN_SSL
         if domain_name in ['api.zositeche.com', 'api.loocam3.com', 'common.neutral3.com']:
             urls = 'https://api.zositeche.com/'
-        uid_tk_url = '{}cloudstorage/getsignsts?uidToken={}'.format(urls, uid_obj.token)
+        sign = CommonService.encode_data(uid[0:8], start=0, end=1)
+        uid_tk_url = '{}cloudstorage/getsignsts?uidToken={}&sn={}'.format(urls, uid_obj.token, sign)
         store_hls_url = '{}cloudstorage/storeplaylist?uidToken={}'.format(urls, uid_obj.token)
         return response.json(0, {'uidTkUrl': uid_tk_url, 'storeHlsUrl': store_hls_url})