Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

chromesetting
jingquan huang 5 years ago
commit 66cd9b62a0

@ -8,6 +8,9 @@ class Admins::ShixunsController < Admins::BaseController
@pending_shixuns = shixuns.where(status:1).size @pending_shixuns = shixuns.where(status:1).size
@processed_shixuns = shixuns.where(status:2).size @processed_shixuns = shixuns.where(status:2).size
@closed_shixuns = shixuns.where(status:3).size @closed_shixuns = shixuns.where(status:3).size
@none_public_shixuns = shixuns.where(public:0).size
@pending_public_shixuns = shixuns.where(public:1).size
@processed_pubic_shixuns = shixuns.where(public:2).size
@shixuns_type_check = MirrorRepository.pluck(:type_name,:id) @shixuns_type_check = MirrorRepository.pluck(:type_name,:id)
@params_page = params[:page] || 1 @params_page = params[:page] || 1
@shixuns = paginate shixuns.preload(:user,:challenges) @shixuns = paginate shixuns.preload(:user,:challenges)

@ -29,7 +29,7 @@ class CoursesController < ApplicationController
:informs, :update_informs, :online_learning, :update_task_position, :tasks_list, :informs, :update_informs, :online_learning, :update_task_position, :tasks_list,
:join_excellent_course, :export_couser_info, :export_member_act_score, :new_informs, :join_excellent_course, :export_couser_info, :export_member_act_score, :new_informs,
:delete_informs, :change_member_role, :course_groups, :join_course_group, :statistics, :delete_informs, :change_member_role, :course_groups, :join_course_group, :statistics,
:work_score, :act_score] :work_score, :act_score, :calculate_all_shixun_scores]
before_action :user_course_identity, except: [:join_excellent_course, :index, :create, :new, :apply_to_join_course, before_action :user_course_identity, except: [:join_excellent_course, :index, :create, :new, :apply_to_join_course,
:search_course_list, :get_historical_course_students, :mine, :search_slim, :board_list] :search_course_list, :get_historical_course_students, :mine, :search_slim, :board_list]
before_action :teacher_allowed, only: [:update, :destroy, :settings, :search_teacher_candidate, before_action :teacher_allowed, only: [:update, :destroy, :settings, :search_teacher_candidate,
@ -48,7 +48,7 @@ class CoursesController < ApplicationController
before_action :validate_page_size, only: :mine before_action :validate_page_size, only: :mine
before_action :course_tasks, only: [:tasks_list, :update_task_position] before_action :course_tasks, only: [:tasks_list, :update_task_position]
before_action :validate_inform_params, only: [:update_informs, :new_informs] before_action :validate_inform_params, only: [:update_informs, :new_informs]
before_action :course_member_allowed, only: [:statistics, :work_score, :act_score] before_action :course_member_allowed, only: [:statistics, :work_score, :act_score, :calculate_all_shixun_scores]
if RUBY_PLATFORM =~ /linux/ if RUBY_PLATFORM =~ /linux/
require 'simple_xlsx_reader' require 'simple_xlsx_reader'
@ -1334,6 +1334,16 @@ class CoursesController < ApplicationController
end end
end end
# 计算课堂所有已发布的实训作业成绩
def calculate_all_shixun_scores
tip_exception(-1, "课堂已结束") if @course.is_end
shixun_homeworks = @course.homework_commons.homework_published.where(homework_type: 4)
shixun_homeworks.includes(:homework_challenge_settings, :published_settings, :homework_commons_shixun).each do |homework|
homework.update_homework_work_score
end
normal_status(0, "更新成功")
end
def search_slim def search_slim
courses = current_user.manage_courses.not_deleted.processing courses = current_user.manage_courses.not_deleted.processing

@ -1,8 +1,8 @@
class HacksController < ApplicationController class HacksController < ApplicationController
before_action :require_login, except: [:index] before_action :require_login, except: [:index]
before_action :find_hack, only: [:edit, :update, :publish, :start, :update_set, :delete_set, :destroy] before_action :find_hack, only: [:edit, :update, :publish, :start, :update_set, :delete_set, :destroy, :cancel_publish]
before_action :require_teacher_identity, only: [:create] before_action :require_teacher_identity, only: [:create]
before_action :require_auth_identity, only: [:update, :edit, :publish, :update_set, :delete_set, :destroy] before_action :require_auth_identity, only: [:update, :edit, :publish, :update_set, :delete_set, :destroy, :cancel_publish]
# 开启编程,如果第一次开启,创建一条记录,如果已经开启过的话,直接返回标识即可 # 开启编程,如果第一次开启,创建一条记录,如果已经开启过的话,直接返回标识即可
@ -99,6 +99,12 @@ class HacksController < ApplicationController
render_ok render_ok
end end
# 取消发布
def cancel_publish
@hack.update_attribute(:status, 0)
render_ok
end
# 发布列表 # 发布列表
def unpulished_list def unpulished_list
limit = params[:limit] || 16 limit = params[:limit] || 16

@ -1,385 +1,386 @@
class MyshixunsController < ApplicationController class MyshixunsController < ApplicationController
before_action :require_login, :check_auth, :except => [:training_task_status, :code_runinng_message] before_action :require_login, :check_auth, :except => [:training_task_status, :code_runinng_message]
before_action :find_myshixun, :except => [:training_task_status, :code_runinng_message] before_action :find_myshixun, :except => [:training_task_status, :code_runinng_message]
before_action :find_repo_name, :except => [:training_task_status, :code_runinng_message] before_action :find_repo_name, :except => [:training_task_status, :code_runinng_message]
skip_before_action :verify_authenticity_token, :only => [:html_content] skip_before_action :verify_authenticity_token, :only => [:html_content]
## TPI关卡列表 ## TPI关卡列表
def challenges def challenges
# @challenges = Challenge.where(shixun_id: params[:shixun_id]) # @challenges = Challenge.where(shixun_id: params[:shixun_id])
@shixun = @myshixun.shixun @shixun = @myshixun.shixun
@games = @myshixun.games.includes(:challenge).reorder("challenges.position") @games = @myshixun.games.includes(:challenge).reorder("challenges.position")
@identity = current_user.game_identity(@games.first) @identity = current_user.game_identity(@games.first)
end end
# For Admin # For Admin
# 强制重置实训 # 强制重置实训
# 前段需要按照操作过程提示 # 前段需要按照操作过程提示
def reset_my_game def reset_my_game
unless (current_user.admin? || current_user.id == @myshixun.user_id) unless (current_user.admin? || current_user.id == @myshixun.user_id)
tip_exception("403", "") tip_exception("403", "")
end end
begin begin
ActiveRecord::Base.transaction do ActiveRecord::Base.transaction do
begin begin
@shixun = Shixun.select(:id, :identifier, :challenges_count).find(@myshixun.shixun_id) @shixun = Shixun.select(:id, :identifier, :challenges_count).find(@myshixun.shixun_id)
@myshixun.destroy! @myshixun.destroy!
StudentWork.where(:myshixun_id => @myshixun.id).update_all(myshixun_id: 0, work_status: 0, work_score: nil, StudentWork.where(:myshixun_id => @myshixun.id).update_all(myshixun_id: 0, work_status: 0, work_score: nil,
final_score: nil, efficiency: 0, eff_score: 0, calculation_time: nil, cost_time: 0, compelete_status: 0) final_score: nil, efficiency: 0, eff_score: 0, calculation_time: nil, cost_time: 0, compelete_status: 0)
rescue Exception => e rescue Exception => e
logger.error("######reset_my_game_failed:#{e.message}") logger.error("######reset_my_game_failed:#{e.message}")
raise("ActiveRecord::RecordInvalid") raise("ActiveRecord::RecordInvalid")
end end
end end
# 删除版本库 # 删除版本库
GitService.delete_repository(repo_path: @repo_path) unless @shixun.is_choice_type? GitService.delete_repository(repo_path: @repo_path) unless @shixun.is_choice_type?
rescue Exception => e rescue Exception => e
if e.message != "ActiveRecord::RecordInvalid" if e.message != "ActiveRecord::RecordInvalid"
logger.error("######delete_repository_error-:#{e.message}") logger.error("######delete_repository_error-:#{e.message}")
end end
raise "delete_repository_error:#{e.message}" raise "delete_repository_error:#{e.message}"
end end
end end
# 代码运行中的信息接口 # 代码运行中的信息接口
# 这个方法是中间层主动调用的点击评测后中间层会发送参数过来告诉目前Pod的启动情况一次评测会调用两次请求 # 这个方法是中间层主动调用的点击评测后中间层会发送参数过来告诉目前Pod的启动情况一次评测会调用两次请求
def code_runinng_message def code_runinng_message
begin begin
jsonTestDetails = JSON.parse(params[:jsonTestDetails]) jsonTestDetails = JSON.parse(params[:jsonTestDetails])
game_id = jsonTestDetails['buildID'] game_id = jsonTestDetails['buildID']
message = jsonTestDetails['textMsg'] message = jsonTestDetails['textMsg']
if game_id.present? && message.present? if game_id.present? && message.present?
game = Game.find game_id game = Game.find game_id
msg = game.run_code_message msg = game.run_code_message
# 只有评测中的game才会创建和更新代码评测中的信息 # 只有评测中的game才会创建和更新代码评测中的信息
if game.status == 1 || game.status == 2 if game.status == 1 || game.status == 2
if msg.blank? if msg.blank?
RunCodeMessage.create!(:game_id => game_id, :status => 1, :message => message) RunCodeMessage.create!(:game_id => game_id, :status => 1, :message => message)
else else
msg.update_attributes(:status => (msg.status + 1), :message => message) msg.update_attributes(:status => (msg.status + 1), :message => message)
end end
end end
render :json => {:data => "success"} render :json => {:data => "success"}
end end
rescue Exception => e rescue Exception => e
render :json => {:data => "failed, exception_message: #{e}"} render :json => {:data => "failed, exception_message: #{e}"}
end end
end end
# 中间层评测接口 # 中间层评测接口
# taskId 即返回的game id # taskId 即返回的game id
# 返回结果params [:stauts] 0 表示成功,其它则失败 # 返回结果params [:stauts] 0 表示成功,其它则失败
# msg 错误信息 # msg 错误信息
# output 为测试用户编译输出结果 # output 为测试用户编译输出结果
# myshixun:status 1为完成实训 # myshixun:status 1为完成实训
# @jenkins: caseId对应test_set的positionpassed: 1表示成功0表示失败 # @jenkins: caseId对应test_set的positionpassed: 1表示成功0表示失败
# resubmit 1表示已通关后重新评测0表示非重新评测 # resubmit 1表示已通关后重新评测0表示非重新评测
# retry_status 0初始值1重新评测失败2重新评测成功 # retry_status 0初始值1重新评测失败2重新评测成功
# tpiRepoPath 中间层图片的workspace路径 # tpiRepoPath 中间层图片的workspace路径
# params[:jsonTestDetails] = '{"buildID":"19284","compileSuccess":"1", # params[:jsonTestDetails] = '{"buildID":"19284","compileSuccess":"1",
# "msg":[{"caseId":"1","expectedOutput":"MSAyIDMNCg","input":"MiAzIDE","output":"MSAyIDMNCg","passed":"1"}, # "msg":[{"caseId":"1","expectedOutput":"MSAyIDMNCg","input":"MiAzIDE","output":"MSAyIDMNCg","passed":"1"},
# {"caseId":"2","expectedOutput":"LTMgMSA2DQo","input":"LTMgNiAx","output":"LTMgMSA2DQo","passed":"1"}, # {"caseId":"2","expectedOutput":"LTMgMSA2DQo","input":"LTMgNiAx","output":"LTMgMSA2DQo","passed":"1"},
# {"caseId":"3","expectedOutput":"LTcgLTUgLTMNCg","input":"LTcgLTMgLTU","output":"LTcgLTUgLTMNCg","passed":"1"}], # {"caseId":"3","expectedOutput":"LTcgLTUgLTMNCg","input":"LTcgLTMgLTU","output":"LTcgLTUgLTMNCg","passed":"1"}],
# "outPut":"Y29tcGlsZSBzdWNjZXNzZnVsbHk","resubmit":"","status":"0"}' # "outPut":"Y29tcGlsZSBzdWNjZXNzZnVsbHk","resubmit":"","status":"0"}'
# params[:timeCost] = '{"evaluateEnd":"2017-11-24 11:04:37","pull":"0.086", # params[:timeCost] = '{"evaluateEnd":"2017-11-24 11:04:37","pull":"0.086",
# "createPod":"1.610","evaluateAllTime":2820,"evaluateStart":"2017-11-24 11:04:35","execute":"0.294"}' # "createPod":"1.610","evaluateAllTime":2820,"evaluateStart":"2017-11-24 11:04:35","execute":"0.294"}'
# params[:pics] = "a.png,b.png,c.png" # params[:pics] = "a.png,b.png,c.png"
def training_task_status def training_task_status
ActiveRecord::Base.transaction do ActiveRecord::Base.transaction do
begin begin
t1 = Time.now t1 = Time.now
uid_logger_dubug("@@@222222#{params[:jsonTestDetails]}") uid_logger_dubug("@@@222222#{params[:jsonTestDetails]}")
jsonTestDetails = JSON.parse(params[:jsonTestDetails]) jsonTestDetails = JSON.parse(params[:jsonTestDetails])
timeCost = JSON.parse(params[:timeCost]) timeCost = JSON.parse(params[:timeCost])
brige_end_time = Time.parse(timeCost['evaluateEnd']) if timeCost['evaluateEnd'].present? brige_end_time = Time.parse(timeCost['evaluateEnd']) if timeCost['evaluateEnd'].present?
return_back_time = format("%.3f", ( t1.to_f - brige_end_time.to_f)).to_f return_back_time = format("%.3f", ( t1.to_f - brige_end_time.to_f)).to_f
status = jsonTestDetails['status'] status = jsonTestDetails['status']
game_id = jsonTestDetails['buildID'] game_id = jsonTestDetails['buildID']
sec_key = jsonTestDetails['sec_key'] sec_key = jsonTestDetails['sec_key']
uid_logger_dubug("training_task_status start-#{game_id}-1#{Time.now.strftime("%Y-%m-%d %H:%M:%S.%L")}") uid_logger_dubug("training_task_status start-#{game_id}-1#{Time.now.strftime("%Y-%m-%d %H:%M:%S.%L")}")
resubmit = jsonTestDetails['resubmit'] resubmit = jsonTestDetails['resubmit']
outPut = tran_base64_decode64(jsonTestDetails['outPut']) outPut = tran_base64_decode64(jsonTestDetails['outPut'])
jenkins_testsets = jsonTestDetails['msg'] jenkins_testsets = jsonTestDetails['msg']
compile_success = jsonTestDetails['compileSuccess'] compile_success = jsonTestDetails['compileSuccess']
# message = Base64.decode64(params[:msg]) unless params[:msg].blank? # message = Base64.decode64(params[:msg]) unless params[:msg].blank?
game = Game.find(game_id) game = Game.find(game_id)
myshixun = game.myshixun myshixun = game.myshixun
challenge = game.challenge challenge = game.challenge
# test_sets = challenge.test_sets # test_sets = challenge.test_sets
if challenge.picture_path.present? if challenge.picture_path.present?
#pics = params[:files] #pics = params[:files]
pics = params[:tpiRepoPath] pics = params[:tpiRepoPath]
game.update_column(:picture_path, pics) game.update_column(:picture_path, pics)
end end
max_query_index = game.outputs ? (game.outputs.first.try(:query_index).to_i + 1) : 1 max_query_index = game.outputs ? (game.outputs.first.try(:query_index).to_i + 1) : 1
test_set_score = 0 test_set_score = 0
unless jenkins_testsets.blank? unless jenkins_testsets.blank?
jenkins_testsets.each_with_index do |j_test_set, i| jenkins_testsets.each_with_index do |j_test_set, i|
actual_output = tran_base64_decode64(j_test_set['output']) actual_output = tran_base64_decode64(j_test_set['output'])
#ts_time += j_test_set['testSetTime'].to_i #ts_time += j_test_set['testSetTime'].to_i
# is_public = test_sets.where(:position => j_test_set['caseId']).first.try(:is_public) # is_public = test_sets.where(:position => j_test_set['caseId']).first.try(:is_public)
ts_time = format("%.2f", j_test_set['testSetTime'].to_f/1000000000).to_f if j_test_set['testSetTime'] ts_time = format("%.2f", j_test_set['testSetTime'].to_f/1000000000).to_f if j_test_set['testSetTime']
ts_mem = format("%.2f", j_test_set['testSetMem'].to_f/1024/1024).to_f if j_test_set['testSetMem'] ts_mem = format("%.2f", j_test_set['testSetMem'].to_f/1024/1024).to_f if j_test_set['testSetMem']
Output.create!(:code => status, :game_id => game_id, :out_put => outPut, :test_set_position => j_test_set['caseId'], Output.create!(:code => status, :game_id => game_id, :out_put => outPut, :test_set_position => j_test_set['caseId'],
:actual_output => actual_output, :result => j_test_set['passed'].to_i, :query_index => max_query_index, :actual_output => actual_output, :result => j_test_set['passed'].to_i, :query_index => max_query_index,
:compile_success => compile_success.to_i, :sec_key => sec_key, :ts_time => ts_time, :ts_mem => ts_mem) :compile_success => compile_success.to_i, :sec_key => sec_key, :ts_time => ts_time, :ts_mem => ts_mem)
# 如果设置了按测试集给分,则需要统计测试集的分值 # 如果设置了按测试集给分,则需要统计测试集的分值
if challenge.test_set_score && j_test_set['passed'].to_i == 1 if challenge.test_set_score && j_test_set['passed'].to_i == 1
test_set_score += challenge.test_sets.where(:position => j_test_set['caseId']).pluck(:score).first test_set_score += challenge.test_sets.where(:position => j_test_set['caseId']).pluck(:score).first
end end
end end
end end
record = EvaluateRecord.where(:identifier => sec_key).first record = EvaluateRecord.where(:identifier => sec_key).first
answer_deduction_percentage = (100 - game.answer_deduction) / 100.to_f # 查看答案后剩余分数的百分比. answer_deduction_percentage = (100 - game.answer_deduction) / 100.to_f # 查看答案后剩余分数的百分比.
# answer_deduction是查看答案的扣分比例 # answer_deduction是查看答案的扣分比例
# status0表示评测成功 # status0表示评测成功
if status == "0" if status == "0"
if resubmit.present? if resubmit.present?
game.update_attributes!(:retry_status => 2, :resubmit_identifier => resubmit) game.update_attributes!(:retry_status => 2, :resubmit_identifier => resubmit)
challenge.path.split("").each do |path| challenge.path.split("").each do |path|
game_passed_code(path.try(:strip), myshixun, game_id) game_passed_code(path.try(:strip), myshixun, game_id)
end end
else else
game.update_attributes!(:status => 2, game.update_attributes!(:status => 2,
:end_time => Time.now, :end_time => Time.now,
:accuracy => format("%.4f", 1.0 / game.query_index)) :accuracy => format("%.4f", 1.0 / game.query_index))
myshixun.update_attributes!(:status => 1) if game.had_done == 1 myshixun.update_attributes!(:status => 1) if game.had_done == 1
challenge.path.split("").each do |path| challenge.path.split("").each do |path|
game_passed_code(path.try(:strip), myshixun, game_id) game_passed_code(path.try(:strip), myshixun, game_id)
end end
# 如果是已经发布的实训,则需要给出相应的奖励 # 如果是已经发布的实训,则需要给出相应的奖励
if challenge.shixun.try(:status) > 1 if challenge.shixun.try(:status) > 1
score = (challenge.score * answer_deduction_percentage).to_i score = (challenge.score * answer_deduction_percentage).to_i
if score > 0 if score > 0
reward_attrs = { container_id: game.id, container_type: 'Game', score: score } reward_attrs = { container_id: game.id, container_type: 'Game', score: score }
RewardGradeService.call(game.user, reward_attrs) RewardGradeService.call(game.user, reward_attrs)
RewardExperienceService.call(game.user, reward_attrs) RewardExperienceService.call(game.user, reward_attrs)
end end
# 需要扣除查看答案的分数 # 需要扣除查看答案的分数
game.update_attributes!(:final_score => score) game.update_attributes!(:final_score => score)
end end
# 更新实训关联的作品分数 TODO: 更新作品分数 # 更新实训关联的作品分数 TODO: 更新作品分数
# HomeworksService.new.update_myshixun_work_score myshixun # HomeworksService.new.update_myshixun_work_score myshixun
end end
# 如果过关了下一关的状态是3为开启则需要把状态改成1已开启 # 如果过关了下一关的状态是3为开启则需要把状态改成1已开启
# next_game = game.next_game # next_game = game.next_game
next_game = game.next_game(myshixun.shixun_id, game.myshixun_id, challenge.position) next_game = game.next_game(myshixun.shixun_id, game.myshixun_id, challenge.position)
next_game.update_column(:status, 0) if next_game.present? && next_game.status == 3 next_game.update_column(:status, 0) if next_game.present? && next_game.status == 3
# status == "-1" 表示返回结果错误 # status == "-1" 表示返回结果错误
else else
if resubmit.present? if resubmit.present?
game.update_attributes!(:retry_status => 1, :resubmit_identifier => resubmit) game.update_attributes!(:retry_status => 1, :resubmit_identifier => resubmit)
else else
# 评测没通关则,测试集对的个数给分,并且还要扣除用户是否查看答案的值 # 评测没通关则,测试集对的个数给分,并且还要扣除用户是否查看答案的值
test_set_percentage = test_set_score / 100.to_f # 测试集得分比 test_set_percentage = test_set_score / 100.to_f # 测试集得分比
score = (challenge.score * test_set_percentage * answer_deduction_percentage).to_i score = (challenge.score * test_set_percentage * answer_deduction_percentage).to_i
# 如果分数比上次多,则更新成绩 # 如果分数比上次多,则更新成绩
game_update = game_update =
if game.final_score < score if game.final_score < score
{final_score: score, status: 0} {final_score: score, status: 0}
else else
{status: 0} {status: 0}
end end
game.update_attributes!(game_update) game.update_attributes!(game_update)
end end
end end
test_cases_time = format("%.3f", (Time.now.to_f - t1.to_f)).to_f test_cases_time = format("%.3f", (Time.now.to_f - t1.to_f)).to_f
if record.present? if record.present?
consume_time = format("%.3f", (Time.now - record.created_at)).to_f consume_time = format("%.3f", (Time.now - record.created_at)).to_f
record.update_attributes!(:consume_time => consume_time, :git_pull => timeCost['pull'] , :create_pod => timeCost['createPod'], record.update_attributes!(:consume_time => consume_time, :git_pull => timeCost['pull'] , :create_pod => timeCost['createPod'],
:pod_execute => timeCost['execute'], :test_cases => test_cases_time, :pod_execute => timeCost['execute'], :test_cases => test_cases_time,
:brige => timeCost['evaluateAllTime'], :return_back => return_back_time) :brige => timeCost['evaluateAllTime'], :return_back => return_back_time)
end end
sucess_status sucess_status
# rescue Exception => e # rescue Exception => e
# tip_exception(e.message) # tip_exception(e.message)
# uid_logger_error("training_task_status error: #{e}") # uid_logger_error("training_task_status error: #{e}")
# raise ActiveRecord::Rollback # raise ActiveRecord::Rollback
end end
end end
end end
# 连接webssh # 连接webssh
def open_webssh def open_webssh
username = edu_setting('webssh_username') username = edu_setting('webssh_username')
password = edu_setting('webssh_password') password = edu_setting('webssh_password')
old_time = Time.now.to_i old_time = Time.now.to_i
begin begin
shixun_tomcat = edu_setting('tomcat_webssh') shixun_tomcat = edu_setting('tomcat_webssh')
uri = "#{shixun_tomcat}/bridge/webssh/getConnectInfo" uri = "#{shixun_tomcat}/bridge/webssh/getConnectInfo"
# 由于中间层采用混合云的方式因为local参数表示在有文件生成的实训是在本地生成还是在其他云端生成评测文件 # 由于中间层采用混合云的方式因为local参数表示在有文件生成的实训是在本地生成还是在其他云端生成评测文件
params = {tpiID:@myshixun.id, podType:@myshixun.shixun.try(:webssh), #local: @myshixun.shixun.show_type != -1, local = @myshixun.shixun.challenges.where.not(show_type: -1).count == 0
containers:(Base64.urlsafe_encode64(shixun_container_limit @myshixun.shixun))} params = {tpiID:@myshixun.id, podType:@myshixun.shixun.try(:webssh), local: local,
res = uri_post uri, params containers:(Base64.urlsafe_encode64(shixun_container_limit @myshixun.shixun))}
if res && res['code'].to_i != 0 res = uri_post uri, params
tip_exception("实训云平台繁忙繁忙等级92") if res && res['code'].to_i != 0
end tip_exception("实训云平台繁忙繁忙等级92")
render :json => {:host => res['address'], end
:port => res['port'], render :json => {:host => res['address'],
:ws_url => res['ws_address'], :port => res['port'],
:username => username, :ws_url => res['ws_address'],
:password => password, :username => username,
:game_id => @myshixun.id, :password => password,
:webssh_url => "#{shixun_tomcat}/bridge"} :game_id => @myshixun.id,
rescue Exception => e :webssh_url => "#{shixun_tomcat}/bridge"}
logger.error(e) rescue Exception => e
render :json => {:error => e.try(:message)} logger.error(e)
ensure render :json => {:error => e.try(:message)}
use_time = Time.now.to_i - old_time ensure
logger.info "open_webssh tpiID #{@myshixun.id} use time #{use_time}" use_time = Time.now.to_i - old_time
end logger.info "open_webssh tpiID #{@myshixun.id} use time #{use_time}"
end end
end
include GitCommon
include GitCommon
# -----Repository
# TODO: 之类需要一个resubmit参数,但是是关于games. # -----Repository
def update_file # TODO: 之类需要一个resubmit参数,但是是关于games.
begin def update_file
@hide_code = Shixun.where(id: @myshixun.shixun_id).pluck(:hide_code).first begin
tip_exception("技术平台为空!") if @myshixun.mirror_name.blank? @hide_code = Shixun.where(id: @myshixun.shixun_id).pluck(:hide_code).first
path = params[:path].strip unless params[:path].blank? tip_exception("技术平台为空!") if @myshixun.mirror_name.blank?
game_id = params[:game_id] path = params[:path].strip unless params[:path].blank?
game = Game.find(game_id) game_id = params[:game_id]
@content_modified = 0 game = Game.find(game_id)
@content_modified = 0
# params[:evaluate] 实训评测时更新必须给的参数,需要依据该参数做性能统计,其它类型的更新可以跳过
# 自动保存的时候evaluate为0点评测的时候为1 # params[:evaluate] 实训评测时更新必须给的参数,需要依据该参数做性能统计,其它类型的更新可以跳过
if params[:evaluate] == 1 # 自动保存的时候evaluate为0点评测的时候为1
exec_time = game.challenge.try(:exec_time) if params[:evaluate] == 1
@sec_key = generate_identifier(EvaluateRecord, 12) exec_time = game.challenge.try(:exec_time)
record = EvaluateRecord.create!(:user_id => current_user.id, :shixun_id => @myshixun.shixun_id, :game_id => game_id, @sec_key = generate_identifier(EvaluateRecord, 12)
:identifier => @sec_key, :exec_time => exec_time) record = EvaluateRecord.create!(:user_id => current_user.id, :shixun_id => @myshixun.shixun_id, :game_id => game_id,
uid_logger_dubug("-- game build: file update #{@sec_key}, record id is #{record.id}, time is **** #{Time.now.strftime("%Y-%m-%d %H:%M:%S.%L")}") :identifier => @sec_key, :exec_time => exec_time)
end uid_logger_dubug("-- game build: file update #{@sec_key}, record id is #{record.id}, time is **** #{Time.now.strftime("%Y-%m-%d %H:%M:%S.%L")}")
# 隐藏代码文件 和 VNC的都不需要走版本库 end
unless @hide_code || (@myshixun.shixun&.vnc_evaluate && params[:evaluate].present?) # 隐藏代码文件 和 VNC的都不需要走版本库
# 远程版本库文件内容 unless @hide_code || (@myshixun.shixun&.vnc_evaluate && params[:evaluate].present?)
last_content = GitService.file_content(repo_path: @repo_path, path: path)["content"] # 远程版本库文件内容
last_content = GitService.file_content(repo_path: @repo_path, path: path)["content"]
content =
if python_file?(path) content =
params[:content].gsub(/\t/, ' ').gsub(/ /, ' ') if python_file?(path)
else params[:content].gsub(/\t/, ' ').gsub(/ /, ' ')
params[:content] else
end params[:content]
uid_logger_dubug("###11222333####{content}") end
uid_logger_dubug("###222333####{last_content}") uid_logger_dubug("###11222333####{content}")
uid_logger_dubug("###222333####{last_content}")
if content != last_content
@content_modified = 1 if content != last_content
@content_modified = 1
author_name = current_user.real_name
author_email = current_user.git_mail author_name = current_user.real_name
message = params[:evaluate] == 0 ? "System automatically submitted" : "User submitted" author_email = current_user.git_mail
uid_logger_dubug("112233#{author_name}") message = params[:evaluate] == 0 ? "System automatically submitted" : "User submitted"
uid_logger_dubug("112233#{author_email}") uid_logger_dubug("112233#{author_name}")
@content = GitService.update_file(repo_path: @repo_path, uid_logger_dubug("112233#{author_email}")
file_path: path, @content = GitService.update_file(repo_path: @repo_path,
message: message, file_path: path,
content: content, message: message,
author_name: author_name, content: content,
author_email: author_email) author_name: author_name,
end author_email: author_email)
end end
end
if game.status == 2
@resubmit = Time.now.to_i if game.status == 2
end @resubmit = Time.now.to_i
end
# 评测时间记录
if record.present? # 评测时间记录
consume_time = format("%.3f", (Time.now.to_f - record.created_at.to_f)).to_f if record.present?
record.update_attributes!(:file_update => consume_time) consume_time = format("%.3f", (Time.now.to_f - record.created_at.to_f)).to_f
end record.update_attributes!(:file_update => consume_time)
rescue Exception => e end
uid_logger_error(e.message) rescue Exception => e
tip_exception("文件内容更新异常,请稍后重试") uid_logger_error(e.message)
end tip_exception("文件内容更新异常,请稍后重试")
end end
end
# 渲染实训代码
# educodercss: 字符串以 分隔存储的是版本库css的路径 # 渲染实训代码
# educoderscript: 字符串以 分隔存储的是版本库js的路径 # educodercss: 字符串以 分隔存储的是版本库css的路径
# contents html实训的整体内容 # educoderscript: 字符串以 分隔存储的是版本库js的路径
def html_content # contents html实训的整体内容
@contents = params[:contents] || "" def html_content
edu_css = params[:educodercss] @contents = params[:contents] || ""
edu_js = params[:educoderscript] edu_css = params[:educodercss]
if @contents.present? edu_js = params[:educoderscript]
@contents = @contents.gsub("w3equalsign", "=").gsub("w3scrw3ipttag", "script").gsub("edulink", "link").html_safe if @contents.present?
end @contents = @contents.gsub("w3equalsign", "=").gsub("w3scrw3ipttag", "script").gsub("edulink", "link").html_safe
# css end
if edu_css.present? # css
css_path = edu_css.split(",") if edu_css.present?
css_path.each do |path| css_path = edu_css.split(",")
file_content = git_fle_content(@repo_path, path)["content"] css_path.each do |path|
file_content = tran_base64_decode64(file_content) unless file_content.blank? file_content = git_fle_content(@repo_path, path)["content"]
@contents = @contents.sub(/EDUCODERCSS/, "<style>#{file_content}</style>") file_content = tran_base64_decode64(file_content) unless file_content.blank?
end @contents = @contents.sub(/EDUCODERCSS/, "<style>#{file_content}</style>")
end end
# js end
if edu_js.present? # js
js_path = edu_js.split(",") if edu_js.present?
js_path.each do |path| js_path = edu_js.split(",")
file_content = git_fle_content(@repo_path, path)["content"] js_path.each do |path|
file_content = tran_base64_decode64(file_content) unless file_content.blank? file_content = git_fle_content(@repo_path, path)["content"]
@contents = @contents.sub(/EDUCODERJS/, "<script>#{file_content}</script>") file_content = tran_base64_decode64(file_content) unless file_content.blank?
end @contents = @contents.sub(/EDUCODERJS/, "<script>#{file_content}</script>")
end end
respond_to do |format| end
format.json respond_to do |format|
format.html{render :layout => false} format.json
end format.html{render :layout => false}
end end
end
# 最新可以用的并发测试接口
def sigle_mul_test # 最新可以用的并发测试接口
codes = %W(1 2 3 4 5 6 7 8 9 A B C D E F G H J K L N M O P Q R S T U V W X Y Z) def sigle_mul_test
begin codes = %W(1 2 3 4 5 6 7 8 9 A B C D E F G H J K L N M O P Q R S T U V W X Y Z)
identifiers = Myshixun.where(:shixun_id => params[:shixun_id].split(",")).pluck(:identifier) begin
ide = identifiers[rand(identifiers.length)] identifiers = Myshixun.where(:shixun_id => params[:shixun_id].split(",")).pluck(:identifier)
myshixun = Myshixun.where(:identifier => ide).first ide = identifiers[rand(identifiers.length)]
myshixun = Myshixun.where(:identifier => ide).first
game = myshixun.games.last
logger.warn("###2mul test game_build start ") game = myshixun.games.last
identifier = game.try(:identifier) logger.warn("###2mul test game_build start ")
if game.status == 2 identifier = game.try(:identifier)
code = codes.sample(8).join if game.status == 2
resubmit = "#{code}_#{myshixun.id}" code = codes.sample(8).join
end resubmit = "#{code}_#{myshixun.id}"
logger.warn("###3mul test game_build start ...") end
EvaluateRecord.create!(:user_id => myshixun.user_id, :shixun_id => myshixun.shixun.id, :game_id => game.id) logger.warn("###3mul test game_build start ...")
redirect_to "/api/games/#{identifier}/game_build?resubmit=#{resubmit}&content_modified=0&first=1" EvaluateRecord.create!(:user_id => myshixun.user_id, :shixun_id => myshixun.shixun.id, :game_id => game.id)
rescue Exception => e redirect_to "/api/games/#{identifier}/game_build?resubmit=#{resubmit}&content_modified=0&first=1"
logger.error("mul test failed ===> #{e.message}") rescue Exception => e
end logger.error("mul test failed ===> #{e.message}")
end end
end
# -----End
# -----End
private
def find_myshixun private
@myshixun = Myshixun.find_by!(identifier: params[:identifier]) def find_myshixun
end @myshixun = Myshixun.find_by!(identifier: params[:identifier])
end
def find_repo_name
@repo_path = @myshixun.try(:repo_path) def find_repo_name
@path = params[:path] @repo_path = @myshixun.try(:repo_path)
end @path = params[:path]
end
def python_file?(path)
false if path.blank? def python_file?(path)
path.to_s.split(".").last.downcase == "py" false if path.blank?
end path.to_s.split(".").last.downcase == "py"
end end
end

@ -17,16 +17,16 @@ class ShixunsController < ApplicationController
:get_mirror_script, :download_file, :shixun_list, :batch_send_to_course] :get_mirror_script, :download_file, :shixun_list, :batch_send_to_course]
before_action :find_repo_name, only: [:repository, :commits, :file_content, :update_file, :shixun_exec, :copy, :add_file] before_action :find_repo_name, only: [:repository, :commits, :file_content, :update_file, :shixun_exec, :copy, :add_file]
before_action :allowed, only: [:update, :close, :update_propaedeutics, :settings, :publish, before_action :allowed, only: [:update, :close, :update_propaedeutics, :settings, :publish, :apply_public,
:shixun_members_added, :change_manager, :collaborators_delete, :shixun_members_added, :change_manager, :collaborators_delete,
:cancel_publish, :add_collaborators, :add_file] :cancel_apply_public, :cancel_publish, :add_collaborators, :add_file]
before_action :portion_allowed, only: [:copy] before_action :portion_allowed, only: [:copy]
before_action :special_allowed, only: [:send_to_course, :search_user_courses] before_action :special_allowed, only: [:send_to_course, :search_user_courses]
## 获取课程列表 ## 获取课程列表
def index def index
@shixuns = current_laboratory.shixuns.unhidden @shixuns = current_laboratory.shixuns.unhidden.publiced
## 方向 ## 方向
if params[:tag_level].present? && params[:tag_id].present? if params[:tag_level].present? && params[:tag_id].present?
@ -818,44 +818,48 @@ class ShixunsController < ApplicationController
@status = 0 @status = 0
@position = [] @position = []
begin begin
if @shixun.challenges.count == 0 unless @shixun.is_jupyter?
@status = 4 if @shixun.challenges.count == 0
else @status = 4
@shixun.challenges.each do |challenge| else
if challenge.challenge_tags.count == 0 @shixun.challenges.each do |challenge|
@status = 3 if challenge.challenge_tags.count == 0
@position << challenge.position @status = 3
@position << challenge.position
end
end end
end unfinish_challenge = @shixun.challenges.where(:st => 0, :path => nil)
unfinish_challenge = @shixun.challenges.where(:st => 0, :path => nil) if unfinish_challenge.count > 0 && !@shixun.is_choice_type?
if unfinish_challenge.count > 0 && !@shixun.is_choice_type? @status = 2
@status = 2 @pos = []
@pos = [] unfinish_challenge.each do |challenge|
unfinish_challenge.each do |challenge| @pos << challenge.position
@pos << challenge.position end
end end
end end
end end
if @status == 0 if @status == 0
@shixun.update_attributes!(:status => 1) @shixun.update_attributes!(:status => 2)
apply = ApplyAction.where(:container_type => "ApplyShixun", :container_id => @shixun.id).order("created_at desc").first
if apply && apply.status == 0
@status = 0
else
ApplyAction.create(:container_type => "ApplyShixun", :container_id => @shixun.id, :user_id => current_user.id, :status => 0)
#begin
# status = Trustie::Sms.send(mobile: '18711011226', send_type:'publish_shixun' , name: '管理员')
#rescue => e
# Rails.logger.error "发送验证码出错: #{e}"
#end
@status = 1
end
end end
rescue Exception => e rescue Exception => e
logger.error("pushlish game #{e}") logger.error("pushlish game #{e}")
end end
end end
def apply_public
tip_exception(-1, "请先发布实训再申请公开") if @shixun.status != 2
ActiveRecord::Base.transaction do
@shixun.update_attributes!(public: 1)
apply = ApplyAction.where(:container_type => "ApplyShixun", :container_id => @shixun.id).order("created_at desc").first
if apply && apply.status == 0
@status = 0
else
ApplyAction.create(:container_type => "ApplyShixun", :container_id => @shixun.id, :user_id => current_user.id, :status => 0)
end
end
normal_status(0, "申请成功")
end
# 设置私密版本库的在tpm中的目录 # 设置私密版本库的在tpm中的目录
def set_secret_dir def set_secret_dir
raise("设置路径不能为空") if params[:secret_dir_path].blank? raise("设置路径不能为空") if params[:secret_dir_path].blank?
@ -993,14 +997,24 @@ class ShixunsController < ApplicationController
:disposition => 'attachment' #inline can open in browser :disposition => 'attachment' #inline can open in browser
end end
# 撤销申请公开
def cancel_apply_public
tip_exception("实训已经公开,无法撤销") if @shixun.public == 2
ActiveRecord::Base.transaction do
apply = ApplyAction.where(:container_type => "ApplyShixun", :container_id => @shixun.id).order("created_at desc").first
if apply && apply.status == 0
apply.update_attributes!(status: 3)
apply.tidings&.destroy_all
end
@shixun.update_column(:public, 0)
end
normal_status(0, "成功撤销申请")
end
# 撤销发布 # 撤销发布
def cancel_publish def cancel_publish
tip_exception("实训已经发布,无法撤销") if @shixun.status == 2 tip_exception("请先撤销申请公开,再撤销发布") if @shixun.public == 1
apply = ApplyAction.where(:container_type => "ApplyShixun", :container_id => @shixun.id).order("created_at desc").first tip_exception("实训已经公开,无法撤销") if @shixun.public == 2
if apply && apply.status == 0
apply.update_attribute(:status, 3)
apply.tidings.destroy_all
end
@shixun.update_column(:status, 0) @shixun.update_column(:status, 0)
end end

