|
@@ -27,6 +27,8 @@ from botocore.auth import SigV4Auth
|
|
from botocore.awsrequest import AWSRequest
|
|
from botocore.awsrequest import AWSRequest
|
|
from botocore.credentials import Credentials
|
|
from botocore.credentials import Credentials
|
|
|
|
|
|
|
|
+from Service.CommonService import CommonService
|
|
|
|
+
|
|
|
|
|
|
class UserRelatedView(View):
|
|
class UserRelatedView(View):
|
|
def get(self, request, *args, **kwargs):
|
|
def get(self, request, *args, **kwargs):
|
|
@@ -550,11 +552,12 @@ class KVSView(View):
|
|
@param response: 响应对象
|
|
@param response: 响应对象
|
|
@return: response
|
|
@return: response
|
|
"""
|
|
"""
|
|
- serial = request_dict.get('serial', None)
|
|
|
|
|
|
+ uid = request_dict.get('uid', None)
|
|
sdp_offer = request_dict.get('sdp_offer', None)
|
|
sdp_offer = request_dict.get('sdp_offer', None)
|
|
- if not all([serial, sdp_offer]):
|
|
|
|
|
|
+ if not all([uid, sdp_offer]):
|
|
return response.json(444)
|
|
return response.json(444)
|
|
try:
|
|
try:
|
|
|
|
+ serial = CommonService.get_serial_number_by_uid(uid)
|
|
kvs_qs = KVS.objects.filter(stream_name=serial).values('channel_arn')
|
|
kvs_qs = KVS.objects.filter(stream_name=serial).values('channel_arn')
|
|
if not kvs_qs.exists():
|
|
if not kvs_qs.exists():
|
|
return response.json(173)
|
|
return response.json(173)
|
|
@@ -597,6 +600,10 @@ class KVSView(View):
|
|
r = requests.post(url, headers=headers, data=json.dumps(payload))
|
|
r = requests.post(url, headers=headers, data=json.dumps(payload))
|
|
assert r.status_code == 200
|
|
assert r.status_code == 200
|
|
LOGGER.info('SendAlexaOfferToMaster响应: {}'.format(r.json()))
|
|
LOGGER.info('SendAlexaOfferToMaster响应: {}'.format(r.json()))
|
|
|
|
+ sdp_answer = r.json()['Answer']
|
|
|
|
+ res = {
|
|
|
|
+ 'sdp_answer': sdp_answer
|
|
|
|
+ }
|
|
return response.json(0)
|
|
return response.json(0)
|
|
except Exception as e:
|
|
except Exception as e:
|
|
return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
|
|
return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
|