推送系统优化全局配置文件

AnsjerPush/cn_config/__init__.py

@@ -0,0 +1,8 @@
+# -*- encoding: utf-8 -*-
+"""
+@File    : __init__.py.py
+@Time    : 2022/11/29 10:41
+@Author  : stephen
+@Email   : zhangdongming@asj6.wecom.work
+@Software: PyCharm
+"""

AnsjerPush/cn_formal_config.py → AnsjerPush/cn_config/cn_formal_config.py

@@ -47,7 +47,7 @@ TX_PHONE_APP_KEY = '7705976ca6e85fe7b86d6bc2d11f7783'
 AuthCode_Expire = 600
 
 # 根路径
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 # uid token key
 UID_TOKEN_KEY = 'c+565*j@%^'
 
@@ -56,7 +56,7 @@ OSS_STS_ACCESS_KEY = 'LTAIyMkGfEdogyL9'
 OSS_STS_ACCESS_SECRET = '71uIjpsqVOmF7DAITRyRuc259jHOjO'
 OSS_ROLE_ARN = 'acs:ram::1901342792446414:role/stsoss'
 
-SERVER_TYPE = 'Ansjer.cn_formal_settings'
+SERVER_TYPE = 'Ansjer.cn_config.cn_formal_settings'
 
 NGINX_RTMP_STAT = 'http://www.dvema.com/stat'
 SERVER_DOMAIN = 'http://www.dvema.com/'

AnsjerPush/cn_formal_settings.py → AnsjerPush/cn_config/cn_formal_settings.py

@@ -1,6 +1,6 @@
 import os
 
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 SECRET_KEY = '$2hf5g$a%_^kk0-l25l$!o5)yc=dvtnfpc8(+$rh4fq4twa_xx'
 DEBUG = False
 ALLOWED_HOSTS = ["*"]
@@ -47,7 +47,7 @@ TEMPLATES = [
     },
 ]
 
-WSGI_APPLICATION = 'AnsjerPush.cn_formal_wsgi.application'
+WSGI_APPLICATION = 'AnsjerPush.wsgi.application'
 
 # 业务数据库
 DATABASE_DATA = 'ansjer_server_cn'

AnsjerPush/cn_formal_wsgi.py → AnsjerPush/cn_config/cn_formal_wsgi.py

@@ -11,6 +11,6 @@ import os
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'AnsjerPush.cn_formal_settings')
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'AnsjerPush.cn_config.cn_formal_settings')
 
 application = get_wsgi_application()

AnsjerPush/config.py

@@ -63,17 +63,16 @@ PAYPAL_CRD = {
 DETECT_PUSH_DOMAIN = 'http://push.dvema.com/'
 
 APNS_MODE = 'dev'
-
-if SERVER_TYPE == 'AnsjerPush.local_settings':
-    from AnsjerPush.local_config import *
-elif SERVER_TYPE == 'AnsjerPush.test_settings':
-    from AnsjerPush.test_config import *
-elif SERVER_TYPE == 'AnsjerPush.formal_settings':
-    from AnsjerPush.formal_config import *
-elif SERVER_TYPE == 'AnsjerPush.cn_formal_settings':
-    from AnsjerPush.cn_formal_config import *
-elif SERVER_TYPE == 'AnsjerPush.eur_formal_settings':
-    from AnsjerPush.eur_formal_config import *
+if SERVER_TYPE == 'AnsjerPush.dev_config.local_settings':
+    from AnsjerPush.dev_config.local_config import *
+elif SERVER_TYPE == 'AnsjerPush.test_config.test_settings':
+    from AnsjerPush.test_config.test_config import *
+elif SERVER_TYPE == 'AnsjerPush.us_config.formal_settings':
+    from AnsjerPush.us_config.formal_config import *
+elif SERVER_TYPE == 'AnsjerPush.cn_config.cn_formal_settings':
+    from AnsjerPush.cn_config.cn_formal_config import *
+elif SERVER_TYPE == 'AnsjerPush.eur_config.eur_formal_settings':
+    from AnsjerPush.eur_config.eur_formal_config import *
 
 APNS_CODE = {
     -1: '只库存不推送',

AnsjerPush/dev_config/__init__.py

@@ -0,0 +1,8 @@
+# -*- encoding: utf-8 -*-
+"""
+@File    : __init__.py.py
+@Time    : 2022/11/29 13:30
+@Author  : stephen
+@Email   : zhangdongming@asj6.wecom.work
+@Software: PyCharm
+"""

AnsjerPush/local_config.py → AnsjerPush/dev_config/local_config.py

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

AnsjerPush/local_settings.py → AnsjerPush/dev_config/local_settings.py

@@ -1,6 +1,6 @@
 import os
 
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 SECRET_KEY = '$2hf5g$a%_^kk0-l25l$!o5)yc=dvtnfpc8(+$rh4fq4twa_xx'
 DEBUG = True
 ALLOWED_HOSTS = ["*"]

AnsjerPush/local_wsgi.py → AnsjerPush/dev_config/local_wsgi.py

@@ -11,6 +11,6 @@ import os
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'AnsjerPush.local_settings')
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'AnsjerPush.dev_config.local_settings')
 
 application = get_wsgi_application()

