diff --git a/oj/local_settings.py b/oj/local_settings.py index da1a6727..0b7f642d 100644 --- a/oj/local_settings.py +++ b/oj/local_settings.py @@ -5,7 +5,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) # 下面是需要自己修改的 -LOG_PATH = "LOG/" +LOG_PATH = "log/" # 注意这是web 服务器访问的地址,判题端访问的地址不一定一样,因为可能不在一台机器上 DATABASES = { @@ -18,7 +18,7 @@ DATABASES = { 'NAME': 'oj_submission', 'ENGINE': 'django.db.backends.mysql', 'HOST': "121.42.32.129", - 'POST': 3306, + 'PORT': 3306, 'USER': 'root', 'PASSWORD': 'mypwd' } @@ -29,5 +29,5 @@ DEBUG = True # 同理 这是 web 服务器的上传路径 TEST_CASE_DIR = os.path.join(BASE_DIR, 'test_case/') -DATABASE_ROUTERS = ['oj.db_router.DBRouter'] +ALLOWED_HOSTS = [] diff --git a/oj/server_settings.py b/oj/server_settings.py index 9bad5790..badfef61 100644 --- a/oj/server_settings.py +++ b/oj/server_settings.py @@ -1 +1,37 @@ # coding=utf-8 +import os + +BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + + +# 下面是需要自己修改的 +LOG_PATH = "/var/log/oj/" + +# 注意这是web 服务器访问的地址,判题端访问的地址不一定一样,因为可能不在一台机器上 +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.mysql', + 'NAME': "oj", + 'CONN_MAX_AGE': 0.3, + 'HOST': '127.0.0.1', + 'PORT': 3306, + 'USER': 'root', + 'PASSWORD': 'mypwd' + }, + 'submission': { + 'NAME': 'oj_submission', + 'ENGINE': 'django.db.backends.mysql', + 'HOST': "127.0.0.1", + 'PORT': 3306, + 'USER': 'root', + 'PASSWORD': 'mypwd' + } +} + +DEBUG = True + +# 同理 这是 web 服务器的上传路径 +TEST_CASE_DIR = '/root/test_case/' + +ALLOWED_HOSTS = ['*'] + diff --git a/oj/settings.py b/oj/settings.py index cf4dafcf..376060f7 100644 --- a/oj/settings.py +++ b/oj/settings.py @@ -14,15 +14,13 @@ https://docs.djangoproject.com/en/1.8/ref/settings/ # Build paths inside the project like this: os.path.join(BASE_DIR, ...) import os -# todo 判断运行环境 +# 判断运行环境 ENV = os.environ.get("oj_env", "local") if ENV == "local": from .local_settings import * elif ENV == "server": from .server_settings import * -elif ENV == "daocloud": - from .daocloud_settings import * BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) @@ -33,7 +31,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) # SECURITY WARNING: keep the secret key used in production secret! SECRET_KEY = 'hzfp^8mbgapc&x%$#xv)0=t8s7_ilingw(q3!@h&2fty6v6fxz' -ALLOWED_HOSTS = [] + # Application definition @@ -170,4 +168,6 @@ LOGGING = { REST_FRAMEWORK = { 'TEST_REQUEST_DEFAULT_FORMAT': 'json' -} \ No newline at end of file +} + +DATABASE_ROUTERS = ['oj.db_router.DBRouter'] \ No newline at end of file