@ -27,6 +27,17 @@ module ShixunsHelper
end end
end end
def shixun_public_status shixun
case shixun.try(:public)
when 0,nil
"未公开"
when 1
"待审核"
when 2
"已公开"
end
end
# 已完成实训所获得的经验值 # 已完成实训所获得的经验值
def myshixun_exp myshixun def myshixun_exp myshixun
score = 0 score = 0

@ -119,6 +119,12 @@ class Game < ApplicationRecord
# self.outputs.pluck(:query_index).first # self.outputs.pluck(:query_index).first
#end #end
# 是否查看了答案(通关的是否在通关前看的答案)
def view_answer
answer_exists = Grade.exists?("container_type = 'Answer' and container_id = #{id} and created_at < '#{end_time}'")
answer_open != 0 ? (status == 2 ? answer_exists : true) : false
end
# 用户关卡得分 # 用户关卡得分
def get_user_final_score def get_user_final_score

@ -83,9 +83,10 @@ class Myshixun < ApplicationRecord
self.games.select{|game| game.status == 2}.size self.games.select{|game| game.status == 2}.size
end end
# 查看答案的关卡数 # 查看答案的关卡数,只统计通关前看的关卡
def view_answer_count def view_answer_count
self.games.select{|game| game.status == 2 && game.answer_open != 0}.size answer_ids = user.grades.joins("join games on grades.container_id = games.id").where("container_type = 'Answer' and games.status=2 and games.end_time > grades.created_at").pluck(:container_id)
self.games.select{|game| game.status == 2 && game.answer_open != 0 && answer_ids.include?(game.id)}.size
end end
# 通关时间 # 通关时间

