Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/controllers/challenges_controller.rb

@@ -191,21 +191,28 @@ class ChallengesController < ApplicationController
         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
+        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|
+          params[:test_set].each_with_index do |set, index|
-                TestSet.create(:challenge_id => @challenge.id,
+            # last： 末尾匹配， full: 全完匹配
-                               :input => "#{set[:input]}",
+            logger.info("set: #{set}; match_rule : #{set[:match_rule]}")
-                               :output => "#{set[:output]}",
+            match_rule = set[:match_rule] == 'last' ? 'last' : 'full'
-                               :is_public => params_hidden[index],
+            TestSet.create(:challenge_id => @challenge.id,
-                               :score => set[:score],
+                           :input => "#{set[:input]}",
-                               :position => (index + 1))
+                           :output => "#{set[:output]}",
-            end
+                           :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)

app/controllers/games_controller.rb

@@ -537,7 +537,7 @@ class GamesController < ApplicationController
     game_challenge.test_sets.each do |test_set|
       input = test_set.input.nil? ? "" : test_set.input.gsub("\r\n", "\n")
       output = test_set.output.nil? ? "" : test_set.output.gsub("\r\n", "\n")
-      test_cases = {:input => input, :output => output}
+      test_cases = {:input => input, :output => output, :matchRule => test_set.match_rule}
       testSet << test_cases
     end
 
@@ -560,6 +560,13 @@ class GamesController < ApplicationController
     # needPortMapping： web类型需要pod端口映射
     br_params[:needPortMapping] = 8080 if @myshixun.mirror_name.include?("Web")
 
+    # 私密仓库的设置
+    secret_rep = @shixun.shixun_secret_repository
+    if secret_rep&.repo_name
+      secretGitUrl = repo_url secret_rep.repo_path
+      br_params.merge({secretGitUrl:  secretGitUrl, secretDir: secret_rep.secret_dir_path})
+    end
+
     # 中间层交互
     uri = "#{shixun_tomcat}/bridge/game/gameEvaluate"
     res = interface_post uri, br_params, 502, "gameEvaluate failed"

app/controllers/shixuns_controller.rb

@@ -473,8 +473,19 @@ class ShixunsController < ApplicationController
 						@shixun.shixun_service_configs.create!(config) if name.present?
 					end
 				end
+				# 添加第二仓库
+				if params[:is_secret_repository]
+					add_secret_repository
+				else
+					# 如果有仓库，就要删
+					if @shixun.shixun_secret_repository&.repo_name
+						GitService.delete_repository(repo_path: @shixun.shixun_secret_repository.repo_path)
+						@shixun.shixun_secret_repository.destroy
+					end
+				end
+
 			rescue Exception => e
-				uid_logger_error(e.message)
+				uid_logger_error("实训保存失败--------#{e.message}")
 				tip_exception("实训保存失败")
 				raise ActiveRecord::Rollback
 			end
@@ -819,6 +830,30 @@ class ShixunsController < ApplicationController
 		end
 	end
 
+	# 设置私密版本库的在tpm中的目录
+	def set_secret_dir
+		raise("设置路径不能为空") if params[:secret_dir_path].blank?
+		raise("请先配置私密版本库") if @shixun.shixun_secret_repository.blank?
+		@shixun.shixun_secret_repository.update_attributes(:secret_dir_path => params[:secret_dir_path])
+		normal_status("设置成功")
+	end
+
+	def secret_repository
+		begin
+			@repo_path = @shixun.shixun_secret_repository&.repo_path
+			@repo_url = repo_url @repo_path
+			@trees = GitService.file_tree(repo_path: @repo_path, path: params[:path])
+			logger.info("#11@@#@#@#@111#@@@@###{@trees}")
+			if @trees
+				logger.info("#@@#@#@#@#@@@@###{@trees.try(:count)}")
+				@latest_commit = [GitService.commits(repo_path: @repo_path).first]
+				Rails.logger.info("########## #{@latest_commit}")
+			end
+		rescue Exception => e
+			logger.error(e.message)
+		end
+	end
+
 	include GitCommon
 
 	def update_file
@@ -955,7 +990,13 @@ private
 	end
 
 	def find_repo_name
-		@repo_path = @shixun.try(:repo_path)
+		# 有私密版本库的参数时，需要拿私密仓库
+		@repo_path = if params[:secret_repository]
+									@shixun.shixun_secret_repository&.repo_path
+								else
+									@shixun.try(:repo_path)
+								 end
+		logger.info("######{@repo_path}")
 		@path = params[:path]
 	end
 
@@ -990,4 +1031,13 @@ private
 		modify_shixun = ShixunModify.exists?(:myshixun_id => current_myshixun.id, :shixun_id => @shixun.id, :status => 1)
 		games.size != min_challenges.size || modify_shixun
 	end
+
+	# 添加私密仓库
+	def add_secret_repository
+		# 防止跟tpm版本库重名，加了前缀secret
+		repo_path = repo_namespace(current_user.login, "secret_#{@shixun.identifier}")
+		GitService.add_repository(repo_path: repo_path)
+		ShixunSecretRepository.create!(repo_name: repo_path.split(".")[0], shixun_id: @shixun.id)
+	end
+
 end

app/controllers/student_works_controller.rb

@@ -478,16 +478,15 @@ class StudentWorksController < ApplicationController
     ActiveRecord::Base.transaction do
       challenge = @homework.shixuns.first&.challenges.find_by(id: params[:challenge_id]) unless params[:challenge_id].blank?
       if challenge.present?
