From e4a5e4155b206e71cf31c2c5e298627afc44daeb Mon Sep 17 00:00:00 2001 From: esp Date: Wed, 2 Sep 2015 20:26:55 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=B8=BA=E4=BA=86=E5=9C=A8qduoj.cf?= =?UTF-8?q?=E4=B8=8A=E8=BF=90=E8=A1=8C=E5=81=9A=E4=BA=86=E6=94=B9=E5=8A=A8?= =?UTF-8?q?=EF=BC=8C=E5=9B=A0=E4=B8=BA=E5=88=A4=E9=A2=98=E5=92=8Cweb?= =?UTF-8?q?=E9=83=BD=E5=9C=A8=E4=B8=80=E5=8F=B0=E6=9C=BA=E5=99=A8=E4=B8=8A?= =?UTF-8?q?=EF=BC=8C=E8=BF=99=E4=B8=AAdocker=20image=E6=98=AF=E4=BB=8Edigi?= =?UTF-8?q?talOcean=E4=B8=8Adownload=E4=B8=8B=E6=9D=A5=E7=9A=84[CI=20SKIP]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- judge/judger_controller/settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/judge/judger_controller/settings.py b/judge/judger_controller/settings.py index aff08b18..6ee3a0c6 100644 --- a/judge/judger_controller/settings.py +++ b/judge/judger_controller/settings.py @@ -1,7 +1,7 @@ # coding=utf-8 # 这个redis 是 celery 使用的，包括存储队列信息还有部分统计信息 redis_config = { - "host": "121.42.32.129", + "host": "127.0.0.1", "port": 6379, "db": 0 } @@ -9,7 +9,7 @@ redis_config = { # 判题的 docker 容器的配置参数 docker_config = { - "image_name": "3da0e526934e", + "image_name": "5453975e94c4", "docker_path": "docker", "shell": True } From 655b18421edd304c2c8c5a47f998356e80d8c3d6 Mon Sep 17 00:00:00 2001 From: esp Date: Wed, 2 Sep 2015 22:26:58 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E8=BF=99=E6=98=AF=E4=B8=BA=E4=BA=86?= =?UTF-8?q?=E8=83=BD=E4=BB=A5root=E8=BA=AB=E4=BB=BD=E8=BF=90=E8=A1=8Cceler?= =?UTF-8?q?y[CI=20SKIP]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- judge/judger_controller/celery.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/judge/judger_controller/celery.py b/judge/judger_controller/celery.py index 18cf8867..51f923fe 100644 --- a/judge/judger_controller/celery.py +++ b/judge/judger_controller/celery.py @@ -4,4 +4,6 @@ from celery import Celery from .settings import redis_config app = Celery("judge", broker='redis://%s:%s/%s' % (redis_config["host"], redis_config["port"], redis_config["db"]), - include=["judge.judger_controller.tasks"]) \ No newline at end of file + include=["judge.judger_controller.tasks"]) + +platforms.C_FORCE_ROOT =True \ No newline at end of file From eb376c49fc2ee7e166cf8e4103a373ea5f432695 Mon Sep 17 00:00:00 2001 From: lsxwxs Date: Wed, 2 Sep 2015 22:59:43 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E6=BC=8F=E4=BA=86=E4=B8=80=E4=B8=AAimpor?= =?UTF-8?q?t[CI=20SKIP]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- judge/judger_controller/celery.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/judge/judger_controller/celery.py b/judge/judger_controller/celery.py index 51f923fe..4c64ab04 100644 --- a/judge/judger_controller/celery.py +++ b/judge/judger_controller/celery.py @@ -1,9 +1,9 @@ # coding=utf-8 from __future__ import absolute_import -from celery import Celery +from celery import Celery, platforms from .settings import redis_config app = Celery("judge", broker='redis://%s:%s/%s' % (redis_config["host"], redis_config["port"], redis_config["db"]), include=["judge.judger_controller.tasks"]) -platforms.C_FORCE_ROOT =True \ No newline at end of file +platforms.C_FORCE_ROOT =True From 5000bbc38fa57cff89e15708eada93cc0d02ae3e Mon Sep 17 00:00:00 2001 From: lsxwxs Date: Wed, 2 Sep 2015 23:03:05 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=8E=9F=E6=9D=A5=E7=9A=84dockerimage?= =?UTF-8?q?=E9=87=8C=E6=B2=A1=E6=9C=89MySQL-python,=E6=89=80=E4=BB=A5?= =?UTF-8?q?=E5=8F=88=E6=94=B9=E4=BA=86=E4=B8=8B[CI=20SKIP]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- judge/judger_controller/settings.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/judge/judger_controller/settings.py b/judge/judger_controller/settings.py index 6ee3a0c6..93673bd5 100644 --- a/judge/judger_controller/settings.py +++ b/judge/judger_controller/settings.py @@ -9,7 +9,8 @@ redis_config = { # 判题的 docker 容器的配置参数 docker_config = { - "image_name": "5453975e94c4", + + "image_name": " 819d3da18dc1", "docker_path": "docker", "shell": True } @@ -28,4 +29,4 @@ submission_db = { "db": "oj_submission", "user": "root", "password": "root" -} \ No newline at end of file +} From 69cc85eb01e69b2ded52a15c69972da4aebf23c5 Mon Sep 17 00:00:00 2001 From: esp Date: Thu, 3 Sep 2015 00:28:34 +0800 Subject: [PATCH 05/10] correct the path of test case in judger --- judge/judger_controller/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/judge/judger_controller/settings.py b/judge/judger_controller/settings.py index 6ee3a0c6..ea6a0069 100644 --- a/judge/judger_controller/settings.py +++ b/judge/judger_controller/settings.py @@ -16,7 +16,7 @@ docker_config = { # 测试用例的路径，是主机上的实际路径 -test_case_dir = "/var/mnt/source/test_case/" +test_case_dir = "/root/test_case/" # 源代码路径，也就是 manage.py 所在的实际路径 source_code_dir = "/var/mnt/source/OnlineJudge/" From fc7f4ae3b7a82cfef584bb8bc7e6c2abf947eb9c Mon Sep 17 00:00:00 2001 From: lsxwxs Date: Thu, 3 Sep 2015 00:41:36 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=AF=B9=E7=9B=98=E9=A2=98=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E9=92=88=E5=AF=B9=E6=96=B0=E6=B5=8B=E8=AF=95=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=99=A8=E8=BF=9B=E8=A1=8C=E8=B0=83=E6=95=B4,?= =?UTF-8?q?=E8=AF=A5=E5=88=86=E6=94=AF=E5=B0=86=E4=B8=8D=E4=BC=9A=E5=B9=B6?= =?UTF-8?q?=E5=85=A5=E4=B8=BB=E5=88=86=E6=94=AF[CI=20SKIP]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- judge/judger/client.py | 2 +- judge/judger/settings.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/judge/judger/client.py b/judge/judger/client.py index fc7d0b90..4b0ec026 100644 --- a/judge/judger/client.py +++ b/judge/judger/client.py @@ -170,4 +170,4 @@ class JudgeClient(object): # http://stackoverflow.com/questions/25382455/python-notimplementederror-pool-objects-cannot-be-passed-between-processes self_dict = self.__dict__.copy() del self_dict['_pool'] - return self_dict \ No newline at end of file + return self_dict diff --git a/judge/judger/settings.py b/judge/judger/settings.py index 1f15b96b..5f8d7cea 100644 --- a/judge/judger/settings.py +++ b/judge/judger/settings.py @@ -17,7 +17,7 @@ judger_workspace = "/var/judger/" # 这个是在docker 中访问数据库 ip 不一定和web服务器还有celery的一样 submission_db = { - "host": "192.168.42.1", + "host": "10.172.22.50",#"192.168.42.1", "port": 3306, "db": "oj_submission", "user": "root", From bfde3b976bb4eb1e3a9ed70f65619448b77b992f Mon Sep 17 00:00:00 2001 From: esp Date: Thu, 3 Sep 2015 10:17:10 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E6=8A=8A=E5=85=B3=E4=BA=8E=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84href=E6=94=B9=E4=B8=BA'#',=E5=9C=A8=E6=AF=94?= =?UTF-8?q?=E8=B5=9B=E5=88=97=E8=A1=A8=E4=B8=BA=E7=A9=BA=E6=98=AF=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E5=B0=8F=E7=BB=84=E5=88=97=E8=A1=A8=E7=9A=84=E9=93=BE?= =?UTF-8?q?=E6=8E=A5[CI=20SKIP]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/src/oj/contest/contest_list.html | 2 +- template/src/oj/index.html | 2 +- template/src/oj_base.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/template/src/oj/contest/contest_list.html b/template/src/oj/contest/contest_list.html index 68d939b7..25b8eae9 100644 --- a/template/src/oj/contest/contest_list.html +++ b/template/src/oj/contest/contest_list.html @@ -69,7 +69,7 @@ {% else %} -

