From 9347797435874bc419ba225c15690999221b7319 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 3 Mar 2020 09:31:39 +0800 Subject: [PATCH 1/5] vnc --- app/controllers/games_controller.rb | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index cfcf92e4c..7015cca40 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -963,7 +963,7 @@ class GamesController < ApplicationController begin shixun = game.myshixun.shixun shixun_tomcat = edu_setting('cloud_bridge') - #service_host = edu_setting('vnc_url') + service_host = edu_setting('vnc_url') tpiGitURL = "#{edu_setting('git_address_domain')}/#{game.myshixun.repo_path}" uri = "#{shixun_tomcat}/bridge/vnc/getvnc" @@ -973,14 +973,15 @@ class GamesController < ApplicationController if res && res['code'].to_i != 0 raise("实训云平台繁忙（繁忙等级：99）") end - @vnc_url = res['showServer'] - # if request.subdomain == "pre-newweb" || request.subdomain == "test-newweb" - # # 无域名版本 - # "http://#{service_host}:#{res['port']}/vnc_lite.html?password=headless" - # else - # # 有域名版本 - # "https://#{res['port']}.#{service_host}/vnc_lite.html?password=headless" - # end + # @vnc_url = res['showServer'] + @vnc_url = + if request.subdomain == "pre-newweb" || request.subdomain == "test-newweb" + # 无域名版本 + "http://#{service_host}:#{res['port']}/vnc_lite.html?password=headless" + else + # 有域名版本 + "https://#{res['port']}.#{service_host}/vnc_lite.html?password=headless" + end @vnc_evaluate = shixun.vnc_evaluate rescue Exception => e Rails.logger.error(e.message) From d743d9bce65e00b3fda9983675fb51a60db2efba Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 3 Mar 2020 10:21:56 +0800 Subject: [PATCH 2/5] =?UTF-8?q?jupter=E5=AE=9E=E8=AE=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/shixun_info.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/shixun_info.rb b/app/models/shixun_info.rb index 3d3f40c92..799ddaab5 100644 --- a/app/models/shixun_info.rb +++ b/app/models/shixun_info.rb @@ -2,7 +2,7 @@ class ShixunInfo < ApplicationRecord belongs_to :shixun validates_uniqueness_of :shixun_id validates_length_of :fork_reason, maximum: 60, message: "不能超过60个字符" - validates_presence_of :evaluate_script, message: "实训脚本不能为空" + # validates_presence_of :evaluate_script, message: "实训脚本不能为空" after_commit :create_diff_record validates :description, length: { maximum: 5000, too_long: "不能超过5000个字符" } From 5718fca2b022ce07b565f71d23d43d77e2719c18 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 3 Mar 2020 10:30:24 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=8C=BF=E8=AF=84=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=9A=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tasks/homework_evaluation.rake | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/tasks/homework_evaluation.rake b/lib/tasks/homework_evaluation.rake index f6ae7edf3..1deb80397 100644 --- a/lib/tasks/homework_evaluation.rake +++ b/lib/tasks/homework_evaluation.rake @@ -25,9 +25,8 @@ namespace :homework_evaluation do end if student_works.present? && student_works.length >= 2 - HomeworkEvaluationCommentAssginJob.perform_later(homework_common.id) - homework_detail_manual.update_column('comment_status', 3) + HomeworkEvaluationCommentAssginJob.perform_later(homework_common.id) else #作业数小于2，启动失败, 只给老师和助教发 extra = "作品数量低于两个，无法开启匿评" @@ -35,12 +34,12 @@ namespace :homework_evaluation do else extra = "存在尚未截止的分班，无法开启匿评" end - HomeworkEvaluationStartNotifyJob.perform_later(homework_common.id, extra) if extra.present? homework_detail_manual.update_attributes(:evaluation_start => nil, :evaluation_end => nil, :absence_penalty => 0, :evaluation_num => 0, :appeal_time => nil, :appeal_penalty => 0) homework_common.update_attributes(:anonymous_comment => 0, :anonymous_appeal => 0) end + HomeworkEvaluationStartNotifyJob.perform_later(homework_common.id, extra) end end From e36e9678b5e66409d596fa409788689a5eef8964 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 3 Mar 2020 12:16:43 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=9A=84=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/homework_commons_controller.rb | 2 +- app/models/homework_common.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb index fb327ec78..d4e7ae4a3 100644 --- a/app/controllers/homework_commons_controller.rb +++ b/app/controllers/homework_commons_controller.rb @@ -1210,7 +1210,7 @@ class HomeworkCommonsController < ApplicationController rescue Exception => e uid_logger(e.message) - tip_exception("删除失败") + tip_exception(e.message) raise ActiveRecord::Rollback end end diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb index 65c2e6f21..7a19fb82c 100644 --- a/app/models/homework_common.rb +++ b/app/models/homework_common.rb @@ -38,7 +38,7 @@ class HomeworkCommon < ApplicationRecord validates :name, presence: true, length: { maximum: 60, too_long: "不能超过60个字符" } validates :description, length: { maximum: 15000, too_long: "不能超过15000个字符" } validates :explanation, length: { maximum: 5000, too_long: "不能超过5000个字符" } - validates :reference_answer, length: { maximum: 15000, too_long: "不能超过15000个字符" } + validates :reference_answer, length: { maximum: 25000, too_long: "不能超过25000个字符" } # after_update :update_activity before_destroy :update_homework_bank_quotes From 3e0a16e2401dfc5681e8980aed6a9d7a8d371321 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 3 Mar 2020 12:19:42 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=9A=84=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/homework_bank.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/homework_bank.rb b/app/models/homework_bank.rb index 7e13891d3..2fdfc613e 100644 --- a/app/models/homework_bank.rb +++ b/app/models/homework_bank.rb @@ -12,5 +12,5 @@ class HomeworkBank < ApplicationRecord validates :name, length: { maximum: 60, too_long: "不能超过60个字符" } validates :description, length: { maximum: 15000, too_long: "不能超过15000个字符" } - validates :reference_answer, length: { maximum: 15000, too_long: "不能超过15000个字符" } + validates :reference_answer, length: { maximum: 25000, too_long: "不能超过25000个字符" } end