合并dev,添加管理员在前台可见比赛所有提交详情,修改措辞,修改提示形式,以便于提交列表筛选功能的使用

oj/daocloud_settings.py

@@ -1,19 +0,0 @@
-# coding=utf-8
-import os
-
-LOG_PATH = "LOG/"
-
-# Database
-# https://docs.djangoproject.com/en/1.8/ref/settings/#databases
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
-        'CONN_MAX_AGE': 1,
-    }
-}
-
-# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True

oj/local_settings.py

@@ -12,15 +12,16 @@ DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
         'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
-        'CONN_MAX_AGE': 0.3,
     },
+    # submission 的 name 和 engine 请勿修改，其他代码会用到
     'submission': {
         'NAME': 'oj_submission',
         'ENGINE': 'django.db.backends.mysql',
         'HOST': "121.42.32.129",
         'PORT': 3306,
         'USER': 'root',
-        'PASSWORD': 'mypwd'
+        'PASSWORD': 'mypwd',
+        'CONN_MAX_AGE': 0.1,
     }
 }
 
@@ -30,4 +31,3 @@ DEBUG = True
 TEST_CASE_DIR = os.path.join(BASE_DIR, 'test_case/')
 
 ALLOWED_HOSTS = []
-

oj/server_settings.py

@@ -12,7 +12,7 @@ DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.mysql',
         'NAME': "oj",
-        'CONN_MAX_AGE': 0.3,
+        'CONN_MAX_AGE': 0.1,
         'HOST': '127.0.0.1',
         'PORT': 3306,
         'USER': 'root',
@@ -21,6 +21,7 @@ DATABASES = {
     'submission': {
         'NAME': 'oj_submission',
         'ENGINE': 'django.db.backends.mysql',
+        'CONN_MAX_AGE': 0.1,
         'HOST': "127.0.0.1",
         'PORT': 3306,
         'USER': 'root',
@@ -34,4 +35,3 @@ DEBUG = True
 TEST_CASE_DIR = '/root/test_case/'
 
 ALLOWED_HOSTS = ['*']
-

oj/settings.py

@@ -113,10 +113,6 @@ STATIC_URL = '/static/'
 
 STATICFILES_DIRS = (os.path.join(BASE_DIR, "static/src/"),)
 
-TEMPLATE_DIRS = (
-    os.path.join(BASE_DIR, "template/src"),
-)
-
 AUTH_USER_MODEL = 'account.User'
 
 LOGGING = {