|
@@ -109,10 +109,7 @@ class loginHandleView(TemplateView):
|
|
|
# 返回code
|
|
|
logger = logging.getLogger('django')
|
|
|
logger.info('------开始认证登录------')
|
|
|
- logger.info(client_id)
|
|
|
- logger.info(response_type)
|
|
|
- logger.info(scope)
|
|
|
- logger.info(redirect_uri)
|
|
|
+ logger.info('redirect_uri: {}'.format(redirect_uri))
|
|
|
|
|
|
if client_id != 'azalexaclient' or response_type != 'code' or scope != 'profile':
|
|
|
return response.json(10, res={'msg': 'error'}, extra={'msg': 'message wrong'})
|
|
@@ -128,24 +125,26 @@ class loginHandleView(TemplateView):
|
|
|
res = requests.post(url=auth_request_url, data=requests_data)
|
|
|
res_json = res.json()
|
|
|
|
|
|
- if res_json['result_code'] == 0:
|
|
|
- userID = res_json['result']['userID']
|
|
|
- # uid_arr = res_json['result']['uid_arr']
|
|
|
- nowTime = int(time.time())
|
|
|
- user_qs = UserModel.objects.filter(userID=userID)
|
|
|
- if not user_qs.exists():
|
|
|
- UserModel.objects.create(
|
|
|
- userID=userID,
|
|
|
- addTime=nowTime,
|
|
|
- updTime=nowTime)
|
|
|
- user_qs = UserModel.objects.filter(userID=userID)
|
|
|
- code = CommonService.encrypt_data(32)
|
|
|
- user_qs.update(code=code)
|
|
|
- redirect_uri = redirect_uri + '?code=' + code + '&state=' + state
|
|
|
- return response.json(0, res=redirect_uri)
|
|
|
- else:
|
|
|
+ logger.info('请求服务器url: {}'.format(auth_request_url))
|
|
|
+ logger.info('服务器响应: {}'.format(res_json))
|
|
|
+
|
|
|
+ if res_json['result_code'] != 0:
|
|
|
return response.json(10, res={'msg': 'error'}, extra={'msg': res_json['reason']})
|
|
|
|
|
|
+ nowTime = int(time.time())
|
|
|
+ userID = res_json['result']['userID']
|
|
|
+ user_qs = UserModel.objects.filter(userID=userID)
|
|
|
+ if not user_qs.exists():
|
|
|
+ UserModel.objects.create(
|
|
|
+ userID=userID,
|
|
|
+ addTime=nowTime,
|
|
|
+ updTime=nowTime)
|
|
|
+ user_qs = UserModel.objects.filter(userID=userID)
|
|
|
+ code = CommonService.encrypt_data(32)
|
|
|
+ user_qs.update(code=code)
|
|
|
+ redirect_uri = redirect_uri + '?code=' + code + '&state=' + state
|
|
|
+ return response.json(0, res=redirect_uri)
|
|
|
+
|
|
|
|
|
|
class oa2TokenView(TemplateView):
|
|
|
|
|
@@ -497,8 +496,7 @@ class oa2DiscoveryDevice(TemplateView):
|
|
|
}
|
|
|
res_json.append(ur_data)
|
|
|
user.uid_rtsp.add(*uid_rtsp_id_list)
|
|
|
- logger.info('________________471')
|
|
|
- logger.info(res_json)
|
|
|
+ logger.info('搜索设备返回值: {}'.format(res_json))
|
|
|
return JsonResponse(res_json, safe=False)
|
|
|
|
|
|
#新增
|