@ -3,6 +3,7 @@ class Shixun < ApplicationRecord
attr_accessor :page_no #管理员页面 实训配置更新状态时需要接受page_no参数 attr_accessor :page_no #管理员页面 实训配置更新状态时需要接受page_no参数
# status: 0编辑 1申请发布 2正式发布 3关闭 -1软删除 # status: 0编辑 1申请发布 2正式发布 3关闭 -1软删除
# public: 0未公开 1申请公开 2公开
# hide_code 隐藏代码窗口 # hide_code 隐藏代码窗口
# code_hidden: 隐藏代码目录 # code_hidden: 隐藏代码目录
# task_pass: 跳关 # task_pass: 跳关
@ -76,6 +77,7 @@ class Shixun < ApplicationRecord
scope :published_closed, lambda{ where(status: [2, 3]) } scope :published_closed, lambda{ where(status: [2, 3]) }
scope :none_closed, lambda{ where(status: [0, 1, 2]) } scope :none_closed, lambda{ where(status: [0, 1, 2]) }
scope :unhidden, lambda{ where(hidden: 0, status: 2) } scope :unhidden, lambda{ where(hidden: 0, status: 2) }
scope :publiced, lambda{ where(public: 2) }
scope :field_for_recommend, lambda{ select([:id, :name, :identifier, :myshixuns_count]) } scope :field_for_recommend, lambda{ select([:id, :name, :identifier, :myshixuns_count]) }
scope :find_by_ids,lambda{|k| where(id:k)} scope :find_by_ids,lambda{|k| where(id:k)}

