QingdaoU/OnlineJudge
1
0
Fork 0
mirror of https://github.com/QingdaoU/OnlineJudge.git synced 2024-09-21 08:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Accept Merge Request #84 : (virusdefender-dev -> dev)

Browse Source 
Merge Request: 修改配置文件
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/84
This commit is contained in:
virusdefender 2015-08-16 08:56:05 +08:00
commit 3f56e99f3c
7 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
judge/judger_controller/celery.py
View File

@ -3,8 +3,7 @@ from __future__ import absolute_import
from celery import Celery
from .settings import redis_config
app = Celery("judge", broker="redis://" +
redis_config["host"] + ":" +
str(redis_config["port"]) +
"/" + str(redis_config["db"]),
app = Celery("judge", broker='redis://%s:%s/%s' % (redis_config["host"], redis_config["port"], redis_config["db"]),
include=["judge.judger_controller.tasks"])
Celery().conf.update(CELERY_ACCEPT_CONTENT = ['json'])

2
judge/judger_controller/settings.py
View File

@ -1,6 +1,6 @@
# coding=utf-8
redis_config = {
"host": "121.42.196.141",
"host": "121.42.32.129",
"port": 6379,
"db": 0
}

2
oj/local_settings.py
View File

@ -18,7 +18,7 @@ DATABASES = {
# 这是web 服务器连接到mongodb 的地址
MONGODB = {
'HOST': '121.42.196.141',
'HOST': '121.42.32.129',
'USERNAME': 'root',
'PASSWORD': 'root',
'PORT': 27017

9
static/src/js/app/oj/problem/problem.js
View File

@ -53,7 +53,14 @@ require(["jquery", "codeMirror", "csrfToken", "bsAlert"], function ($, codeMirro
return html;
}
var counter = 0;
function getResult() {
if(counter++ > 10){
hideLoading();
bsAlert("抱歉，服务器可能出现了故障，请稍后到我的提交列表中查看");
return;
}
$.ajax({
url: "/api/submission/?submission_id=" + submissionId,
method: "get",
@ -85,7 +92,7 @@ require(["jquery", "codeMirror", "csrfToken", "bsAlert"], function ($, codeMirro
showLoading();
if(!code.trim()){
bs_alert("请填写代码！");
bsAlert("请填写代码！");
hideLoading();
return false;
}

6
template/oj_base.html
View File

@ -16,7 +16,7 @@
{% block css_block %}{% endblock %}
<!-- custom css end -->
</head>
{% load website_info %}
<body>
@ -38,7 +38,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/">qduoj</a>
<a class="navbar-brand" href="/">{% show_website_info "website_name" %}</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav">
@ -88,7 +88,7 @@
{% block js_block %}{% endblock %}
<!-- footer begin -->
<div class="footer">
<p class="text-muted text-center">Copyright © 2015 青岛大学信息工程学院 创新实验室</p>
<p class="text-muted text-center">Copyright © 2015 {% show_website_info "website_footer" %}</p>
</div>
<!-- footer end -->
</body>

6
utils/templatetags/submission.py
View File

@ -1,4 +1,5 @@
# coding=utf-8
from django import template
def translate_result(value):
@ -27,14 +28,11 @@ def translate_language(value):
def translate_result_class(value):
if value == 0:
return "success"
elif value == "8":
elif value == 8:
return "info"
return "danger"
from django import template
register = template.Library()
register.filter("translate_result", translate_result)
register.filter("translate_id", translate_id)

8
utils/templatetags/website_info.py Normal file
View File

@ -0,0 +1,8 @@
# coding=utf-8
from django import template
register = template.Library()
@register.simple_tag
def show_website_info(name):
return {"website_name": "qduoj", "website_footer": u"青岛大学信息工程学院 创新实验室"}[name]