AnsjerPush/eur_config/__init__.py

@@ -0,0 +1,8 @@
+# -*- encoding: utf-8 -*-
+"""
+@File    : __init__.py.py
+@Time    : 2022/11/29 13:30
+@Author  : stephen
+@Email   : zhangdongming@asj6.wecom.work
+@Software: PyCharm
+"""

AnsjerPush/eur_formal_config.py → AnsjerPush/eur_config/eur_formal_config.py

@@ -34,7 +34,7 @@ TX_PHONE_APP_KEY = '7705976ca6e85fe7b86d6bc2d11f7783'
 AuthCode_Expire = 600
 
 # 根路径
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 # uid token key
 UID_TOKEN_KEY = 'c+565*j@%^'
 
@@ -43,7 +43,7 @@ OSS_STS_ACCESS_KEY = 'LTAIyMkGfEdogyL9'
 OSS_STS_ACCESS_SECRET = '71uIjpsqVOmF7DAITRyRuc259jHOjO'
 OSS_ROLE_ARN = 'acs:ram::1901342792446414:role/stsoss'
 
-SERVER_TYPE = 'Ansjer.eur_formal_settings'
+SERVER_TYPE = 'Ansjer.eur_config.eur_formal_settings'
 
 NGINX_RTMP_STAT = 'http://www.dvema.com/stat'
 SERVER_DOMAIN = 'http://www.dvema.com/'

AnsjerPush/eur_formal_settings.py → AnsjerPush/eur_config/eur_formal_settings.py

@@ -1,6 +1,6 @@
 import os
 
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 SECRET_KEY = '$2hf5g$a%_^kk0-l25l$!o5)yc=dvtnfpc8(+$rh4fq4twa_xx'
 DEBUG = False
 ALLOWED_HOSTS = ["*"]

AnsjerPush/eur_formal_wsgi.py → AnsjerPush/eur_config/eur_formal_wsgi.py

@@ -11,6 +11,6 @@ import os
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'AnsjerPush.eur_formal_settings')
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'AnsjerPush.eur_config.eur_formal_settings')
 
 application = get_wsgi_application()

AnsjerPush/test_config/__init__.py

@@ -0,0 +1,8 @@
+# -*- encoding: utf-8 -*-
+"""
+@File    : __init__.py.py
+@Time    : 2022/11/29 10:35
+@Author  : stephen
+@Email   : zhangdongming@asj6.wecom.work
+@Software: PyCharm
+"""

AnsjerPush/test_config.py → AnsjerPush/test_config/test_config.py

@@ -46,7 +46,7 @@ TX_PHONE_APP_KEY = '7705976ca6e85fe7b86d6bc2d11f7783'
 AuthCode_Expire = 600
 
 # 根路径
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 # uid token key
 UID_TOKEN_KEY = 'c+565*j@%^'
 
@@ -55,7 +55,7 @@ OSS_STS_ACCESS_KEY = 'LTAIyMkGfEdogyL9'
 OSS_STS_ACCESS_SECRET = '71uIjpsqVOmF7DAITRyRuc259jHOjO'
 OSS_ROLE_ARN = 'acs:ram::1901342792446414:role/stsoss'
 
-SERVER_TYPE = 'Ansjer.test_settings'
+SERVER_TYPE = 'Ansjer.test_config.test_settings'
 
 NGINX_RTMP_STAT = 'http://www.dvema.com/stat'
 SERVER_DOMAIN = 'http://www.dvema.com/'

AnsjerPush/test_settings.py → AnsjerPush/test_config/test_settings.py

@@ -1,6 +1,7 @@
 import os
 
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+print()
 SECRET_KEY = '$2hf5g$a%_^kk0-l25l$!o5)yc=dvtnfpc8(+$rh4fq4twa_xx'
 DEBUG = True
 ALLOWED_HOSTS = ["*"]

AnsjerPush/test_wsgi.py → AnsjerPush/test_config/test_wsgi.py

@@ -11,6 +11,6 @@ import os
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'AnsjerPush.test_settings')
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'AnsjerPush.test_config.test_settings')
 
 application = get_wsgi_application()

AnsjerPush/us_config/__init__.py

@@ -0,0 +1,8 @@
+# -*- encoding: utf-8 -*-
+"""
+@File    : __init__.py.py
+@Time    : 2022/11/29 10:41
+@Author  : stephen
+@Email   : zhangdongming@asj6.wecom.work
+@Software: PyCharm
+"""

