|
@@ -50,7 +50,7 @@ class authView(TemplateView):
|
|
'client_id': client_id,
|
|
'client_id': client_id,
|
|
'response_type': response_type,
|
|
'response_type': response_type,
|
|
'scope': scope,
|
|
'scope': scope,
|
|
- 'redirect_uri': redirect_uri,
|
|
|
|
|
|
+ 'redirect_uri': redirect_uri
|
|
}
|
|
}
|
|
return render_to_response("login.html", context)
|
|
return render_to_response("login.html", context)
|
|
# return render_template('./login.html', **context)
|
|
# return render_template('./login.html', **context)
|
|
@@ -336,6 +336,9 @@ class oa2DiscoveryDevice(TemplateView):
|
|
updTime=now_time,
|
|
updTime=now_time,
|
|
rtsp_url=rtsp_url,
|
|
rtsp_url=rtsp_url,
|
|
region=region)
|
|
region=region)
|
|
|
|
+ else:
|
|
|
|
+ if uid_rtsp_qs.password != uid_a['password']:
|
|
|
|
+ uid_rtsp_qs.update(password=uid_a['password'],region=region)
|
|
uid_rtsp_id_list.append(uid_rtsp_qs.id)
|
|
uid_rtsp_id_list.append(uid_rtsp_qs.id)
|
|
RESP_SERVER_DOMAIN = RESP_SERVER_DOMAIN_DATA[region]
|
|
RESP_SERVER_DOMAIN = RESP_SERVER_DOMAIN_DATA[region]
|
|
rtsp_uri = '{RTSP_PREFIX}://{RESP_SERVER_DOMAIN}:443/{stream_name}'. \
|
|
rtsp_uri = '{RTSP_PREFIX}://{RESP_SERVER_DOMAIN}:443/{stream_name}'. \
|