@ -21,7 +21,17 @@ class Admins::ShixunQuery < ApplicationQuery
[0,1,2,3] [0,1,2,3]
end end
public =
case params[:public]
when "editing" then [0]
when "pending" then [1]
when "processed" then [2]
else
[0,1,2]
end
all_shixuns = all_shixuns.where(status: status) if status.present? all_shixuns = all_shixuns.where(status: status) if status.present?
all_shixuns = all_shixuns.where(public: public) if public.present?
if params[:tag].present? if params[:tag].present?
all_shixuns = all_shixuns.joins(:mirror_repositories).where("mirror_repositories.id = ?",params[:tag].to_i) all_shixuns = all_shixuns.joins(:mirror_repositories).where("mirror_repositories.id = ?",params[:tag].to_i)

@ -10,7 +10,7 @@ class Admins::ShixunAuths::AgreeApplyService < ApplicationService
def call def call
ActiveRecord::Base.transaction do ActiveRecord::Base.transaction do
apply.update!(status: 1, dealer_id: user.id) apply.update!(status: 1, dealer_id: user.id)
shixun.update!(status: 2, publish_time: Time.now) shixun.update!(public: 2, publish_time: Time.now)
# 奖励金币、经验 # 奖励金币、经验
reward_grade_and_experience! reward_grade_and_experience!

