Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

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']
+      # @vnc_url = res['showServer']
-          # if request.subdomain == "pre-newweb" || request.subdomain == "test-newweb"
+      @vnc_url =
-          #   # 无域名版本
+          if request.subdomain == "pre-newweb" || request.subdomain == "test-newweb"
-          #   "http://#{service_host}:#{res['port']}/vnc_lite.html?password=headless"
+            # 无域名版本
-          # else
+            "http://#{service_host}:#{res['port']}/vnc_lite.html?password=headless"
-          #   # 有域名版本
+          else
-          #   "https://#{res['port']}.#{service_host}/vnc_lite.html?password=headless"
+            # 有域名版本
-          # end
+            "https://#{res['port']}.#{service_host}/vnc_lite.html?password=headless"
+          end
       @vnc_evaluate = shixun.vnc_evaluate
     rescue Exception => e
       Rails.logger.error(e.message)

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

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

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

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个字符" }

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