|
@@ -147,17 +147,17 @@ class loginHandleView(TemplateView):
|
|
res_json = res.json()
|
|
res_json = res.json()
|
|
logger.info('美洲服务器响应: {}'.format(res_json))
|
|
logger.info('美洲服务器响应: {}'.format(res_json))
|
|
|
|
|
|
- # 如果result_code不为0且region_code为EU,请求欧洲服登录接口
|
|
|
|
- if res_json['result_code'] != 0:
|
|
|
|
- if res_json['result_code'] == 104 or res_json['result']['region_code'] == 'EU':
|
|
|
|
- auth_request_url = '{SERVER_PREFIX}/oalexa/auth'.format(SERVER_PREFIX=SERVER_PREFIX_EU)
|
|
|
|
- res = requests.post(url=auth_request_url, data=requests_data)
|
|
|
|
- if res.status_code != 200:
|
|
|
|
- return response.json(10, res={'错误': '请求响应异常'})
|
|
|
|
- res_json = res.json()
|
|
|
|
- logger.info('欧洲服务器响应: {}'.format(res_json))
|
|
|
|
- if res_json['result_code'] != 0:
|
|
|
|
- region_code = 'EU'
|
|
|
|
|
|
+ # 账号不存在/密码错误/账号存在但用户地区为欧洲时请求欧洲服
|
|
|
|
+ result_code = res_json['result_code']
|
|
|
|
+ if result_code == 104 or result_code == 111 or (result_code == 0 and res_json['result']['region_code'] == 'EU'):
|
|
|
|
+ auth_request_url = '{SERVER_PREFIX}/oalexa/auth'.format(SERVER_PREFIX=SERVER_PREFIX_EU)
|
|
|
|
+ res = requests.post(url=auth_request_url, data=requests_data)
|
|
|
|
+ if res.status_code != 200:
|
|
|
|
+ return response.json(10, res={'错误': '请求响应异常'})
|
|
|
|
+ res_json = res.json()
|
|
|
|
+ logger.info('欧洲服务器响应: {}'.format(res_json))
|
|
|
|
+ if res_json['result_code'] != 0:
|
|
|
|
+ region_code = 'EU'
|
|
|
|
|
|
if res_json['result_code'] != 0:
|
|
if res_json['result_code'] != 0:
|
|
return response.json(10, res={'msg': 'error'}, extra={'msg': res_json['reason']})
|
|
return response.json(10, res={'msg': 'error'}, extra={'msg': res_json['reason']})
|