@ -10,7 +10,7 @@ class Admins::ShixunAuths::RefuseApplyService < ApplicationService
def call def call
ActiveRecord::Base.transaction do ActiveRecord::Base.transaction do
shixun.update!(status: 0) shixun.update!(public: 0)
apply.update!(status: 2, reason: reason, dealer_id: user.id) apply.update!(status: 2, reason: reason, dealer_id: user.id)
deal_tiding! deal_tiding!

@ -30,7 +30,6 @@ class SearchService < ApplicationService
model_options = { model_options = {
includes: modal_name.searchable_includes includes: modal_name.searchable_includes
} }
model_options.deep_merge!(where: { status: 2 }) if modal_name == Shixun
model_options.deep_merge!(extra_options) model_options.deep_merge!(extra_options)
model_options.deep_merge!(default_options) model_options.deep_merge!(default_options)
@ -40,7 +39,7 @@ class SearchService < ApplicationService
def extra_options def extra_options
case params[:type].to_s.strip case params[:type].to_s.strip
when 'shixun' then when 'shixun' then
{ where: { id: Laboratory.current.shixuns.pluck(:id) } } { where: { id: Laboratory.current.shixuns.where(public: 2, status: 2, fork_from: nil).or(Laboratory.current.shixuns.where(status: 2, id: User.current.shixuns)).pluck(:id) } }
when 'subject' then when 'subject' then
{ where: { id: Laboratory.current.subjects.pluck(:id) } } { where: { id: Laboratory.current.subjects.pluck(:id) } }
when 'course' then when 'course' then

