Merge branch 'master' of http://192.168.136.99:3000/servers/ASJServer

Controller/UserController.py

@@ -1,21 +1,7 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
-@Copyright (C) ansjer cop Video Technology Co.,Ltd.All rights reserved.
-@AUTHOR: ASJRD018
-@NAME: AnsjerFormal
-@software: PyCharm
-@DATE: 2018/9/11 15:08
-@Version: python3.6
-@MODIFY DECORD:ansjer dev
-@file: UserController.py
-@Contact: chanjunkai@163.com
-"""
 import base64
 import datetime
 import logging
 import random
-import threading
 import time
 import traceback
 from io import BytesIO
@@ -37,7 +23,8 @@ from django.views.generic import View
 from jwt.algorithms import RSAAlgorithm
 from ratelimit import limits
 
-from Ansjer.config import AuthCode_Expire, SERVER_DOMAIN, APNS_CONFIG, JPUSH_CONFIG, FCM_CONFIG, TUTK_PUSH_DOMAIN, LOGGER
+from Ansjer.config import AuthCode_Expire, SERVER_DOMAIN, TUTK_PUSH_DOMAIN, \
+    LOGGER, CONFIG_US
 from Ansjer.config import BASE_DIR, CONFIG_EUR, CONFIG_INFO, SERVER_DOMAIN_EUR, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY
 from Controller.CheckUserData import DataValid, date_handler, RandomStr
 from Model.models import Device_User, Role, UidPushModel, UserOauth2Model, UserExModel, Device_Info, UidSetModel, \
@@ -720,6 +707,20 @@ class refreshTokenViewV3(TemplateView):
             userID = tko.userID
             tko.lang = lang
             if password:  # 检验密码
+                user_qs = Device_User.objects.filter(userID=userID).values('password', 'region_country')
+                if not user_qs.exists():
+                    return response.json(104)
+
+                # 国外正式服,判断是否需要重新登陆
+                if CONFIG_INFO == CONFIG_US or CONFIG_INFO == CONFIG_EUR:
+                    country_id = user_qs['region_country']
+                    country_qs = CountryModel.objects.filter(id=country_id).values('region_id')
+                    if country_qs.exists():
+                        region_id = country_qs[0]['region_id']
+                        if (CONFIG_INFO == CONFIG_US and region_id == 4) or \
+                                (CONFIG_INFO == CONFIG_EUR and region_id != 4):
+                            return response.json(309)
+
                 password = password.strip()
                 # 解密
                 for i in range(1, 4):
@@ -748,7 +749,7 @@ class refreshTokenViewV3(TemplateView):
             return response.json(0, res)
         except Exception as e:
             print(e)
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
 
 # 获取验证码