diff --git a/app/controllers/admins/shixun_settings_controller.rb b/app/controllers/admins/shixun_settings_controller.rb
index bd54018cd..6dbbc077a 100644
--- a/app/controllers/admins/shixun_settings_controller.rb
+++ b/app/controllers/admins/shixun_settings_controller.rb
@@ -15,7 +15,8 @@ class Admins::ShixunSettingsController < Admins::BaseController
hidden: params[:hidden].present? ? params[:hidden] : false,
homepage_show: params[:homepage_show].present? ? params[:homepage_show] : false,
task_pass: params[:task_pass].present? ? params[:task_pass] : false,
- code_hidden: params[:code_hidden].present? ? params[:code_hidden] : false
+ code_hidden: params[:code_hidden].present? ? params[:code_hidden] : false,
+ vip: params[:vip].present? ? params[:vip] : false
}
@shixuns_type_check = MirrorRepository.pluck(:type_name,:id)
@@ -126,6 +127,6 @@ class Admins::ShixunSettingsController < Admins::BaseController
end
def setting_params
- params.permit(:use_scope,:excute_time,:close,:status,:can_copy,:webssh,:hidden,:homepage_show,:task_pass,:code_hidden,:page_no, :id,tag_repertoires:[])
+ params.permit(:use_scope,:excute_time,:close,:status,:can_copy,:webssh,:hidden,:homepage_show,:task_pass,:code_hidden,:vip,:page_no,:id,tag_repertoires:[])
end
end
diff --git a/app/controllers/challenges_controller.rb b/app/controllers/challenges_controller.rb
index 0b5140743..4528b7b90 100644
--- a/app/controllers/challenges_controller.rb
+++ b/app/controllers/challenges_controller.rb
@@ -173,64 +173,70 @@ class ChallengesController < ApplicationController
# tab 0:过关任务的更新; 1:评测设置的更新; 2:表示参考答案的更新;
def update
- ActiveRecord::Base.transaction do
- tab = params[:tab].to_i
- @challenge.update_attributes(challenge_params)
- if tab == 0 && @challenge.st == 0
- @challenge.challenge_tags.delete_all
- if params[:challenge_tag].present?
- params[:challenge_tag].each do |input|
- ChallengeTag.create!(:name => input, :challenge_id => @challenge.id)
+ begin
+ ActiveRecord::Base.transaction do
+ tab = params[:tab].to_i
+ @challenge.update_attributes(challenge_params)
+ if tab == 0 && @challenge.st == 0
+ @challenge.challenge_tags.delete_all
+ if params[:challenge_tag].present?
+ params[:challenge_tag].each do |input|
+ ChallengeTag.create!(:name => input, :challenge_id => @challenge.id)
+ end
end
- end
- elsif tab == 1
- path = @challenge.path
- exec_path = @challenge.exec_path
- test_set = @challenge.test_sets
- sets_output = test_set.map(&:output)
- sets_input = test_set.map(&:input)
- sets_open = test_set.map(&:is_public)
- set_score = test_set.map(&:score)
- set_match_rule = test_set.map(&:match_rule)
- params_hidden = params[:test_set].map{|set| set[:hidden].to_i == 0}
- params_output = params[:test_set].map{|set| set[:output] }
- params_input = params[:test_set].map{|set| set[:input] }
- params_score = params[:test_set].map{|set| set[:score]}
- params_test_set = params[:test_set].map{|set| set[:match_rule]}
- # 测试集变化则需要更新(输入、 输出、 是否隐藏)
- if sets_output != params_output || sets_open != params_hidden || sets_input != params_input ||
- set_score != params_score || params_test_set != set_match_rule
- test_set.delete_all unless test_set.blank?
- params[:test_set].each_with_index do |set, index|
- # last： 末尾匹配， full: 全完匹配
- logger.info("set: #{set}; match_rule : #{set[:match_rule]}")
- match_rule = set[:match_rule] == 'last' ? 'last' : 'full'
- TestSet.create(:challenge_id => @challenge.id,
- :input => "#{set[:input]}",
- :output => "#{set[:output]}",
- :is_public => params_hidden[index],
- :score => set[:score],
- :match_rule => "#{match_rule}",
- :position => (index + 1))
+ elsif tab == 1
+ path = @challenge.path
+ exec_path = @challenge.exec_path
+ test_set = @challenge.test_sets
+ sets_output = test_set.map(&:output)
+ sets_input = test_set.map(&:input)
+ sets_open = test_set.map(&:is_public)
+ set_score = test_set.map(&:score)
+ set_match_rule = test_set.map(&:match_rule)
+ params_hidden = params[:test_set].map{|set| set[:hidden].to_i == 0}
+ params_output = params[:test_set].map{|set| set[:output] }
+ params_input = params[:test_set].map{|set| set[:input] }
+ params_score = params[:test_set].map{|set| set[:score]}
+ params_test_set = params[:test_set].map{|set| set[:match_rule]}
+ # 测试集变化则需要更新(输入、 输出、 是否隐藏)
+ if sets_output != params_output || sets_open != params_hidden || sets_input != params_input ||
+ set_score != params_score || params_test_set != set_match_rule
+ test_set.delete_all unless test_set.blank?
+ params[:test_set].each_with_index do |set, index|
+ # last： 末尾匹配， full: 全完匹配
+ logger.info("set: #{set}; match_rule : #{set[:match_rule]}")
+ match_rule = set[:match_rule] == 'last' ? 'last' : 'full'
+ TestSet.create(:challenge_id => @challenge.id,
+ :input => "#{set[:input]}",
+ :output => "#{set[:output]}",
+ :is_public => params_hidden[index],
+ :score => set[:score],
+ :match_rule => "#{match_rule}",
+ :position => (index + 1))
+ end
+ @challenge.update_column(:modify_time, Time.now)
+ # 测试集的
+ @shixun.myshixuns.update_all(:system_tip => 0)
end
- @challenge.update_column(:modify_time, Time.now)
- # 测试集的
- @shixun.myshixuns.update_all(:system_tip => 0)
- end
- if params[:challenge][:show_type].to_i == -1
- @challenge.update_attributes(picture_path: nil, web_route: nil, expect_picture_path: nil, original_picture_path: nil)
+ if params[:challenge][:show_type].to_i == -1
+ @challenge.update_attributes(picture_path: nil, web_route: nil, expect_picture_path: nil, original_picture_path: nil)
+ end
+ # 关卡评测执行文件如果被修改，需要修改脚本内容
+ script = modify_shixun_script @shixun, @shixun.evaluate_script
+ @shixun.shixun_info.update_column(:evaluate_script, script)
+ # TODO:
+ # if path != params[:challenge][:path]
+ # shixun_modify_status_without_publish(@shixun, 1)
+ # end
+ #Attachment.attach_files(@challenge, params[:attachments])
end
- # 关卡评测执行文件如果被修改，需要修改脚本内容
- script = modify_shixun_script @shixun, @shixun.evaluate_script
- @shixun.shixun_info.update_column(:evaluate_script, script)
- # TODO:
- # if path != params[:challenge][:path]
- # shixun_modify_status_without_publish(@shixun, 1)
- # end
- #Attachment.attach_files(@challenge, params[:attachments])
- end
+ end
+ rescue => e
+ logger_error("##update_challenges: ##{e.message}")
+ tip_exception("更新失败！")
end
+
end
# 参考答案的'增,删,改'
diff --git a/app/controllers/hacks_controller.rb b/app/controllers/hacks_controller.rb
index c9e9097f8..657ad0f2a 100644
--- a/app/controllers/hacks_controller.rb
+++ b/app/controllers/hacks_controller.rb
@@ -1,8 +1,8 @@
class HacksController < ApplicationController
before_action :require_login, except: [:index]
- before_action :find_hack, only: [:edit, :update, :publish, :start, :update_set, :delete_set]
- before_action :require_teacher_identity, only: [:create, :update_set, :edit, :update]
- before_action :require_auth_identity, only: [:update, :edit, :publish, :update_set, :delete_set]
+ before_action :find_hack, only: [:edit, :update, :publish, :start, :update_set, :delete_set, :destroy]
+ before_action :require_teacher_identity, only: [:create]
+ before_action :require_auth_identity, only: [:update, :edit, :publish, :update_set, :delete_set, :destroy]
# 开启编程，如果第一次开启，创建一条记录，如果已经开启过的话，直接返回标识即可
@@ -112,6 +112,11 @@ class HacksController < ApplicationController
def new;end
+ def destroy
+ @hack.destroy
+ render_ok
+ end
+
private
# 实名认证老师，管理员与运营人员权限
def require_teacher_identity
diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb
index 4b2e3f54f..b5c8af1f3 100644
--- a/app/controllers/myshixuns_controller.rb
+++ b/app/controllers/myshixuns_controller.rb
@@ -216,7 +216,8 @@ class MyshixunsController < ApplicationController
begin
shixun_tomcat = edu_setting('tomcat_webssh')
uri = "#{shixun_tomcat}/bridge/webssh/getConnectInfo"
- params = {tpiID:@myshixun.id, podType:@myshixun.shixun.try(:webssh),
+ # 由于中间层采用混合云的方式，因为local参数表示在有文件生成的实训是在本地生成，还是在其他云端生成评测文件
+ params = {tpiID:@myshixun.id, podType:@myshixun.shixun.try(:webssh), local: @myshixun.shixun.show_type != -1,
containers:(Base64.urlsafe_encode64(shixun_container_limit @myshixun.shixun))}
res = uri_post uri, params
if res && res['code'].to_i != 0
diff --git a/app/jobs/sync_trustie_job.rb b/app/jobs/sync_trustie_job.rb
index 33df5b529..dec09debc 100644
--- a/app/jobs/sync_trustie_job.rb
+++ b/app/jobs/sync_trustie_job.rb
@@ -17,10 +17,17 @@ class SyncTrustieJob < ApplicationJob
"number": count
}
uri = URI.parse(url)
+ # http = Net::HTTP.new(uri.hostname, uri.port)
+
if api_host
http = Net::HTTP.new(uri.hostname, uri.port)
- http.send_request('PUT', uri.path, sync_json.to_json, {'Content-Type' => 'application/json'})
- Rails.logger.info("#######_________response__sync__end_____#########")
+
+ if api_host.include?("https://")
+ http.use_ssl = true
+ end
+
+ response = http.send_request('PUT', uri.path, sync_json.to_json, {'Content-Type' => 'application/json'})
+ Rails.logger.info("#######_________response__sync__end_____#########{response.body}")
end
end
end
diff --git a/app/queries/admins/shixun_settings_query.rb b/app/queries/admins/shixun_settings_query.rb
index ab871b58e..377e7bf60 100644
--- a/app/queries/admins/shixun_settings_query.rb
+++ b/app/queries/admins/shixun_settings_query.rb
@@ -51,6 +51,7 @@ class Admins::ShixunSettingsQuery < ApplicationQuery
all_shixuns = all_shixuns.where(homepage_show: params[:homepage_show]) if params[:homepage_show]
all_shixuns = all_shixuns.where(task_pass: params[:task_pass]) if params[:task_pass]
all_shixuns = all_shixuns.where(code_hidden: params[:code_hidden]) if params[:code_hidden]
+ all_shixuns = all_shixuns.where(vip: params[:vip]) if params[:vip]
custom_sort(all_shixuns, params[:sort_by], params[:sort_direction])
end
diff --git a/app/views/admins/shixun_settings/index.html.erb b/app/views/admins/shixun_settings/index.html.erb
index 7aab73f64..66286926a 100644
--- a/app/views/admins/shixun_settings/index.html.erb
+++ b/app/views/admins/shixun_settings/index.html.erb
@@ -65,6 +65,12 @@
只看已隐藏文件目录
+
+
+
<% end %>
diff --git a/app/views/admins/shixun_settings/shared/_list.html.erb b/app/views/admins/shixun_settings/shared/_list.html.erb
index aee4307b1..549c7edf4 100644
--- a/app/views/admins/shixun_settings/shared/_list.html.erb
+++ b/app/views/admins/shixun_settings/shared/_list.html.erb
@@ -15,7 +15,7 @@
操作
- ssh/隐藏/首页/跳关/隐藏目录
+ ssh/隐藏/首页/跳关/隐藏目录/vip
|
diff --git a/app/views/admins/shixun_settings/shared/_td.html.erb b/app/views/admins/shixun_settings/shared/_td.html.erb
index 905183873..fc5af645a 100644
--- a/app/views/admins/shixun_settings/shared/_td.html.erb
+++ b/app/views/admins/shixun_settings/shared/_td.html.erb
@@ -48,6 +48,7 @@
<%= check_box_tag :homepage_show,!shixun.homepage_show,shixun.homepage_show,remote:true,data:{id:shixun.id,toggle:"tooltip",placement:"top"},class:"shixun-setting-form",title:"首页" %>
<%= check_box_tag :task_pass,!shixun.task_pass,shixun.task_pass,remote:true,data:{id:shixun.id,toggle:"tooltip",placement:"top"},class:"shixun-setting-form" ,title:"跳关"%>
<%= check_box_tag :code_hidden,!shixun.code_hidden,shixun.code_hidden,remote:true,data:{id:shixun.id,toggle:"tooltip",placement:"top"},class:"shixun-setting-form" ,title:"隐藏目录"%>
+ <%= check_box_tag :vip,!shixun.vip,shixun.vip,remote:true,data:{id:shixun.id,toggle:"tooltip",placement:"top"},class:"shixun-setting-form" ,title:"vip"%>