@ -25,7 +25,7 @@ class ShixunSearchService < ApplicationService
else else
none_shixun_ids = ShixunSchool.where("school_id != #{User.current.school_id}").pluck(:shixun_id) none_shixun_ids = ShixunSchool.where("school_id != #{User.current.school_id}").pluck(:shixun_id)
@shixuns = @shixuns.where.not(id: none_shixun_ids).where(hidden: 0) @shixuns = @shixuns.where.not(id: none_shixun_ids).where(hidden: 0, status: 2, public: 2).or(@shixuns.where(id: current_user.shixuns))
end end
end end

@ -4,25 +4,31 @@
<div class="box search-form-container shixuns-list-form"> <div class="box search-form-container shixuns-list-form">
<%= form_tag(admins_shixuns_path, method: :get, class: 'form-inline search-form',id:"shixuns-search-form",remote:true) do %> <%= form_tag(admins_shixuns_path, method: :get, class: 'form-inline search-form',id:"shixuns-search-form",remote:true) do %>
<div class="form-group mr-2"> <div class="form-group">
<label for="status">状态:</label> <label for="status">状态:</label>
<% status_options = [['全部', ''], ["编辑中(#{@editing_shixuns})", "editing"], ["待审核(#{@pending_shixuns})", 'pending'], ["已发布(#{@processed_shixuns})", 'processed'],["已关闭(#{@closed_shixuns})",'closed']] %> <% status_options = [['全部', ''], ["编辑中(#{@editing_shixuns})", "editing"], ["待审核(#{@pending_shixuns})", 'pending'], ["已发布(#{@processed_shixuns})", 'processed'],["已关闭(#{@closed_shixuns})",'closed']] %>
<%= select_tag(:status, options_for_select(status_options), class: 'form-control') %> <%= select_tag(:status, options_for_select(status_options), class: 'form-control') %>
</div> </div>
<div class="form-group">
<label for="status">公开:</label>
<% public_options = [['全部', ''], ["未公开(#{@none_public_shixuns})", "editing"], ["待审核(#{@pending_public_shixuns})", 'pending'], ["已公开(#{@processed_pubic_shixuns})", 'processed']] %>
<%= select_tag(:public, options_for_select(public_options), class: 'form-control') %>
</div>
<div class="form-group mr-2"> <div class="form-group mr-2">
<label for="tag-choosed">技术平台:</label> <label for="tag-choosed">技术平台:</label>
<%= select_tag(:tag, options_for_select(@shixuns_type_check.unshift(["",nil])), class: 'form-control',id:"tag-choosed") %> <%= select_tag(:tag, options_for_select(@shixuns_type_check.unshift(["",nil])), class: 'form-control',id:"tag-choosed") %>
</div> </div>
<div class="form-group ml-3"> <div class="form-group">
<label>搜索类型:</label> <label>搜索类型:</label>
<% auto_trial_options = [['创建者姓名', 0], ['实训名称', 1], ['学校名称', 2]] %> <% auto_trial_options = [['创建者姓名', 0], ['实训名称', 1], ['学校名称', 2]] %>
<%= select_tag(:search_type, options_for_select(auto_trial_options), class: 'form-control') %> <%= select_tag(:search_type, options_for_select(auto_trial_options), class: 'form-control') %>
</div> </div>
<%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: '输入关键字搜索') %> <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2', placeholder: '输入关键字搜索') %>
<%= submit_tag('搜索', class: 'btn btn-primary ml-3','data-disable-with': '搜索中...') %> <%= submit_tag('搜索', class: 'btn btn-primary','data-disable-with': '搜索中...') %>
<%= link_to "清除",admins_shixuns_path,class: "btn btn-default",id:"shixuns-clear-search",'data-disable-with': '清除中...' %> <%= link_to "清除", admins_shixuns_path,class: "btn btn-default",id:"shixuns-clear-search",'data-disable-with': '清除中...' %>
<% end %> <% end %>
<a href="javascript:void(0)" class="btn btn-primary" id="shixuns-export" data-disable-with = '导出中...'>导出</a> <a href="javascript:void(0)" class="btn btn-primary" id="shixuns-export" data-disable-with = '导出中...'>导出</a>
</div> </div>

