分离本地配置文件

Ansjer/config.py

@@ -79,15 +79,16 @@ AWS_ARN = ['arn:aws-cn:s3','arn:aws:s3']
 CRCKey = {'AUS':'CRCKey', 'ACN':'CRCKey'}   #{平台名：CRCKey值}
 
 # 不同环境配置
-#美国
-if SERVER_TYPE == 'Ansjer.us_config.local_settings':
-    from Ansjer.us_config.config_local import *
+# 本地
+if SERVER_TYPE == 'Ansjer.local_config.local_settings':
+    from Ansjer.local_config.config_local import *
+# 美国
 elif SERVER_TYPE == 'Ansjer.us_config.test_settings':
     from Ansjer.us_config.config_test import *
 elif SERVER_TYPE == 'Ansjer.us_config.formal_settings':
     from Ansjer.us_config.config_formal import *
 
-#国内
+# 国内
 elif SERVER_TYPE == 'Ansjer.cn_config.formal_settings':
     from Ansjer.cn_config.config_formal import *
 elif SERVER_TYPE == 'Ansjer.cn_config.test_settings':

Ansjer/us_config/config_local.py → Ansjer/local_config/config_local.py

@@ -1,19 +1,8 @@
 #!/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: 2019/10/16 9:45
-@Version: python3.6
-@MODIFY DECORD:ansjer dev
-@file: config_local.py
-@Contact: chanjunkai@163.com
-"""
+
 import os
 
-# token的secret
 OAUTH_ACCESS_TOKEN_SECRET = 'local_a+jbgnw%@1%zy^=@dn62%'
 OAUTH_REFRESH_TOKEN_SECRET = 'local_r+jbgnw%@1%zy^=@dn62%'
 

Ansjer/us_config/local_settings.py → Ansjer/local_config/local_settings.py

@@ -7,37 +7,8 @@ DEBUG = True
 # DEBUG = False
 ALLOWED_HOSTS = ['*']
 
-INSTALLED_APPS = [
-    'django.contrib.admin',
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-    'corsheaders',
-    'imagekit',
-    'Model',
-]
 
-MIDDLEWARE = [
-    'corsheaders.middleware.CorsMiddleware',
-    'Service.middleware.StatisticsUrlMiddleware',
-    'django.middleware.security.SecurityMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    # 'django.middleware.csrf.CsrfViewMiddleware',
-    'corsheaders.middleware.CorsPostCsrfMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'django.middleware.security.SecurityMiddleware',
-    # 'django_global_request.middleware.GlobalRequestMiddleware',
-]
 
-AUTHENTICATION_BACKENDS = (
-    'django.contrib.auth.backends.ModelBackend',  # django default backend
-    'guardian.backends.ObjectPermissionBackend',
-)
 
 ADDR_URL = []
 ANONYMOUS_USER_ID = -1  # 支持匿名用户
@@ -71,102 +42,6 @@ TEMPLATES = [
     },
 ]
 
-WSGI_APPLICATION = 'Ansjer.us_config.local_wsgi.application'
-
-# 服务器类型
-DATABASE_DATA = 'ansjertest'
-SERVER_HOST = '127.0.0.1'
-DATABASES_USER = 'root'
-DATABASES_PASS = '123456'
-
-# DATABASE_DATA2 = 'ansjerpush'
-# SERVER_HOST2 = '127.0.0.1'
-# DATABASES_USER2 = 'root'
-# DATABASES_PASS2 = '123456'
-
-
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.mysql',
-        'NAME': DATABASE_DATA,
-        'USER': DATABASES_USER,
-        'PASSWORD': DATABASES_PASS,
-        'HOST': SERVER_HOST,
-        'PORT': '3306',
-        'OPTIONS': {'charset': 'utf8mb4', 'use_unicode': True, 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"},
-        'AUTOCOMMIT': True
-    },
-    # 'mysql02': {
-    #     'ENGINE': 'django.db.backends.mysql',
-    #     'NAME': DATABASE_DATA2,
-    #     'USER': DATABASES_USER2,
-    #     'PASSWORD': DATABASES_PASS2,
-    #     'HOST': SERVER_HOST2,
-    #     'PORT': '3306',
-    #     'OPTIONS': {'charset': 'utf8mb4', 'use_unicode': True, 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"},
-    #     'AUTOCOMMIT': True
-    # }
-}
-DATABASE_ROUTERS = ['Ansjer.database_router.DatabaseAppsRouter']
-DATABASE_APPS_MAPPING = {
-    'Model': 'default',
-    'db2': 'mysql02',
-}
-
-AUTH_PASSWORD_VALIDATORS = [
-    {
-        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
-    },
-]
-
-LANGUAGE_CODE = 'en-us'
-TIME_ZONE = 'Asia/Shanghai'
-# TIME_ZONE = 'UTC'
-USE_I18N = True
-USE_L10N = True
-USE_TZ = True
-
-# 跨域增加忽略
-CORS_ALLOW_CREDENTIALS = True
-CORS_ORIGIN_ALLOW_ALL = True
-# CORS_ORIGIN_WHITELIST = ('*')
-
-CORS_ALLOW_METHODS = (
-    'DELETE',
-    'GET',
-    'OPTIONS',
-    'PATCH',
-    'POST',
-    'PUT',
-    'VIEW',
-)
-
-CORS_ALLOW_HEADERS = (
-    'XMLHttpRequest',
-    'X_FILENAME',
-    'accept',
-    'accept-encoding',
-    'authorization',
-    'content-type',
-    'dnt',
-    'origin',
-    'user-agent',
-    'x-csrftoken',
-    'x-requested-with',
-    'Pragma',
-)
-
-#########################################
 '''
 增加错误信息推送到管理员邮箱
 '''
@@ -176,20 +51,6 @@ ADMINS = (
     ('admin', '1379072853@qq.com'),
 )
 
-# 非空链接，却发生404错误，发送通知MANAGERS
-SEND_BROKEN_LINK_EMAILS = True
-MANAGERS = ADMINS
-
-# Email设置
-EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-EMAIL_HOST = 'smtp.163.com'  # QQ邮箱SMTP服务器(邮箱需要开通SMTP服务)
-EMAIL_PORT = 25  # QQ邮箱SMTP服务端口
-EMAIL_HOST_USER = 'chanjunkai@163.com'  # 我的邮箱帐号
-EMAIL_HOST_PASSWORD = 'cjk1234'  # 授权码
-EMAIL_SUBJECT_PREFIX = 'website'  # 为邮件标题的前缀,默认是'[django]'
-EMAIL_USE_TLS = True  # 开启安全链接
-DEFAULT_FROM_EMAIL = SERVER_EMAIL = EMAIL_HOST_USER  # 设置发件人
-
 INSTALLED_APPS = [
     'django.contrib.admin',
     'django.contrib.auth',
@@ -210,6 +71,7 @@ MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
+    'MiddleWare.requestRecord.RequestRecordMiddleware',
     # 'django.middleware.csrf.CsrfViewMiddleware',
     'corsheaders.middleware.CorsPostCsrfMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
@@ -224,57 +86,32 @@ AUTHENTICATION_BACKENDS = (
     'guardian.backends.ObjectPermissionBackend',
 )
 
-ADDR_URL = []
-ANONYMOUS_USER_ID = -1  # 支持匿名用户
-
-STATIC_URL = '/static/'
-
-# 上传路径根目录
-MEDIA_ROOT = os.path.join(BASE_DIR, 'static/Upgrate')
-# 在浏览器上访问该上传文件的url的前缀
-MEDIA_URL = '/static/Upgrate/'
-ROOT_URLCONF = 'Ansjer.urls'
-LOGIN_URL = '/account/login'
-AUTH_USER_MODEL = 'Model.Device_User'  # 自定义Model
-APPEND_SLASH = False
-
-TEMPLATES = [
-    {
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        # 'DIRS': [BASE_DIR + '/static/templates', ],
-        'DIRS': [BASE_DIR + '/templates'],
-        'APP_DIRS': True,
-        'OPTIONS': {
-            'context_processors': [
-                'django.template.context_processors.debug',
-                'django.template.context_processors.request',
-                'django.contrib.auth.context_processors.auth',
-                'django.contrib.messages.context_processors.messages',
-            ],
-        },
-    },
-]
-
-WSGI_APPLICATION = 'Ansjer.local_wsgi.application'
+WSGI_APPLICATION = 'Ansjer.local_config.local_wsgi.application'
 
 # 服务器类型
-#业务数据库
-DATABASE_DATA = 'ansjertest'
+# 国内测试数据库
+# DATABASE_DATA = 'AnsjerTest'
+# SERVER_HOST = 'business-server.cvp7gfpnmziz.rds.cn-northwest-1.amazonaws.com.cn'
+# DATABASES_USER = 'azrds'
+# DATABASES_PASS = 'UKv78ezQhiGMmSef5U5s'
+
+# 本地数据库
+DATABASE_DATA = 'ansjer'
 SERVER_HOST = '127.0.0.1'
 DATABASES_USER = 'root'
-DATABASES_PASS = 'root'
+DATABASES_PASS = '123456'
 
-#推送数据库
-DATABASE_DATA2 = 'ansjerpush'
+# 推送数据库
+DATABASE_DATA2 = 'push'
 SERVER_HOST2 = '127.0.0.1'
 DATABASES_USER2 = 'root'
-DATABASES_PASS2 = 'root'
+DATABASES_PASS2 = '123456'
 
-#序列号公共数据库
+# 序列号公共数据库
 DATABASE_DATA3 = 'serial'
 SERVER_HOST3 = '127.0.0.1'
 DATABASES_USER3 = 'root'
-DATABASES_PASS3 = 'root'
+DATABASES_PASS3 = '123456'
 
 DATABASES = {
     'default': {
@@ -448,10 +285,5 @@ LOGGING = {
             'level':'INFO',
             'propagate': False
         }
-        # 'django.db.backends': {
-        #     'handlers': ['console'],
-        #     'propagate': True,
-        #     'level': 'DEBUG',
-        # },
     }
-}
+}

Ansjer/us_config/local_wsgi.py → Ansjer/local_config/local_wsgi.py

@@ -11,6 +11,6 @@ import os
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "Ansjer.us_config.local_settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "Ansjer.local_config.local_settings")
 
 application = get_wsgi_application()

local_manage.py

@@ -3,15 +3,7 @@ import os
 import sys
 
 if __name__ == "__main__":
-    # import socket
-    #
-    # addrs = socket.getaddrinfo(socket.gethostname(), None)
-    # for index, item in enumerate(addrs):
-    #     if index == 5:
-    #         ip = item[4][0]
-    #
-    #         print('当前局域网ip地址为:' + ip)
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "Ansjer.us_config.local_settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "Ansjer.local_config.local_settings")
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:

manage.py

@@ -3,15 +3,7 @@ import os
 import sys
 
 if __name__ == "__main__":
-    # import socket
-    #
-    # addrs = socket.getaddrinfo(socket.gethostname(), None)
-    # for index, item in enumerate(addrs):
-    #     if index == 5:
-    #         ip = item[4][0]
-    #
-    #         print('当前局域网ip地址为:' + ip)
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "Ansjer.local_settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "Ansjer.local_config.local_settings")
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc: