Преглед изворни кода

修改本地和测试配置

locky пре 2 година
родитељ
комит
17422c7ba4
2 измењених фајлова са 3 додато и 38 уклоњено
  1. 1 3
      Ansjer/cn_config/test_settings.py
  2. 2 35
      Ansjer/local_config/local_settings.py

+ 1 - 3
Ansjer/cn_config/test_settings.py

@@ -35,18 +35,16 @@ MIDDLEWARE = [
     '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  # 支持匿名用户
 
-STATIC_URL = '/static/'
+STATIC_URL = './static/'
 
 # 上传路径根目录
 MEDIA_ROOT = os.path.join(BASE_DIR, 'static/Upgrate')

+ 2 - 35
Ansjer/local_config/local_settings.py

@@ -11,8 +11,8 @@ DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
 ADDR_URL = []
 ANONYMOUS_USER_ID = -1  # 支持匿名用户
 
-STATIC_URL = '/static/static/'
-STATICFILES_DIRS = (os.path.join(BASE_DIR,'static'),)
+STATIC_URL = './static/'
+STATICFILES_DIRS = (os.path.join(BASE_DIR, 'static'),)
 
 # 上传路径根目录
 MEDIA_ROOT = os.path.join(BASE_DIR, 'static/Upgrate')
@@ -40,15 +40,6 @@ TEMPLATES = [
     },
 ]
 
-'''
-增加错误信息推送到管理员邮箱
-'''
-# 管理员邮箱
-ADMINS = (
-    ('admin', 'chanjunkai@163.com'),
-    ('admin', '1379072853@qq.com'),
-)
-
 INSTALLED_APPS = [
     'django.contrib.admin',
     'django.contrib.auth',
@@ -76,23 +67,14 @@ MIDDLEWARE = [
     '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',
 )
 
 WSGI_APPLICATION = 'Ansjer.local_config.local_wsgi.application'
 
-# 服务器类型
-# 国内测试数据库
-# 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'
@@ -105,11 +87,6 @@ SERVER_HOST2 = '127.0.0.1'
 DATABASES_USER2 = 'root'
 DATABASES_PASS2 = '123456'
 
-# 序列号公共数据库
-# DATABASE_DATA3 = 'ansjer_test'
-# SERVER_HOST3 = '127.0.0.1'
-# DATABASES_USER3 = 'root'
-# DATABASES_PASS3 = '123456'
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.mysql',
@@ -131,16 +108,6 @@ DATABASES = {
         'OPTIONS': {'charset': 'utf8mb4', 'use_unicode': True, 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"},
         'AUTOCOMMIT': True
     },
-    # 'mysql03': {
-    #     'ENGINE': 'django.db.backends.mysql',
-    #     'NAME': DATABASE_DATA3,
-    #     'USER': DATABASES_USER3,
-    #     'PASSWORD': DATABASES_PASS3,
-    #     'HOST': SERVER_HOST3,
-    #     '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 = {