|
@@ -94,18 +94,17 @@ class deviceStatus(TemplateView):
|
|
UID = request_dict.get("UID", '')
|
|
UID = request_dict.get("UID", '')
|
|
userID = request_dict.get("userID", '')
|
|
userID = request_dict.get("userID", '')
|
|
uid_nick = request_dict.get("uid_nick", '')
|
|
uid_nick = request_dict.get("uid_nick", '')
|
|
- if UID == 'HVTLKFJM6KDTAF9J111A':
|
|
|
|
- logger.info('this is my UID1111-------------------------------------')
|
|
|
|
- logger.info('class:deviceStatus-------function:addOrUpdate------------------')
|
|
|
|
- logger.info(UID)
|
|
|
|
- logger.info(userID)
|
|
|
|
- logger.info(uid_nick)
|
|
|
|
|
|
+ encrypt_pwd = request_dict.get("password", '')
|
|
|
|
+ region = request_dict.get("region", 'EN')
|
|
|
|
+
|
|
|
|
|
|
- if UID == '' or userID == '' or uid_nick == '':
|
|
|
|
|
|
+ if UID == '' or userID == '' or uid_nick == '' or encrypt_pwd == '':
|
|
return JsonResponse({'code':101,'msg':'fail'})
|
|
return JsonResponse({'code':101,'msg':'fail'})
|
|
|
|
|
|
- if UID == 'HVTLKFJM6KDTAF9J111A':
|
|
|
|
- logger.info('this is my UID-------------------------------------')
|
|
|
|
|
|
+ commonService = CommonService()
|
|
|
|
+ password = commonService.decode_pwd(encrypt_pwd)
|
|
|
|
+ logger.info(encrypt_pwd)
|
|
|
|
+ logger.info(password)
|
|
|
|
|
|
alexAuth = AlexaAuthModel.objects.filter(userID=userID)
|
|
alexAuth = AlexaAuthModel.objects.filter(userID=userID)
|
|
if not alexAuth.exists():
|
|
if not alexAuth.exists():
|
|
@@ -135,10 +134,10 @@ class deviceStatus(TemplateView):
|
|
try:
|
|
try:
|
|
uid_rtsp_qs = UidRtspModel.objects.get(uid=UID)
|
|
uid_rtsp_qs = UidRtspModel.objects.get(uid=UID)
|
|
except UidRtspModel.DoesNotExist:
|
|
except UidRtspModel.DoesNotExist:
|
|
- uid_rtsp_qs = UidRtspModel.objects.create(uid=UID, password='admin',
|
|
|
|
|
|
+ uid_rtsp_qs = UidRtspModel.objects.create(uid=UID, password=password,
|
|
nick=uid_nick, addTime=now_time,
|
|
nick=uid_nick, addTime=now_time,
|
|
updTime=now_time, rtsp_url=rtsp_url,
|
|
updTime=now_time, rtsp_url=rtsp_url,
|
|
- region='EN')
|
|
|
|
|
|
+ region=region)
|
|
else:
|
|
else:
|
|
# if uid_rtsp_qs.password != uid_a['password']:
|
|
# if uid_rtsp_qs.password != uid_a['password']:
|
|
uid_rtsp_qs.password = 'admin'
|
|
uid_rtsp_qs.password = 'admin'
|