Merge remote-tracking branch 'remotes/origin/locky' into test

Controller/UserController.py

@@ -734,13 +734,14 @@ class refreshTokenViewV3(TemplateView):
                 if not user_qs.exists():
                     return response.json(104)
 
-                # 欧洲用户请求美洲服务器,需要重新登陆
-                if CONFIG_INFO == CONFIG_US:
+                # 国外正式服,判断是否需要重新登陆
+                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 region_id == 4:
+                        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()