Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder 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

@@ -479,6 +479,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

public/react/src/modules/courses/coursesPublic/AppraiseModal.js

@@ -72,8 +72,9 @@ class AppraiseModal extends Component{
 			challenge_id:challenge_id
 		}).then((response) => {
      if(response.data.status===0){
+     	debugger
 			 this.props.showNotification(response.data.message)
-			 this.props.showCancel(comment,hidden_comment,challenge_id)
+			 this.props.showCancel(comment,hidden_comment,response.data.comment_id)
 		 }else{
 			 this.props.showNotification(response.data.message)
 		 }

public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js

@@ -157,7 +157,7 @@ class ShixunWorkReport extends Component {
 
 	showAppraiseModal=(type,id,show,hidden)=>{
     let{data}=this.state;
-    debugger
+
 		if(type==="child"){
 		 data.stage_list.forEach((item,key)=>{
 				if(item.challenge_id===id){
@@ -192,12 +192,13 @@ class ShixunWorkReport extends Component {
 
 		let{data,showAppraisetype}=this.state;
 
-		debugger
+
 		if(showAppraisetype==="child"){
 			data.stage_list.forEach((item,key)=>{
 				if(item.challenge_id===id){
 					item.challenge_comment=show;
 					item.challenge_comment_hidden=hidden;
+					item.challenge_id=id;
 				}
 			})
 			this.setState({
@@ -205,10 +206,12 @@ class ShixunWorkReport extends Component {
 				data:data
 			})
 		}else{
+			data.comment_id=id
 			this.setState({
 				showAppraiseModaltype:false,
 				work_comment:show,
-				work_comment_hidden:hidden
+				work_comment_hidden:hidden,
+				data:data
 			})
 		}
 

public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js

@@ -15,31 +15,7 @@ class OfficialAcademicTranscript extends Component {
 	}
 
 	componentDidMount() {
-		let {data}=this.props;
-
-		let datas=[];
-		if(data!=undefined){
-			data.stage_list===undefined?"":data.stage_list.forEach((item,key)=>{
-				datas.push({
-					customs: key+1,
-					taskname:{name:item.name,complete_status:item.complete_status},
-					openingtime:item.open_time,
-					evaluating: item.evaluate_count,
-					finishtime:item.finished_time,
-					elapsedtime:item.time_consuming,
-					empvalue:{myself:item.myself_experience,experience:item.experience},
-					game_scores:{game_score:item.game_score,game_score_full:item.game_score_full},
-					challenge_id:{id:item.challenge_id},
-					challenge_comment: item.challenge_comment,
-					challenge_comment_hidden: item.challenge_comment_hidden,
-					// adjustmentminute:asdasd
-				})
-			})
 
-			this.setState({
-				datas:datas
-			})
-		}
 	}
 	myjumptopic=(e)=>{
 		console.log("获取到值");
@@ -98,7 +74,28 @@ class OfficialAcademicTranscript extends Component {
 	}
 
 	render() {
-    let {datas,customsids}=this.state;
+    let {customsids}=this.state;
+		let {data}=this.props;
+
+		let datas=[];
+		if(data!=undefined){
+			data.stage_list===undefined?"":data.stage_list.forEach((item,key)=>{
+				datas.push({
+					customs: key+1,
+					taskname:{name:item.name,complete_status:item.complete_status},
+					openingtime:item.open_time,
+					evaluating: item.evaluate_count,
+					finishtime:item.finished_time,
+					elapsedtime:item.time_consuming,
+					empvalue:{myself:item.myself_experience,experience:item.experience},
+					game_scores:{game_score:item.game_score,game_score_full:item.game_score_full},
+					challenge_id:{id:item.challenge_id},
+					challenge_comment: item.challenge_comment,
+					challenge_comment_hidden: item.challenge_comment_hidden,
+					// adjustmentminute:asdasd
+				})
+			})
+		}
 
 		let columns=[{
 			title: '关卡',