优化配置信息判断

AnsjerPush/dev_config/local_config.py

@@ -56,8 +56,6 @@ OSS_STS_ACCESS_KEY = 'LTAIyMkGfEdogyL9'
 OSS_STS_ACCESS_SECRET = '71uIjpsqVOmF7DAITRyRuc259jHOjO'
 OSS_ROLE_ARN = 'acs:ram::1901342792446414:role/stsoss'
 
-SERVER_TYPE = 'Ansjer.dev_config.local_settings'
-
 NGINX_RTMP_STAT = 'http://www.dvema.com/stat'
 SERVER_DOMAIN = 'http://www.dvema.com/'
 SERVER_DOMAIN_SSL = 'https://www.dvema.com/'

Controller/DetectController.py

@@ -1,25 +1,15 @@
 import json
 import logging
-import os
-import time
 
-import apns2
-import jpush as jpush
 import oss2
-from django.db import transaction
 from django.http import JsonResponse
 from django.views.generic.base import View
-from pyfcm import FCMNotification
 
-from AnsjerPush.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, JPUSH_CONFIG, FCM_CONFIG, \
-    APNS_CONFIG, BASE_DIR, APNS_MODE
-from AnsjerPush.config import SERVER_TYPE
-from Model.models import UidPushModel, SysMsgModel
-from Object.ETkObject import ETkObject
+from AnsjerPush.config import CONFIG_INFO, CONFIG_CN
+from AnsjerPush.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET
+from Model.models import SysMsgModel
 from Object.RedisObject import RedisObject
-from Object.UidTokenObject import UidTokenObject
 from Object.utils import LocalDateTimeUtil
-from Service.CommonService import CommonService
 from Service.DevicePushService import DevicePushService
 from Service.EquipmentInfoService import EquipmentInfoService
 
@@ -111,13 +101,14 @@ class NotificationView(View):
                     detect_med_type = 1  # 1为存库不推送
                 else:
                     detect_med_type = 2  # 为2的话，既推送，又存库
-                    if SERVER_TYPE != 'Ansjer.cn_config.cn_formal_settings':
+                    if CONFIG_INFO != CONFIG_CN:
                         new_detect_interval = uid_push_list[0]['uid_set__new_detect_interval']
                         detect_interval = new_detect_interval if new_detect_interval > 0 else detect_interval
                         detect_interval = 60 if detect_interval < 60 else detect_interval
                     redisObj.set_data(key=dkey, val=1, expire=detect_interval - 5)
                     redisObj.set_data(key=pkey, val=1, expire=60)
-            logger.info('APP消息推送V1接口，是否进行APP推送：{}，1为不推送,间隔:{}'.format(detect_med_type, detect_interval))
+            logger.info(
+                'APP消息推送V1接口，是否进行APP推送：{}，1为不推送,间隔:{}'.format(detect_med_type, detect_interval))
             # 旧模式并且没有pkey,重新创建一个
             if not detect_group and not have_pkey:
                 redisObj.set_data(key=pkey, val=1, expire=60)

Controller/ShadowController.py

@@ -5,7 +5,7 @@ import time
 import requests
 from django.http import JsonResponse
 
-from AnsjerPush.config import SERVER_TYPE
+from AnsjerPush.config import CONFIG_INFO, CONFIG_US
 from Model.models import Device_Info, UidSetModel, UID_Preview, VoicePromptModel, UID_Bucket, UidChannelSetModel, \
     AiService, CountryModel
 from Object.ETkObject import ETkObject
@@ -60,9 +60,9 @@ def update_device_shadow(request):
         return JsonResponse(status=200, data={'code': 0, 'msg': 'success', 'data': {}})
 
     logger = logging.getLogger('info')
-    logger.info('---更新设备影子---, 使用配置:{}, 参数:{}'.format(SERVER_TYPE, request_dict.dict()))
-    # 如果为美国配置,异步请求更新国内和欧洲数据
-    if SERVER_TYPE == 'Ansjer.us_config.formal_settings':
+    logger.info('---更新设备影子---, 服务器地区:{}, 参数:{}'.format(CONFIG_INFO, request_dict.dict()))
+    # 如果为美洲服,异步请求更新国内和欧洲数据
+    if CONFIG_INFO == CONFIG_US:
         domain_name_list = ['push.zositechc.cn', 'push.zositeche.com']
         request_thread = threading.Thread(target=do_request_thread, args=(domain_name_list, request_dict.dict()))
         request_thread.start()

Service/DevicePushService.py

@@ -18,8 +18,8 @@ import jpush as jpush
 import requests
 from pyfcm import FCMNotification
 
+from AnsjerPush.config import CONFIG_INFO, CONFIG_CN
 from AnsjerPush.config import JPUSH_CONFIG, FCM_CONFIG, APNS_CONFIG, BASE_DIR, APNS_MODE, XMPUSH_CONFIG, OPPOPUSH_CONFIG
-from AnsjerPush.config import SERVER_TYPE
 from Model.models import UidPushModel, SysMsgModel, DeviceSharePermission, DeviceChannelUserSet, \
     DeviceChannelUserPermission
 from Object.ETkObject import ETkObject
@@ -83,7 +83,7 @@ class DevicePushService:
         @param detect_interval: 原推送时间间隔
         @param new_detect_interval: 新推送时间间隔
         """
-        if SERVER_TYPE != 'Ansjer.cn_config.cn_formal_settings':
+        if CONFIG_INFO != CONFIG_CN:
             detect_interval = new_detect_interval if new_detect_interval > 0 else detect_interval
             detect_interval = 60 if detect_interval < 60 else detect_interval
         redis_obj.set_data(key=name, val=1, expire=detect_interval - 5)

Service/PushService.py

@@ -19,7 +19,6 @@ from pyfcm import FCMNotification
 from AnsjerPush.config import APP_BUNDLE_DICT, APNS_MODE, BASE_DIR, APNS_CONFIG, FCM_CONFIG, JPUSH_CONFIG, XMPUSH_CONFIG \
     , VIVOPUSH_CONFIG, OPPOPUSH_CONFIG, MEIZUPUSH_CONFIG
 from Model.models import UidPushModel
-from Object.RedisObject import RedisObject
 from Service.CommonService import CommonService
 from Service.VivoPushService.push_admin.APIMessage import PushMessage
 from Service.VivoPushService.push_admin.APISender import APISender