当前没有合适的比赛

+

当前没有合适的比赛,你可以尝试到小组列表申请加入一些小组,以便参加小组内部的比赛

{% endif %} diff --git a/template/src/oj/index.html b/template/src/oj/index.html index 181fa31f..80aaa0d3 100644 --- a/template/src/oj/index.html +++ b/template/src/oj/index.html @@ -97,7 +97,7 @@ 提交   比赛   小组   - 关于 + 关于 diff --git a/template/src/oj_base.html b/template/src/oj_base.html index f39fea0c..534c4db1 100644 --- a/template/src/oj_base.html +++ b/template/src/oj_base.html @@ -46,7 +46,7 @@
  • 提交
  • 比赛
  • 小组
    • -
  • 关于
    • +
  • 关于
    • {% if request.user.is_authenticated %}
      From a16198b861614de2232f6eceda04bd06e20254d8 Mon Sep 17 00:00:00 2001 From: esp Date: Thu, 3 Sep 2015 20:25:09 +0800 Subject: [PATCH 08/10] =?UTF-8?q?[=E5=89=8D=E5=8F=B0]=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=B0=8F=E7=BB=84=E9=80=BB=E8=BE=91,=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=E5=8A=A0=E5=85=A5=E6=97=A0=E9=9C=80=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E7=9A=84=E5=B0=8F=E7=BB=84=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E6=8F=90=E7=A4=BA,=E6=97=A0?= =?UTF-8?q?=E9=9C=80=E7=94=B3=E8=AF=B7=E7=9A=84=E5=B0=8F=E7=BB=84=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E7=94=B3=E8=AF=B7=E5=88=97=E8=A1=A8=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- group/serializers.py | 2 +- group/views.py | 6 +++++- template/src/oj/group/group.html | 11 +++++++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/group/serializers.py b/group/serializers.py index 065baf98..402ea5b9 100644 --- a/group/serializers.py +++ b/group/serializers.py @@ -21,7 +21,7 @@ class EditGroupSerializer(serializers.Serializer): class CreateJoinGroupRequestSerializer(serializers.Serializer): group_id = serializers.IntegerField() - message = serializers.CharField(max_length=30) + message = serializers.CharField(max_length=30, required=False) class JoinGroupRequestSerializer(serializers.ModelSerializer): diff --git a/group/views.py b/group/views.py index d75aa98f..2929706c 100644 --- a/group/views.py +++ b/group/views.py @@ -183,6 +183,8 @@ class JoinGroupAPIView(APIView): else: return error_response(u"你已经是小组成员了") elif group.join_group_setting == 1: + if not data["message"]: + return error_response(u"message : 该字段是必填项。") try: JoinGroupRequest.objects.get(user=request.user, group=group, status=False) return error_response(u"你已经提交过申请了，请等待审核") @@ -295,6 +297,7 @@ def group_page(request, group_id): return error_page(request, u"小组不存在") return render(request, "oj/group/group.html", {"group": group}) + @login_required def application_list_page(request, group_id): try: @@ -305,6 +308,7 @@ def application_list_page(request, group_id): return render(request, "oj/group/my_application_list.html", {"group": group, "applications": applications}) + @login_required def application_page(request, request_id): try: @@ -312,4 +316,4 @@ def application_page(request, request_id): except JoinGroupRequest.DoesNotExist: return error_page(request, u"申请不存在") return render(request, "oj/group/my_application.html", - {"application": application}) \ No newline at end of file + {"application": application}) diff --git a/template/src/oj/group/group.html b/template/src/oj/group/group.html index 1686a4cb..4fe3a00c 100644 --- a/template/src/oj/group/group.html +++ b/template/src/oj/group/group.html @@ -4,8 +4,11 @@

      {{ group.name }}

      @@ -30,7 +33,11 @@
      {% endif %}
      - +
      From b1c5cf72eca787acc2a2a266813564c38d1d0046 Mon Sep 17 00:00:00 2001 From: esp Date: Thu, 3 Sep 2015 20:35:54 +0800 Subject: [PATCH 09/10] =?UTF-8?q?[=E5=89=8D=E5=8F=B0js]=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=B0=8F=E7=BB=84=E7=94=B3=E8=AF=B7=E7=9A=84=E9=9D=9E=E7=A9=BA?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E6=96=B9=E6=B3=95[CI=20SKIP]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/src/js/app/oj/group/group.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/static/src/js/app/oj/group/group.js b/static/src/js/app/oj/group/group.js index 918b6612..c36448ec 100644 --- a/static/src/js/app/oj/group/group.js +++ b/static/src/js/app/oj/group/group.js @@ -1,9 +1,14 @@ require(["jquery", "csrfToken", "bsAlert"], function ($, csrfTokenHeader, bsAlert) { $("#sendApplication").click(function (){ - var message = $("#applyMessage").val(); - console.log(message); + var message; + if ($("#applyMessage").length) { + message = $("#applyMessage").val(); + if (!message) + bsAlert("提交失败,请填写申请信息!"); + return false; + } + var groupId = window.location.pathname.split("/")[2]; - console.log(groupId); data = {group_id: groupId,message:message} $.ajax({ url: "/api/group_join/", From 49644a462baa7f3e783d10e983fffa6529377f39 Mon Sep 17 00:00:00 2001 From: lsxwxs Date: Thu, 3 Sep 2015 21:44:02 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E5=88=A4=E4=BD=93=E8=84=9A=E6=9C=AC[CI=20SKIP]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- runJudge.sh | 1 + 1 file changed, 1 insertion(+) create mode 100755 runJudge.sh diff --git a/runJudge.sh b/runJudge.sh new file mode 100755 index 00000000..ba25da83 --- /dev/null +++ b/runJudge.sh @@ -0,0 +1 @@ +nohup celery -A judge.judger_controller worker -l DEBUG &