|
@@ -81,7 +81,7 @@ class loginHandleView(TemplateView):
|
|
|
print(user)
|
|
|
print(pwd)
|
|
|
auth_request_url = '{SERVER_PREFIX}/oalexa/auth'.format(SERVER_PREFIX=SERVER_PREFIX)
|
|
|
-
|
|
|
+ print(auth_request_url)
|
|
|
# auth_request_url = 'http://192.168.136.40:8077/oalexa/auth'
|
|
|
requests_data = {'userName': user, 'userPwd': pwd}
|
|
|
res = requests.post(url=auth_request_url, data=requests_data)
|
|
@@ -101,7 +101,7 @@ class loginHandleView(TemplateView):
|
|
|
redirect_uri = redirect_uri + '?code=' + code + '&state=' + state
|
|
|
return response.json(0, res=redirect_uri)
|
|
|
else:
|
|
|
- return response.json(0, res={'msg': 'error'})
|
|
|
+ return response.json(10, res={'msg': 'error'}, extra={'msg': res_json['reason']})
|
|
|
|
|
|
|
|
|
class oa2TokenView(TemplateView):
|
|
@@ -211,8 +211,8 @@ class oa2RtspStartView(TemplateView):
|
|
|
# ur_qs = UidRtspModel.objects.filter(usermodel__userID=userID,uid=)
|
|
|
UID = ur_qs[0]['uid']
|
|
|
PWD = ur_qs[0]['password']
|
|
|
- MSG = 'rtsp://{RESP_SERVER_DOMAIN}:8554/{stream_name}'.\
|
|
|
- format(RESP_SERVER_DOMAIN=RESP_SERVER_DOMAIN,stream_name=ur_qs[0]['rtsp_url'])
|
|
|
+ MSG = 'rtsp://{RESP_SERVER_DOMAIN}:8554/{stream_name}'. \
|
|
|
+ format(RESP_SERVER_DOMAIN=RESP_SERVER_DOMAIN, stream_name=ur_qs[0]['rtsp_url'])
|
|
|
# po = Pool(10)
|
|
|
# po.apply_async(self.runSendRtspMsg, (UID, PWD, MSG))
|
|
|
print(UID)
|
|
@@ -225,7 +225,7 @@ class oa2RtspStartView(TemplateView):
|
|
|
else:
|
|
|
return JsonResponse({'msg': 'stop no', 'code': 0})
|
|
|
# threading.Thread(target=runSendRtspMsg_thread, args=(UID, PWD, MSG)).start()
|
|
|
- send_flag = self.runSendRtspMsg(UID,PWD,MSG)
|
|
|
+ send_flag = self.runSendRtspMsg(UID, PWD, MSG)
|
|
|
res_json = {
|
|
|
'endpointId': id,
|
|
|
'manufacturerName': 'Axis',
|
|
@@ -239,7 +239,8 @@ class oa2RtspStartView(TemplateView):
|
|
|
'audioCodecs': ['G711'],
|
|
|
'protocols': ['RTSP'],
|
|
|
'authorizationTypes': ['NONE'],
|
|
|
- 'uri': 'rtsp://{RESP_SERVER_DOMAIN}:443/{stream_name}'.format(RESP_SERVER_DOMAIN=RESP_SERVER_DOMAIN,stream_name=ur_qs[0]['rtsp_url'])
|
|
|
+ 'uri': 'rtsp://{RESP_SERVER_DOMAIN}:443/{stream_name}'.format(RESP_SERVER_DOMAIN=RESP_SERVER_DOMAIN,
|
|
|
+ stream_name=ur_qs[0]['rtsp_url'])
|
|
|
}
|
|
|
if send_flag:
|
|
|
redisObj.set_data(key=key, val=str(res_json), expire=30)
|
|
@@ -334,7 +335,8 @@ class oa2DiscoveryDevice(TemplateView):
|
|
|
'audioCodecs': ['ACC'],
|
|
|
'protocols': ['RTSP'],
|
|
|
'authorizationTypes': ['NONE'],
|
|
|
- 'uri': 'rtsp://{RESP_SERVER_DOMAIN}:443/{stream_name}'.format(RESP_SERVER_DOMAIN=RESP_SERVER_DOMAIN,stream_name=rtsp_url)
|
|
|
+ 'uri': 'rtsp://{RESP_SERVER_DOMAIN}:443/{stream_name}'.format(
|
|
|
+ RESP_SERVER_DOMAIN=RESP_SERVER_DOMAIN, stream_name=rtsp_url)
|
|
|
}
|
|
|
res_json.append(ur_data)
|
|
|
print(uid_rtsp_id_list)
|