修改Alexa登录条件判断

controller/index.py

@@ -148,15 +148,16 @@ class loginHandleView(TemplateView):
         logger.info('美洲服务器响应: {}'.format(res_json))
 
         # 如果result_code不为0且region_code为EU,请求欧洲服登录接口
-        if res_json['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'] == 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'
 
         if res_json['result_code'] != 0:
             return response.json(10, res={'msg': 'error'}, extra={'msg': res_json['reason']})
@@ -168,7 +169,8 @@ class loginHandleView(TemplateView):
         if user_qs.exists():
             user_qs.update(region_code=region_code, code=code, updTime=nowTime)
         else:
-            UserModel.objects.create(userID=userID, region_code=region_code, code=code, addTime=nowTime, updTime=nowTime)
+            UserModel.objects.create(userID=userID, region_code=region_code, code=code, addTime=nowTime,
+                                     updTime=nowTime)
             year_month = str(time.strftime('%Y%m', time.localtime(nowTime)))  # 获取当前年月
             user_count_qs = UserCountModel.objects.filter(skill_name=skill_name, year_month=year_month).values('amount')
             if not user_count_qs.exists():