-        comment = @work.shixun_work_comments.find_by(challenge_id: challenge.id) ||
+        @comment = @work.shixun_work_comments.find_by(challenge_id: challenge.id) ||
           ShixunWorkComment.new(student_work_id: @work.id, user_id: current_user.id, challenge_id: challenge.id)
       else
-        comment = @work.shixun_work_comments.find_by(challenge_id: 0) ||
+        @comment = @work.shixun_work_comments.find_by(challenge_id: 0) ||
           ShixunWorkComment.new(student_work_id: @work.id, user_id: current_user.id, challenge_id: 0)
       end
-      comment.comment = params[:comment]
+      @comment.comment = params[:comment]
-      comment.hidden_comment = params[:hidden_comment]
+      @comment.hidden_comment = params[:hidden_comment]
-      comment.save!
+      @comment.save!
-      normal_status("评阅成功")
     end
   end
 

app/models/shixun.rb

@@ -38,6 +38,9 @@ class Shixun < ApplicationRecord
 
   has_one :shixun_info, dependent: :destroy
 
+  # 第二版本库
+  has_one :shixun_secret_repository, dependent: :destroy
+
   belongs_to :user
   # 实训服务配置
   has_many :shixun_service_configs, :dependent => :destroy

app/models/shixun_secret_repository.rb

@@ -0,0 +1,11 @@
+class ShixunSecretRepository < ApplicationRecord
+  # repo_name: 仓库名
+  # secret_dir_name: 在tpm仓库的那个目录下
+
+  belongs_to :shixun
+
+  def repo_path
+    "#{repo_name}.git"
+  end
+
+end

app/models/test_set.rb

@@ -1,2 +1,3 @@
 class TestSet < ApplicationRecord
+  # match_rule: 匹配规则： full： 完全匹配， last： 末尾匹配
 end

app/views/challenges/edit.json.jbuilder

@@ -16,7 +16,7 @@ elsif @tab == 1
   json.has_web_route @shixun.has_web_route?
   json.test_sets @challenge.test_sets do |set|
     json.hidden (set.is_public ? 0 : 1)
-    json.(set, :input, :output, :score)
+    json.(set, :input, :output, :score, :match_rule)
   end
 elsif @tab == 2
   # 参考答案

app/views/shixuns/secret_repository.json.jbuilder

@@ -0,0 +1,8 @@
+json.trees @trees
+
+if @trees.present?
+  json.partial! 'shixuns/commit', locals: { commits: @latest_commit }
+end
+
+json.git_url @repo_url
+json.secret_dir_path @shixun.shixun_secret_repository&.secret_dir_path

app/views/shixuns/settings.json.jbuilder

@@ -30,6 +30,8 @@ json.shixun do
   json.scope_partment @shixun.schools.map(&:name) # 公开范围
   json.opening_time @shixun.opening_time
   json.forbid_copy @shixun.forbid_copy
+  # 私密仓库
+  json.is_secret_repository @shixun.shixun_secret_repository.present?
 
   # 实训服务配置
   json.shixun_service_configs do

app/views/shixuns/show.json.jbuilder

@@ -2,3 +2,4 @@ json.fork_from @fork_from
 json.identity User.current.shixun_identity(@shixun)
 json.power @power
 json.partial! 'shixuns/top', locals: { shixun: @shixun, current_myshixun: @current_myshixun }
+json.secret_repository @shixun.shixun_secret_repository.present?

app/views/student_works/shixun_work_comment.json.jbuilder

@@ -0,0 +1,3 @@
+json.comment_id @comment.id
+json.status 0
+json.message "评阅成功"

config/routes.rb

@@ -197,6 +197,8 @@ Rails.application.routes.draw do
         get :get_script_contents
         get :get_custom_script
         post :repository
+        post :secret_repository
+        post :set_secret_dir
         post :commits
         post :file_content
         post :update_file

db/migrate/20190909061930_create_shixun_secret_repositories.rb

@@ -0,0 +1,10 @@
+class CreateShixunSecretRepositories < ActiveRecord::Migration[5.2]
+  def change
+    create_table :shixun_secret_repositories do |t|
+      t.references :shixun
+      t.string :repo_name
+      t.string :secret_dir_path
+      t.timestamps
+    end
+  end
+end

db/migrate/20190909072626_add_match_rule_for_test_sets.rb

@@ -0,0 +1,7 @@
+class AddMatchRuleForTestSets < ActiveRecord::Migration[5.2]
+  def change
+    add_column :test_sets, :match_rule, :string
+    TestSet.update_all(match_rule: 'full')
+
+  end
+end

public/react/src/modules/tpm/TPMsettings/TPMsettings.js

@@ -449,7 +449,7 @@ export default class TPMsettings extends Component {
 			multi_webssh:false
 		});
 	} else {
-		if (this.state.init_is_secret_repository && !this.state.vnc) {
+		if (this.state.init_is_secret_repository && !this.state.vnc && this.state.is_secret_repository == true) {
 			this.confirmDeleteSecretRepo({
 				onOk: () => {
 					this.setState({
@@ -615,7 +615,7 @@ export default class TPMsettings extends Component {
     // }
 	const vnc = e.target.checked;
 	if (!vnc) {
-		if (this.state.init_is_secret_repository && this.state.webssh != 2) {
+		if (this.state.init_is_secret_repository && this.state.webssh != 2 && this.state.is_secret_repository == true) {
 			this.confirmDeleteSecretRepo({
 				onOk: () => {
 					this.setState({

spec/models/shixun_secret_repository_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe ShixunSecretRepository, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end