AnsjerPush/formal_config.py → AnsjerPush/us_config/formal_config.py

@@ -47,7 +47,7 @@ TX_PHONE_APP_KEY = '7705976ca6e85fe7b86d6bc2d11f7783'
 AuthCode_Expire = 600
 
 # 根路径
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 # uid token key
 UID_TOKEN_KEY = 'c+565*j@%^'
 
@@ -56,7 +56,7 @@ OSS_STS_ACCESS_KEY = 'LTAIyMkGfEdogyL9'
 OSS_STS_ACCESS_SECRET = '71uIjpsqVOmF7DAITRyRuc259jHOjO'
 OSS_ROLE_ARN = 'acs:ram::1901342792446414:role/stsoss'
 
-SERVER_TYPE = 'Ansjer.formal_settings'
+SERVER_TYPE = 'Ansjer.us_config.formal_settings'
 
 NGINX_RTMP_STAT = 'http://www.dvema.com/stat'
 SERVER_DOMAIN = 'http://www.dvema.com/'

AnsjerPush/formal_settings.py → AnsjerPush/us_config/formal_settings.py

@@ -1,6 +1,6 @@
 import os
 
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 SECRET_KEY = '$2hf5g$a%_^kk0-l25l$!o5)yc=dvtnfpc8(+$rh4fq4twa_xx'
 DEBUG = False
 ALLOWED_HOSTS = ["*"]

AnsjerPush/formal_wsgi.py → AnsjerPush/us_config/formal_wsgi.py

@@ -11,6 +11,6 @@ import os
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'AnsjerPush.formal_settings')
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'AnsjerPush.us_config.formal_settings')
 
 application = get_wsgi_application()

Controller/AiController.py

@@ -355,7 +355,7 @@ class AiView(View):
 
     def upload_s3(self, file_dict, dir_path):
         try:
-            if SERVER_TYPE == "Ansjer.formal_settings":
+            if SERVER_TYPE == "Ansjer.us_config.formal_settings":
                 #存国外
                 aws_key = AWS_ACCESS_KEY_ID[1]
                 aws_secret = AWS_SECRET_ACCESS_KEY[1]

Controller/DetectController.py

@@ -108,7 +108,7 @@ class NotificationView(View):
                 detect_med_type = 1  # 1为存库不推送
             else:
                 detect_med_type = 2  # 为2的话，既推送，又存库
-                if SERVER_TYPE != 'Ansjer.cn_formal_settings':
+                if SERVER_TYPE != 'Ansjer.cn_config.cn_formal_settings':
                     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

Controller/ShadowController.py

@@ -62,7 +62,7 @@ def update_device_shadow(request):
     logger = logging.getLogger('info')
     logger.info('---更新设备影子---, 使用配置:{}, 参数:{}'.format(SERVER_TYPE, request_dict.dict()))
     # 如果为美国配置,异步请求更新国内和欧洲数据
-    if SERVER_TYPE == 'Ansjer.formal_settings':
+    if SERVER_TYPE == 'Ansjer.us_config.formal_settings':
         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

@@ -78,7 +78,7 @@ class DevicePushService:
         @param detect_interval: 原推送时间间隔
         @param new_detect_interval: 新推送时间间隔
         """
-        if SERVER_TYPE != 'Ansjer.cn_formal_settings':
+        if SERVER_TYPE != 'Ansjer.cn_config.cn_formal_settings':
             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)

cn_formal_manage.py

@@ -10,7 +10,7 @@ if __name__ == '__main__':
     if arg_m == 'migrate':
         print('do not migrate')
         exit()
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'AnsjerPush.cn_formal_settings')
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'AnsjerPush.cn_config.cn_formal_settings')
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:

eur_formal_manage.py

@@ -10,7 +10,7 @@ if __name__ == '__main__':
     if arg_m == 'migrate':
         print('do not migrate')
         exit()
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'AnsjerPush.eur_formal_settings')
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'AnsjerPush.eur_config.eur_formal_settings')
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:

formal_manage.py

@@ -10,7 +10,7 @@ if __name__ == '__main__':
     if arg_m == 'migrate':
         print('do not migrate')
         exit()
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'AnsjerPush.formal_settings')
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'AnsjerPush.us_config.formal_settings')
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:

local_manage.py

@@ -10,7 +10,7 @@ if __name__ == '__main__':
     if arg_m == 'migrate':
         print('do not migrate')
         exit()
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'AnsjerPush.local_settings')
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'AnsjerPush.dev_config.local_settings')
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:

test_manage.py

@@ -10,7 +10,7 @@ if __name__ == '__main__':
     if arg_m == 'migrate':
         print('do not migrate')
         exit()
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'AnsjerPush.test_settings')
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'AnsjerPush.test_config.test_settings')
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc: