优化消息推送开关

Controller/UserController.py

@@ -36,8 +36,9 @@ from django.views.generic import TemplateView
 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
-from Ansjer.config import BASE_DIR, CONFIG_US, CONFIG_EUR, CONFIG_INFO, SERVER_DOMAIN_EUR, CONFIG_CN
+from Ansjer.config import BASE_DIR, CONFIG_EUR, CONFIG_INFO, SERVER_DOMAIN_EUR
 from Controller.CheckUserData import DataValid, date_handler, RandomStr
 from Model.models import Device_User, Role, UidPushModel, UserOauth2Model, UserExModel, Device_Info, UidSetModel, \
     UserAppFrequencyModel, CountryIPModel, CountryModel, UidChannelSetModel, Order_Model, UID_Bucket, Unused_Uid_Meal, \
@@ -319,6 +320,7 @@ class LogoutView(TemplateView):
         Device_User.objects.filter(userID=tko.userID).update(online=False)
         redisObj = RedisObject(db=3)
         redisObj.del_data(key=tko.userID)
+        Device_Info.objects.filter(userID=tko.userID).update(NotificationMode=0)
         m_code = request_dict.get('m_code', None)
         if m_code:
             userID = tko.userID
@@ -694,7 +696,7 @@ class refreshTokenViewV3(TemplateView):
             url_list.remove(SERVER_DOMAIN_EUR)
         if CONFIG_INFO != CONFIG_EUR:
             for url in url_list:
-                requests.post(url=url+'v3/account/deleteUser', data=data, timeout=3)
+                requests.post(url=url + 'v3/account/deleteUser', data=data, timeout=3)
 
     def validation(self, request_dict):
         token = request_dict.get('token', None)
@@ -1524,7 +1526,7 @@ class v2forgetPwdCodeView(TemplateView):
         language_qs = LanguageModel.objects.filter(lang=lang).values('id')
         if not language_qs.exists():
             language_qs = LanguageModel.objects.filter(lang='en').values('id')
-        region_qs = CountryLanguageModel.objects.filter(country_id=region_country, language_id=language_qs[0]['id']).\
+        region_qs = CountryLanguageModel.objects.filter(country_id=region_country, language_id=language_qs[0]['id']). \
             values('country_name')
         res['region'] = region_qs[0]['country_name'] if region_qs.exists() else ''
 
@@ -2159,13 +2161,13 @@ class v3LoginView(TemplateView):
         else:
             # 判断所选地区和用户注册地区是否一致
             number = int(number)
-            if number != region_country and region_country != 0:    # 不一致
+            if number != region_country and region_country != 0:  # 不一致
                 res['status'] = 1
                 user_qs.update(last_login=now_time, language=response.lang)
-            else:   # 一致
+            else:  # 一致
                 res['status'] = 0
                 user_qs.update(last_login=now_time, language=response.lang, region_country=number)
-        region_qs = CountryLanguageModel.objects.filter(country_id=region_country, language_id=language_qs[0]['id']).\
+        region_qs = CountryLanguageModel.objects.filter(country_id=region_country, language_id=language_qs[0]['id']). \
             values('country_name')
 
         res['rid'] = users['role__rid']