@ -2,14 +2,15 @@
<thead class="thead-light"> <thead class="thead-light">
<th width="4%">序号</th> <th width="4%">序号</th>
<th width="8%">ID</th> <th width="8%">ID</th>
<th width="28%" class="text-left">实训名称</th> <th width="24%" class="text-left">实训名称</th>
<th width="8%">技术平台</th> <th width="8%">技术平台</th>
<th width="5%">Fork源</th> <th width="5%">Fork源</th>
<th width="5%">实践</th> <th width="5%">实践</th>
<th width="5%">选择</th> <th width="5%">选择</th>
<th width="6%">状态</th> <th width="6%">状态</th>
<th width="6%">公开</th>
<th width="7%">创建者</th> <th width="7%">创建者</th>
<th width="13%"><%= sort_tag('创建于', name: 'created_at', path: admins_shixuns_path) %></th> <th width="11%"><%= sort_tag('创建于', name: 'created_at', path: admins_shixuns_path) %></th>
<th width="5%">单测</th> <th width="5%">单测</th>
<th width="6%">操作</th> <th width="6%">操作</th>
</thead> </thead>
@ -33,6 +34,7 @@
<td><%= shixun.challenges.where(:st => 0).size %></td> <td><%= shixun.challenges.where(:st => 0).size %></td>
<td><%= shixun.challenges.where(:st => 1).size %></td> <td><%= shixun.challenges.where(:st => 1).size %></td>
<td class="shixuns-status-<%= shixun.status %>"><%= shixun_authentication_status shixun %></td> <td class="shixuns-status-<%= shixun.status %>"><%= shixun_authentication_status shixun %></td>
<td class="shixuns-status-<%= shixun.public %>"><%= shixun_public_status shixun %></td>
<td><%= link_to shixun.user.try(:real_name),"/users/#{shixun.user.try(:login)}",target:'_blank' %></td> <td><%= link_to shixun.user.try(:real_name),"/users/#{shixun.user.try(:login)}",target:'_blank' %></td>
<td><%= format_time shixun.created_at %></td> <td><%= format_time shixun.created_at %></td>
<td class="homepage_teacher"> <td class="homepage_teacher">

@ -1,5 +1,5 @@
json.hack do json.hack do
json.(@hack, :name, :difficult, :time_limit, :description, :score, :identifier) json.(@hack, :name, :difficult, :time_limit, :description, :score, :identifier, :status)
json.language @hack.language json.language @hack.language
json.username @hack.user.real_name json.username @hack.user.real_name
json.code @my_hack.code json.code @my_hack.code

@ -8,6 +8,6 @@ end
json.hacks_count @hacks_count json.hacks_count @hacks_count
json.hacks_list do json.hacks_list do
json.array! @hacks do |hack| json.array! @hacks do |hack|
json.(hack,:identifier, :name , :hack_user_lastest_codes_count, :difficult, :passed_rate, :category) json.(hack,:identifier, :name , :hack_user_lastest_codes_count, :difficult, :passed_rate, :category, :open_or_not, :status)
end end
end end

@ -16,3 +16,5 @@ json.diffcult diff_to_s(shixun.trainee)
json.score_info shixun.shixun_preference_info # todo: 这块可以改成只显示实训的平均分,不用每次都去取每种星的分数了。 json.score_info shixun.shixun_preference_info # todo: 这块可以改成只显示实训的平均分,不用每次都去取每种星的分数了。
# 用于是否显示导航栏中的'背景知识' # 用于是否显示导航栏中的'背景知识'
json.propaedeutics shixun.propaedeutics.present? json.propaedeutics shixun.propaedeutics.present?
json.public shixun.public

@ -42,7 +42,7 @@ if @shixun
json.challenge_comment challenge_comment&.comment json.challenge_comment challenge_comment&.comment
json.challenge_comment_hidden @user_course_identity < Course::STUDENT ? challenge_comment&.hidden_comment : nil json.challenge_comment_hidden @user_course_identity < Course::STUDENT ? challenge_comment&.hidden_comment : nil
json.comment_id challenge_comment&.id json.comment_id challenge_comment&.id
json.view_answer game ? game.answer_open != 0 : 0 json.view_answer game ? game.view_answer : false
end end
end end

@ -41,6 +41,7 @@ Rails.application.routes.draw do
end end
member do member do
post :publish post :publish
post :cancel_publish
get :start get :start
post :update_set post :update_set
delete :delete_set delete :delete_set
@ -257,7 +258,9 @@ Rails.application.routes.draw do
post :send_to_course post :send_to_course
delete :collaborators_delete delete :collaborators_delete
get :cancel_publish get :cancel_publish
get :cancel_apply_public
get :publish get :publish
get :apply_public
get :shixun_exec get :shixun_exec
post :review_shixun post :review_shixun
get :review_newest_record get :review_newest_record
@ -420,6 +423,7 @@ Rails.application.routes.draw do
get 'statistics' get 'statistics'
post :inform_up post :inform_up
post :inform_down post :inform_down
get :calculate_all_shixun_scores
end end
collection do collection do

@ -0,0 +1,5 @@
class AddPublicStatusToShixun < ActiveRecord::Migration[5.2]
def change
add_column :shixuns, :public, :integer, default: 0
end
end

@ -0,0 +1,9 @@
class MigrateShixunStatus < ActiveRecord::Migration[5.2]
def change
# 平台上所有已发布且未隐藏的实训都设为公开
Shixun.unhidden.update_all(public: 2)
# 所有已申请发布的实训状态都改为已发布,申请发布改为申请公开
Shixun.where(status: 1, id: ApplyAction.where(container_type: 'ApplyShixun', status: 0).pluck(:container_id)).update_all(status: 2, public: 1)
end
end

