mirror of
https://github.com/QingdaoU/OnlineJudge.git
synced 2024-09-21 16:33:22 +00:00
Accept Merge Request #84 : (virusdefender-dev -> dev)
Merge Request: 修改配置文件 Created By: @virusdefender Accepted By: @virusdefender URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/84
This commit is contained in:
commit
3f56e99f3c
@ -3,8 +3,7 @@ from __future__ import absolute_import
|
|||||||
from celery import Celery
|
from celery import Celery
|
||||||
from .settings import redis_config
|
from .settings import redis_config
|
||||||
|
|
||||||
app = Celery("judge", broker="redis://" +
|
app = Celery("judge", broker='redis://%s:%s/%s' % (redis_config["host"], redis_config["port"], redis_config["db"]),
|
||||||
redis_config["host"] + ":" +
|
|
||||||
str(redis_config["port"]) +
|
|
||||||
"/" + str(redis_config["db"]),
|
|
||||||
include=["judge.judger_controller.tasks"])
|
include=["judge.judger_controller.tasks"])
|
||||||
|
|
||||||
|
Celery().conf.update(CELERY_ACCEPT_CONTENT = ['json'])
|
@ -1,6 +1,6 @@
|
|||||||
# coding=utf-8
|
# coding=utf-8
|
||||||
redis_config = {
|
redis_config = {
|
||||||
"host": "121.42.196.141",
|
"host": "121.42.32.129",
|
||||||
"port": 6379,
|
"port": 6379,
|
||||||
"db": 0
|
"db": 0
|
||||||
}
|
}
|
||||||
|
@ -18,7 +18,7 @@ DATABASES = {
|
|||||||
|
|
||||||
# 这是web 服务器连接到mongodb 的地址
|
# 这是web 服务器连接到mongodb 的地址
|
||||||
MONGODB = {
|
MONGODB = {
|
||||||
'HOST': '121.42.196.141',
|
'HOST': '121.42.32.129',
|
||||||
'USERNAME': 'root',
|
'USERNAME': 'root',
|
||||||
'PASSWORD': 'root',
|
'PASSWORD': 'root',
|
||||||
'PORT': 27017
|
'PORT': 27017
|
||||||
|
@ -53,7 +53,14 @@ require(["jquery", "codeMirror", "csrfToken", "bsAlert"], function ($, codeMirro
|
|||||||
return html;
|
return html;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var counter = 0;
|
||||||
|
|
||||||
function getResult() {
|
function getResult() {
|
||||||
|
if(counter++ > 10){
|
||||||
|
hideLoading();
|
||||||
|
bsAlert("抱歉,服务器可能出现了故障,请稍后到我的提交列表中查看");
|
||||||
|
return;
|
||||||
|
}
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: "/api/submission/?submission_id=" + submissionId,
|
url: "/api/submission/?submission_id=" + submissionId,
|
||||||
method: "get",
|
method: "get",
|
||||||
@ -85,7 +92,7 @@ require(["jquery", "codeMirror", "csrfToken", "bsAlert"], function ($, codeMirro
|
|||||||
showLoading();
|
showLoading();
|
||||||
|
|
||||||
if(!code.trim()){
|
if(!code.trim()){
|
||||||
bs_alert("请填写代码!");
|
bsAlert("请填写代码!");
|
||||||
hideLoading();
|
hideLoading();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
{% block css_block %}{% endblock %}
|
{% block css_block %}{% endblock %}
|
||||||
<!-- custom css end -->
|
<!-- custom css end -->
|
||||||
</head>
|
</head>
|
||||||
|
{% load website_info %}
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
|
|
||||||
@ -38,7 +38,7 @@
|
|||||||
<span class="icon-bar"></span>
|
<span class="icon-bar"></span>
|
||||||
<span class="icon-bar"></span>
|
<span class="icon-bar"></span>
|
||||||
</button>
|
</button>
|
||||||
<a class="navbar-brand" href="/">qduoj</a>
|
<a class="navbar-brand" href="/">{% show_website_info "website_name" %}</a>
|
||||||
</div>
|
</div>
|
||||||
<div id="navbar" class="navbar-collapse collapse">
|
<div id="navbar" class="navbar-collapse collapse">
|
||||||
<ul class="nav navbar-nav">
|
<ul class="nav navbar-nav">
|
||||||
@ -88,7 +88,7 @@
|
|||||||
{% block js_block %}{% endblock %}
|
{% block js_block %}{% endblock %}
|
||||||
<!-- footer begin -->
|
<!-- footer begin -->
|
||||||
<div class="footer">
|
<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>
|
</div>
|
||||||
<!-- footer end -->
|
<!-- footer end -->
|
||||||
</body>
|
</body>
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
# coding=utf-8
|
# coding=utf-8
|
||||||
|
from django import template
|
||||||
|
|
||||||
|
|
||||||
def translate_result(value):
|
def translate_result(value):
|
||||||
@ -27,14 +28,11 @@ def translate_language(value):
|
|||||||
def translate_result_class(value):
|
def translate_result_class(value):
|
||||||
if value == 0:
|
if value == 0:
|
||||||
return "success"
|
return "success"
|
||||||
elif value == "8":
|
elif value == 8:
|
||||||
return "info"
|
return "info"
|
||||||
return "danger"
|
return "danger"
|
||||||
|
|
||||||
|
|
||||||
from django import template
|
|
||||||
|
|
||||||
|
|
||||||
register = template.Library()
|
register = template.Library()
|
||||||
register.filter("translate_result", translate_result)
|
register.filter("translate_result", translate_result)
|
||||||
register.filter("translate_id", translate_id)
|
register.filter("translate_id", translate_id)
|
||||||
|
8
utils/templatetags/website_info.py
Normal file
8
utils/templatetags/website_info.py
Normal 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]
|
Loading…
Reference in New Issue
Block a user