|
@@ -107,25 +107,24 @@ class loginHandleView(TemplateView):
|
|
scope = request_dict.get("scope", '')
|
|
scope = request_dict.get("scope", '')
|
|
redirect_uri = request_dict.get("redirect_uri", '')
|
|
redirect_uri = request_dict.get("redirect_uri", '')
|
|
# 返回code
|
|
# 返回code
|
|
- print('userPwd---------------')
|
|
|
|
logger = logging.getLogger('django')
|
|
logger = logging.getLogger('django')
|
|
- logger.info('login-------------begin')
|
|
|
|
|
|
+ logger.info('------开始认证登录------')
|
|
logger.info(client_id)
|
|
logger.info(client_id)
|
|
logger.info(response_type)
|
|
logger.info(response_type)
|
|
logger.info(scope)
|
|
logger.info(scope)
|
|
logger.info(redirect_uri)
|
|
logger.info(redirect_uri)
|
|
- logger.info(request_dict)
|
|
|
|
|
|
+
|
|
if client_id != 'azalexaclient' or response_type != 'code' or scope != 'profile':
|
|
if client_id != 'azalexaclient' or response_type != 'code' or scope != 'profile':
|
|
return response.json(10, res={'msg': 'error'}, extra={'msg': 'message wrong'})
|
|
return response.json(10, res={'msg': 'error'}, extra={'msg': 'message wrong'})
|
|
|
|
+
|
|
auth_request_url = '{SERVER_PREFIX}/oalexa/auth'.format(SERVER_PREFIX=SERVER_PREFIX)
|
|
auth_request_url = '{SERVER_PREFIX}/oalexa/auth'.format(SERVER_PREFIX=SERVER_PREFIX)
|
|
requests_data = {'userName': user, 'userPwd': pwd}
|
|
requests_data = {'userName': user, 'userPwd': pwd}
|
|
res = requests.post(url=auth_request_url, data=requests_data)
|
|
res = requests.post(url=auth_request_url, data=requests_data)
|
|
res_json = res.json()
|
|
res_json = res.json()
|
|
|
|
|
|
# 添加测试服务器测试
|
|
# 添加测试服务器测试
|
|
- if res_json['result_code'] == 104:
|
|
|
|
|
|
+ if res_json['result_code'] != 0:
|
|
auth_request_url = '{SERVER_PREFIX}/oalexa/auth'.format(SERVER_PREFIX=SERVER_PREFIX_TEST)
|
|
auth_request_url = '{SERVER_PREFIX}/oalexa/auth'.format(SERVER_PREFIX=SERVER_PREFIX_TEST)
|
|
- requests_data = {'userName': user, 'userPwd': pwd}
|
|
|
|
res = requests.post(url=auth_request_url, data=requests_data)
|
|
res = requests.post(url=auth_request_url, data=requests_data)
|
|
res_json = res.json()
|
|
res_json = res.json()
|
|
|
|
|
|
@@ -440,7 +439,7 @@ class oa2DiscoveryDevice(TemplateView):
|
|
logger.info('服务器响应: {}'.format(res_json))
|
|
logger.info('服务器响应: {}'.format(res_json))
|
|
|
|
|
|
# 添加测试服务器测试
|
|
# 添加测试服务器测试
|
|
- if res_json['result_code'] == 104:
|
|
|
|
|
|
+ if res_json['result_code'] != 0:
|
|
auth_request_url = '{SERVER_PREFIX}/oalexa/discoveryuid'.format(SERVER_PREFIX=SERVER_PREFIX_TEST)
|
|
auth_request_url = '{SERVER_PREFIX}/oalexa/discoveryuid'.format(SERVER_PREFIX=SERVER_PREFIX_TEST)
|
|
res = requests.post(url=auth_request_url, data=requests_data)
|
|
res = requests.post(url=auth_request_url, data=requests_data)
|
|
res_json = res.json()
|
|
res_json = res.json()
|