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

app/controllers/games_controller.rb

@@ -541,6 +541,8 @@ class GamesController < ApplicationController
       testSet << test_cases
     end
 
+    logger.info("##############testSet: #{testSet}")
+
     testCases = Base64.urlsafe_encode64(testSet.to_json) unless testSet.blank?
     # 评测类型： 0，1，2 用于webssh的评测， 3用于vnc
     podType = @shixun.vnc_evaluate ? 3 : @shixun.webssh
@@ -562,9 +564,11 @@ class GamesController < ApplicationController
 
     # 私密仓库的设置
     secret_rep = @shixun.shixun_secret_repository
+    logger.info("############secret_rep: #{secret_rep}")
     if secret_rep&.repo_name
       secretGitUrl = repo_url secret_rep.repo_path
-      br_params.merge({secretGitUrl:  secretGitUrl, secretDir: secret_rep.secret_dir_path})
+      br_params.merge!({secretGitUrl:  Base64.urlsafe_encode64(secretGitUrl), secretDir: secret_rep.secret_dir_path})
+      logger.info("#######br_params:#{br_params}")
     end
 
     # 中间层交互

app/controllers/shixuns_controller.rb

@@ -220,6 +220,16 @@ class ShixunsController < ApplicationController
 														 evaluate_script: @shixun.evaluate_script)
 				end
 
+				# 同步私密版本库
+				if @shixun.shixun_secret_repository
+					repo_name = "#{current_user.login}/secret_#{@shixun.identifier}"
+					fork_repository_name = "#{current_user.login}/secret_#{@new_shixun.identifier}"
+					ShixunSecretRepository.create!(shixun_id: @new_shixun.id,
+																				 repo_name: "#{repo_name}",
+																				 secret_dir_path: @shixun.shixun_secret_repository.secret_dir_path)
+					GitService.fork_repository(repo_path: "#{repo_name}.git", fork_repository_path: (fork_repository_name + ".git"))
+				end
+
 				# 同步镜像
 				if @shixun.mirror_repositories.present?
 					@shixun.mirror_repositories.each do |mirror|
@@ -479,6 +489,7 @@ class ShixunsController < ApplicationController
 				else
 					# 如果有仓库，就要删
 					if @shixun.shixun_secret_repository&.repo_name
+						@shixun.shixun_secret_repository.lock!
 						GitService.delete_repository(repo_path: @shixun.shixun_secret_repository.repo_path)
 						@shixun.shixun_secret_repository.destroy
 					end

app/controllers/student_works_controller.rb

@@ -493,15 +493,16 @@ class StudentWorksController < ApplicationController
   # 删除实训作品评阅
   def destroy_work_comment
     ActiveRecord::Base.transaction do
-      tip_exception("visible_comment参数有误") if params[:visible_comment].nil?
+      # tip_exception("visible_comment参数有误") if params[:visible_comment].nil?
 
       comment = @work.shixun_work_comments.find_by!(id: params[:comment_id])
-      params[:visible_comment] ? comment.comment = nil : comment.hidden_comment = nil
-      if comment.comment.nil? && comment.hidden_comment.nil?
-        comment.destroy!
-      else
-        comment.save!
-      end
+      comment.destroy!
+      # params[:visible_comment] ? comment.comment = nil : comment.hidden_comment = nil
+      # if comment.comment.nil? && comment.hidden_comment.nil?
+      #   comment.destroy!
+      # else
+      #   comment.save!
+      # end
       normal_status("删除成功")
     end
   end

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

@@ -859,7 +859,8 @@ export default class TPMsettings extends Component {
   //     });
   // }
   submit_edit_shixun = () => {
-
+	if (this.saving == true) return;
+    this.saving = true;
 		if(this.state.status===-1){
 			this.props.showSnackbar("该实训已被删除，保存失败！");
 			return
@@ -1002,6 +1003,7 @@ export default class TPMsettings extends Component {
 
     axios.put(Url, data).then((response) => {
       // console.log(response)
+	  this.saving = false;
       if(response.status){
         if (response.data.status === -1) {
           this.props.showSnackbar(response.data.message);
@@ -1013,6 +1015,7 @@ export default class TPMsettings extends Component {
 
     }).catch((error) => {
       console.log(error)
+	  this.saving = false;
     })