From bfc412340c004de5aff85b63666583b34f70aa71 Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Mon, 7 Dec 2015 14:21:20 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E7=BD=AE?=
=?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=A4=87=E6=A1=88=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
oj/settings.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/oj/settings.py b/oj/settings.py
index 83d49ef7..ceed0fe5 100644
--- a/oj/settings.py
+++ b/oj/settings.py
@@ -102,7 +102,7 @@ LANGUAGE_CODE = 'zh-cn'
TIME_ZONE = 'Asia/Shanghai'
-USE_I18N = True
+USE_I18N = False
USE_L10N = True
@@ -184,5 +184,5 @@ TEST_CASE_DIR = os.path.join(BASE_DIR, 'test_case/')
IMAGE_UPLOAD_DIR = os.path.join(BASE_DIR, 'upload/')
WEBSITE_INFO = {"website_name": "qduoj",
- "website_footer": u"青岛大学信息工程学院 创新实验室",
+ "website_footer": u"青岛大学信息工程学院 创新实验室 京ICP备15062075号-1",
"url": "https://qduoj.com"}
From 3996647f68ac11843b9483dda75ff024e7877793 Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Mon, 7 Dec 2015 18:05:44 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20js=20=E7=9A=84?=
=?UTF-8?q?=E5=8E=8B=E7=BC=A9=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
static/src/js/build.js | 94 ++++++++++++++++++++++-------------------
static/src/js/config.js | 41 +++++++++---------
2 files changed, 72 insertions(+), 63 deletions(-)
diff --git a/static/src/js/build.js b/static/src/js/build.js
index beb891e0..8c8de627 100644
--- a/static/src/js/build.js
+++ b/static/src/js/build.js
@@ -57,25 +57,28 @@
problem_2_pack: "app/oj/problem/problem",
submissionList_3_pack: "app/admin/problem/submissionList",
contestCountdown_4_pack: "app/oj/contest/contestCountdown",
- addProblem_5_pack: "app/admin/problem/addProblem",
- problem_6_pack: "app/admin/problem/problem",
- contestList_7_pack: "app/admin/contest/contestList",
- admin_8_pack: "app/admin/admin",
- login_9_pack: "app/oj/account/login",
- addContest_10_pack: "app/admin/contest/addContest",
- contestPassword_11_pack: "app/oj/contest/contestPassword",
- changePassword_12_pack: "app/oj/account/changePassword",
- monitor_13_pack: "app/admin/monitor/monitor",
- editProblem_14_pack: "app/admin/contest/editProblem",
- joinGroupRequestList_15_pack: "app/admin/group/joinGroupRequestList",
- group_16_pack: "app/oj/group/group",
- contestProblemList_17_pack: "app/admin/contest/contestProblemList",
- editProblem_18_pack: "app/admin/problem/editProblem",
- register_19_pack: "app/oj/account/register",
- groupDetail_20_pack: "app/admin/group/groupDetail",
- editContest_21_pack: "app/admin/contest/editContest",
- group_22_pack: "app/admin/group/group",
- settings_23_pack: "app/oj/account/settings"
+ avatar_5_pack: "app/oj/account/avatar",
+ addProblem_6_pack: "app/admin/problem/addProblem",
+ problem_7_pack: "app/admin/problem/problem",
+ contestList_8_pack: "app/admin/contest/contestList",
+ admin_9_pack: "app/admin/admin",
+ login_10_pack: "app/oj/account/login",
+ applyResetPassword_11_pack: "app/oj/account/applyResetPassword",
+ addContest_12_pack: "app/admin/contest/addContest",
+ contestPassword_13_pack: "app/oj/contest/contestPassword",
+ changePassword_14_pack: "app/oj/account/changePassword",
+ monitor_15_pack: "app/admin/monitor/monitor",
+ editProblem_16_pack: "app/admin/contest/editProblem",
+ joinGroupRequestList_17_pack: "app/admin/group/joinGroupRequestList",
+ group_18_pack: "app/oj/group/group",
+ contestProblemList_19_pack: "app/admin/contest/contestProblemList",
+ editProblem_20_pack: "app/admin/problem/editProblem",
+ register_21_pack: "app/oj/account/register",
+ groupDetail_22_pack: "app/admin/group/groupDetail",
+ editContest_23_pack: "app/admin/contest/editContest",
+ resetPassword_24_pack: "app/oj/account/resetPassword",
+ group_25_pack: "app/admin/group/group",
+ settings_26_pack: "app/oj/account/settings"
},
shim: {
avalon: {
@@ -86,12 +89,6 @@
appDir: "../",
dir: "../../release/",
modules: [
- {
- name: "bootstrap",
- },
- {
- name: "codeMirror"
- },
{
name: "announcement_0_pack"
},
@@ -108,62 +105,71 @@
name: "contestCountdown_4_pack"
},
{
- name: "addProblem_5_pack"
+ name: "avatar_5_pack"
},
{
- name: "problem_6_pack"
+ name: "addProblem_6_pack"
},
{
- name: "contestList_7_pack"
+ name: "problem_7_pack"
},
{
- name: "admin_8_pack"
+ name: "contestList_8_pack"
},
{
- name: "login_9_pack"
+ name: "admin_9_pack"
},
{
- name: "addContest_10_pack"
+ name: "login_10_pack"
},
{
- name: "contestPassword_11_pack"
+ name: "applyResetPassword_11_pack"
},
{
- name: "changePassword_12_pack"
+ name: "addContest_12_pack"
},
{
- name: "monitor_13_pack"
+ name: "contestPassword_13_pack"
},
{
- name: "editProblem_14_pack"
+ name: "changePassword_14_pack"
},
{
- name: "joinGroupRequestList_15_pack"
+ name: "monitor_15_pack"
},
{
- name: "group_16_pack"
+ name: "editProblem_16_pack"
},
{
- name: "contestProblemList_17_pack"
+ name: "joinGroupRequestList_17_pack"
},
{
- name: "editProblem_18_pack"
+ name: "group_18_pack"
},
{
- name: "register_19_pack"
+ name: "contestProblemList_19_pack"
},
{
- name: "groupDetail_20_pack"
+ name: "editProblem_20_pack"
},
{
- name: "editContest_21_pack"
+ name: "register_21_pack"
},
{
- name: "group_22_pack"
+ name: "groupDetail_22_pack"
},
{
- name: "settings_23_pack"
+ name: "editContest_23_pack"
},
+ {
+ name: "resetPassword_24_pack"
+ },
+ {
+ name: "group_25_pack"
+ },
+ {
+ name: "settings_26_pack"
+ }
],
optimizeCss: "standard",
})
\ No newline at end of file
diff --git a/static/src/js/config.js b/static/src/js/config.js
index e2856f65..ee6f52b2 100644
--- a/static/src/js/config.js
+++ b/static/src/js/config.js
@@ -59,25 +59,28 @@ var require = {
problem_2_pack: "app/oj/problem/problem",
submissionList_3_pack: "app/admin/problem/submissionList",
contestCountdown_4_pack: "app/oj/contest/contestCountdown",
- addProblem_5_pack: "app/admin/problem/addProblem",
- problem_6_pack: "app/admin/problem/problem",
- contestList_7_pack: "app/admin/contest/contestList",
- admin_8_pack: "app/admin/admin",
- login_9_pack: "app/oj/account/login",
- addContest_10_pack: "app/admin/contest/addContest",
- contestPassword_11_pack: "app/oj/contest/contestPassword",
- changePassword_12_pack: "app/oj/account/changePassword",
- monitor_13_pack: "app/admin/monitor/monitor",
- editProblem_14_pack: "app/admin/contest/editProblem",
- joinGroupRequestList_15_pack: "app/admin/group/joinGroupRequestList",
- group_16_pack: "app/oj/group/group",
- contestProblemList_17_pack: "app/admin/contest/contestProblemList",
- editProblem_18_pack: "app/admin/problem/editProblem",
- register_19_pack: "app/oj/account/register",
- groupDetail_20_pack: "app/admin/group/groupDetail",
- editContest_21_pack: "app/admin/contest/editContest",
- group_22_pack: "app/admin/group/group",
- settings_23_pack: "app/oj/account/settings"
+ avatar_5_pack: "app/oj/account/avatar",
+ addProblem_6_pack: "app/admin/problem/addProblem",
+ problem_7_pack: "app/admin/problem/problem",
+ contestList_8_pack: "app/admin/contest/contestList",
+ admin_9_pack: "app/admin/admin",
+ login_10_pack: "app/oj/account/login",
+ applyResetPassword_11_pack: "app/oj/account/applyResetPassword",
+ addContest_12_pack: "app/admin/contest/addContest",
+ contestPassword_13_pack: "app/oj/contest/contestPassword",
+ changePassword_14_pack: "app/oj/account/changePassword",
+ monitor_15_pack: "app/admin/monitor/monitor",
+ editProblem_16_pack: "app/admin/contest/editProblem",
+ joinGroupRequestList_17_pack: "app/admin/group/joinGroupRequestList",
+ group_18_pack: "app/oj/group/group",
+ contestProblemList_19_pack: "app/admin/contest/contestProblemList",
+ editProblem_20_pack: "app/admin/problem/editProblem",
+ register_21_pack: "app/oj/account/register",
+ groupDetail_22_pack: "app/admin/group/groupDetail",
+ editContest_23_pack: "app/admin/contest/editContest",
+ resetPassword_24_pack: "app/oj/account/resetPassword",
+ group_25_pack: "app/admin/group/group",
+ settings_26_pack: "app/oj/account/settings",
},
shim: {
avalon: {
From 3dd19cf654728e4ad5f1ff1ba7eb7f384342a3c1 Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Mon, 7 Dec 2015 19:14:43 +0800
Subject: [PATCH 3/4] =?UTF-8?q?mail=20=E6=8B=86=E5=88=86=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
account/views.py | 2 +-
mail/__init__.py | 1 -
mail/celery.py | 1 -
mail/tasks.py | 19 -------------------
oj/settings.py | 7 +++++--
utils/mail.py | 15 +++++++++++++++
6 files changed, 21 insertions(+), 24 deletions(-)
delete mode 100644 mail/__init__.py
delete mode 100644 mail/celery.py
delete mode 100644 mail/tasks.py
create mode 100644 utils/mail.py
diff --git a/account/views.py b/account/views.py
index 2ba5739c..d6eb77d5 100644
--- a/account/views.py
+++ b/account/views.py
@@ -14,7 +14,7 @@ from rest_framework.response import Response
from utils.shortcuts import (serializer_invalid_response, error_response,
success_response, error_page, paginate, rand_str)
from utils.captcha import Captcha
-from mail.tasks import send_email
+from utils.mail import send_email
from .decorators import login_required
from .models import User, UserProfile
diff --git a/mail/__init__.py b/mail/__init__.py
deleted file mode 100644
index 9bad5790..00000000
--- a/mail/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# coding=utf-8
diff --git a/mail/celery.py b/mail/celery.py
deleted file mode 100644
index 9bad5790..00000000
--- a/mail/celery.py
+++ /dev/null
@@ -1 +0,0 @@
-# coding=utf-8
diff --git a/mail/tasks.py b/mail/tasks.py
deleted file mode 100644
index 490472ba..00000000
--- a/mail/tasks.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# coding=utf-8
-import os
-from envelopes import Envelope
-
-SMTP_CONFIG = {"smtp_server": "smtp.mxhichina.com",
- "email": "noreply@qduoj.com",
- "password": os.environ.get("smtp_password", "111111"),
- "tls": False}
-
-
-def send_email(from_name, to_email, to_name, subject, content):
- envelope = Envelope(from_addr=(SMTP_CONFIG["email"], from_name),
- to_addr=(to_email, to_name),
- subject=subject,
- html_body=content)
- envelope.send(SMTP_CONFIG["smtp_server"],
- login=SMTP_CONFIG["email"],
- password=SMTP_CONFIG["password"],
- tls=SMTP_CONFIG["tls"])
diff --git a/oj/settings.py b/oj/settings.py
index ceed0fe5..e20499e2 100644
--- a/oj/settings.py
+++ b/oj/settings.py
@@ -50,7 +50,6 @@ INSTALLED_APPS = (
'submission',
'mq',
'contest',
- 'mail',
'django_extensions',
'rest_framework',
@@ -118,7 +117,6 @@ AUTH_USER_MODEL = 'account.User'
LOG_PATH = "log/"
-
LOGGING = {
'version': 1,
'disable_existing_loggers': True,
@@ -186,3 +184,8 @@ IMAGE_UPLOAD_DIR = os.path.join(BASE_DIR, 'upload/')
WEBSITE_INFO = {"website_name": "qduoj",
"website_footer": u"青岛大学信息工程学院 创新实验室 京ICP备15062075号-1",
"url": "https://qduoj.com"}
+
+SMTP_CONFIG = {"smtp_server": "smtp.mxhichina.com",
+ "email": "noreply@qduoj.com",
+ "password": os.environ.get("smtp_password", "111111"),
+ "tls": False}
diff --git a/utils/mail.py b/utils/mail.py
new file mode 100644
index 00000000..5d4e1c3c
--- /dev/null
+++ b/utils/mail.py
@@ -0,0 +1,15 @@
+# coding=utf-8
+from envelopes import Envelope
+
+from django.conf import settings
+
+
+def send_email(from_name, to_email, to_name, subject, content):
+ envelope = Envelope(from_addr=(settings.SMTP_CONFIG["email"], from_name),
+ to_addr=(to_email, to_name),
+ subject=subject,
+ html_body=content)
+ envelope.send(settings.SMTP_CONFIG["smtp_server"],
+ login=settings.SMTP_CONFIG["email"],
+ password=settings.SMTP_CONFIG["password"],
+ tls=settings.SMTP_CONFIG["tls"])
From 541c3bb792c69d07076ae2ed81ebd9822691b4c6 Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Wed, 9 Dec 2015 21:23:19 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=AD=E8=A8=80?=
=?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E4=B9=8B=E5=89=8D=E6=B2=A1=E6=9C=89?=
=?UTF-8?q?=E6=89=BE=E5=88=B0=20django=20=E6=8A=A5=E9=94=99=E7=9A=84?=
=?UTF-8?q?=E5=8E=9F=E5=9B=A0=EF=BC=8C=E5=90=8E=E6=9D=A5=E5=8F=91=E7=8E=B0?=
=?UTF-8?q?=20django=20=E6=96=B0=E7=89=88=E6=9C=AC=E4=B8=8D=E6=94=AF?=
=?UTF-8?q?=E6=8C=81=E4=B9=8B=E5=89=8D=20zh-cn=20=E7=9A=84=E5=86=99?=
=?UTF-8?q?=E6=B3=95=E4=BA=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
oj/settings.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/oj/settings.py b/oj/settings.py
index 3f3ea886..de88dfbc 100644
--- a/oj/settings.py
+++ b/oj/settings.py
@@ -101,7 +101,7 @@ LANGUAGE_CODE = 'zh-hans'
TIME_ZONE = 'Asia/Shanghai'
-USE_I18N = False
+USE_I18N = True
USE_L10N = True