diff --git a/.gitignore b/.gitignore index 406f8ec4..d00cbb5c 100755 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,7 @@ celerybeat-schedule.bak celerybeat-schedule.dat celerybeat-schedule.dir db.sqlite3 -server/conf.py +server/conf*.py server/conf.ini sh/* temp/* diff --git a/server/settings.py b/server/settings.py index 350ec3bb..a515f23c 100755 --- a/server/settings.py +++ b/server/settings.py @@ -30,12 +30,13 @@ ALLOWED_HOSTS = ['*'] SYS_NAME = 'XT_EHS' SYS_VERSION = '2.00.00' +PROJECT_NAME = conf.PROJECT_NAME # Application definition INSTALLED_APPS = [ - 'channels', + 'daphne', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', @@ -349,7 +350,6 @@ LOGGING = { } # 项目 -VERSION = '1.0.0' BASE_URL = conf.BASE_URL BASE_URL_IN = conf.BASE_URL_IN BASE_URL_OUT = conf.BASE_URL_OUT