@ -19,7 +19,8 @@ class NewShixunModel extends Component{
order:'desc', order:'desc',
diff:0, diff:0,
limit:15, limit:15,
sort:"myshixuns_count" sort:"myshixuns_count",
belongtoindex:0,
} }
} }
componentDidMount() { componentDidMount() {
@ -161,7 +162,17 @@ class NewShixunModel extends Component{
}) })
let{status,order,diff,limit,sort}=this.state; let{status,order,diff,limit,sort}=this.state;
if(this.props.type==='shixuns'){ if(this.props.type==='shixuns'){
this.getdatalist(1,value,status,undefined,order,diff,limit) this.getdatalist(1,value,status,undefined,order,diff,limit);
if(value==="all"){
this.setState({
belongtoindex:0
})
}else{
this.setState({
belongtoindex:1
})
}
}else{ }else{
this.getdatalist(1,value,undefined,undefined,order,undefined,limit,undefined,sort) this.getdatalist(1,value,undefined,undefined,order,undefined,limit,undefined,sort)
} }
@ -322,6 +333,7 @@ class NewShixunModel extends Component{
this.getdatalist(page,type,status,keyword,order,diff,limit) this.getdatalist(page,type,status,keyword,order,diff,limit)
} }
updatepathlist=(sorts,orders)=>{ updatepathlist=(sorts,orders)=>{
let{page,type,keyword,order,diff,limit,status,sort}=this.state; let{page,type,keyword,order,diff,limit,status,sort}=this.state;
let seartorders; let seartorders;
@ -352,7 +364,7 @@ class NewShixunModel extends Component{
} }
render() { render() {
let {diff,Grouplist,status,shixun_list,shixuns_count,page,type,order,sort}=this.state; let {diff,Grouplist,status,shixun_list,shixuns_count,page,type,order,sort,belongtoindex}=this.state;
// let {visible,patheditarry}=this.props; // let {visible,patheditarry}=this.props;
// console.log(Grouplist) // console.log(Grouplist)
// console.log(allGrouplist) // console.log(allGrouplist)
@ -446,7 +458,7 @@ class NewShixunModel extends Component{
<Spin spinning={this.state.isspinning}> <Spin spinning={this.state.isspinning}>
<div className={"clearfix educontent pr mb60shixun"}> <div className={"clearfix educontent pr mb60shixun"}>
<div className={"square-list clearfix"}> <div className={"square-list clearfix verticallayout"}>
<div className="newshixunheadersear"> <div className="newshixunheadersear">
<div style={{height:"53px"}}></div> <div style={{height:"53px"}}></div>
@ -472,7 +484,36 @@ class NewShixunModel extends Component{
onSearch={ (value)=>this.setdatafuns(value)} /> onSearch={ (value)=>this.setdatafuns(value)} />
</div> </div>
<div className="clearfix font-12 mt30">
{this.props.type==='shixuns'?
<div className="clearfix sortinxdirection mt30 intermediatecenterysls">
<p className="nandu">筛选</p>
<p className={belongtoindex===0?"clickbutstwo ml13":"clickbutstwos ml13"} onClick={()=>this.belongto("all")}>全部实训</p>
<p className={belongtoindex===1?"clickbutstwo ml20":"clickbutstwos ml20"} onClick={()=>this.belongto("mine")}>普通实训</p>
</div>:""
}
{/*{this.props.type==='shixuns'? <Dropdown overlay={menus}>*/}
{/* <a className="ant-dropdown-link color-grey-6">*/}
{/* {diff===0?"难度":diff===1?"初级":diff===2?"中级":diff===3?"高级":diff===4?"顶级":""}<Icon type="down" className={"color-grey-6"}/>*/}
{/* </a>*/}
{/*</Dropdown>:""}*/}
{this.props.type==='shixuns'?
<div className="clearfix sortinxdirection mt20 intermediatecenterysls">
<p className="nandu">难度</p>
<p className={diff===0?"clickbuts ml13":"clickbutst ml13"} onClick={()=>this.DropdownClick(0)}>全部</p>
<p className={diff===1?"clickbuts ml30":"clickbutst ml30"} onClick={()=>this.DropdownClick(1)}>初级</p>
<p className={diff===2?"clickbuts ml30":"clickbutst ml30"} onClick={()=>this.DropdownClick(2)}>中级</p>
<p className={diff===3?"clickbuts ml30":"clickbutst ml30"} onClick={()=>this.DropdownClick(3)}>高级</p>
<p className={diff===4?"clickbuts ml30":"clickbutst ml30"} onClick={()=>this.DropdownClick(4)}>顶级</p>
</div>:""
}
<div className={this.props.type==='shixuns'?"clearfix font-12 mt20":"clearfix font-12 mt30"}>
<div className="font-12 ml5 fl"> <div className="font-12 ml5 fl">
@ -509,17 +550,18 @@ class NewShixunModel extends Component{
</a> </a>
</Dropdown>:"":""} </Dropdown>:"":""}
{this.props.type==='shixuns'? <Dropdown overlay={menus}>
<a className="ant-dropdown-link color-grey-6">
{diff===0?"难度":diff===1?"初级":diff===2?"中级":diff===3?"高级":diff===4?"顶级":""}<Icon type="down" className={"color-grey-6"}/>
</a>
</Dropdown>:""}
</div> </div>
<div className="font-12 alltopiscright ml25 fr"> <div className="font-12 alltopiscright ml25 fl">
{/*<span className={"fr pointer color-grey-3"} onClick={()=>this.props.hideNewShixunModelType()}>返回</span>*/}
<span className={type==="mine"?"fr topcsactive pointer color-grey-3 color-blue":"fr pointer color-grey-3"} onClick={()=>this.belongto("mine")}>我的{this.props.type==='shixuns'?'实训':"课程"}</span> {this.props.type==='shixuns'?"":
<span className={type==="all"?"fr mr30 topcsactive pointer color-grey-3 color-blue":"fr mr30 pointer color-grey-3"} onClick={()=>this.belongto("all")}>全部{this.props.type==='shixuns'?'实训':"课程"}</span> <span className={type==="mine"?"fr topcsactive pointer color-grey-3 color-blue":"fr pointer color-grey-3"} onClick={()=>this.belongto("mine")}>我的课程</span>
}
{this.props.type==='shixuns'?"":
<span className={type==="all"?"fr mr30 topcsactive pointer color-grey-3 color-blue":"fr mr30 pointer color-grey-3"} onClick={()=>this.belongto("all")}>全部课程</span>
}
</div> </div>
</div> </div>
@ -684,4 +726,4 @@ export default NewShixunModel;
// <span dangerouslySetInnerHTML={{__html: item}}>{}</span> // <span dangerouslySetInnerHTML={{__html: item}}>{}</span>
// ) // )
// })} // })}
// </div>} // </div>}

@ -384,4 +384,110 @@
.newshixunmodels{ .newshixunmodels{
margin: 0 auto; margin: 0 auto;
} }
/* 中间居中 */
.intermediatecenter{
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
/* 简单居中 */
.intermediatecenterysls{
display: flex;
align-items: center;
}
.spacearound{
display: flex;
justify-content: space-around;
}
.spacebetween{
display: flex;
justify-content: space-between;
}
/* 头顶部居中 */
.topcenter{
display: -webkit-flex;
flex-direction: column;
align-items: center;
}
/* x轴正方向排序 */
/* 一 二 三 四 五 六 七 八 */
.sortinxdirection{
display: flex;
flex-direction:row;
}
/* x轴反方向排序 */
/* 八 七 六 五 四 三 二 一 */
.xaxisreverseorder{
display: flex;
flex-direction:row-reverse;
}
/* 垂直布局 正方向*/
/*
*/
.verticallayout{
display: flex;
flex-direction:column;
}
/* 垂直布局 反方向*/
.reversedirection{
display: flex;
flex-direction:column-reverse;
}
.nandu{
width: 42px;
height: 19px;
font-size: 14px;
color: #000000;
line-height: 19px;
margin-left: 6px;
}
.clickbuts{
text-align: center;
width: 60px;
height: 32px;
background: #4CACFF;
border-radius: 16px;
line-height: 30px;
color: #FFFFFF;
cursor:pointer;
}
.clickbutst{
height:19px;
font-size:14px;
color:#505050;
line-height:19px;
cursor:pointer;
}
.clickbutstwo{
text-align: center;
width: 85px;
height: 32px;
background: #4CACFF;
border-radius: 16px;
line-height: 30px;
color: #FFFFFF;
cursor:pointer;
}
.clickbutstwos{
height:19px;
font-size:14px;
color:#505050;
line-height:19px;
cursor:pointer;
}

Loading…
Cancel
Save