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

app/controllers/hack_user_lastest_codes_controller.rb

@@ -85,7 +85,7 @@ class HackUserLastestCodesController < ApplicationController
       testCase = ojEvaResult['testCase']
       # 只有编译出错时，才正则匹配错误行数
       error_line=
-          if params[:status] == "-4"
+          if ojEvaResult['status'] == "4" || ojEvaResult['status'] == "5"
             regular_match_error_line ojEvaResult['outPut'], @my_hack.hack.language
           end
       # debug 与submit 公用的参数
@@ -148,11 +148,12 @@ class HackUserLastestCodesController < ApplicationController
   # 正则错误行数
   def regular_match_error_line content, language
     content =  Base64.decode64(content).force_encoding("utf-8")
+    logger.info("######content: #{content}")
     case language
     when 'Java'
       content.scan(/.java.\d+/).map{|s| s.match(/\d+/)[0].to_i}.min
     when 'C', 'C++'
-      content.scan(/\d:\d+: error/).map{|s| s.match(/\d+/)[0]}.min
+      content.scan(/\d:\d+:/).map{|s| s.match(/\d+/)[0]}.min
     when 'Python'
       content.scan(/line \d+/).map{|s| s.match(/\d+/)[0].to_i}.min
     end

public/react/src/common/components/comment/index.scss

@@ -41,12 +41,14 @@ $ml: 20px;
     }
     .item-desc{
       flex: 1;
-      margin-left: $ml;
+      // margin-left: $ml;
+      margin-left: 5px;
     }
     .item-header{
       font-size: $fz14;
       line-height: $lh14;
       color: #333;
+      margin-left: 15px;
       .item-time{
         font-size: $fz12;
         line-height: $lh14;

public/react/src/modules/developer/components/errorResult/index.js

@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-12-03 15:20:55
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-25 11:41:42
+ * @LastEditTime : 2019-12-27 22:35:14
  */
 import './index.scss';
 import React from 'react';

public/react/src/modules/developer/recordDetail/index.js

@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-12-04 08:36:21
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-27 14:51:42
+ * @LastEditTime : 2019-12-27 21:18:39
  */
 import './index.scss';
 import React, { useState, useEffect } from 'react';
@@ -60,6 +60,14 @@ function RecordDetail (props) {
       props.history.push(`/myproblems/${identifier}`);
     }
   }
+
+  const handleEditorCode = (identifier, code) => {
+    if (identifier) {
+      console.log(code);
+      saveEditorCodeForDetail(code);
+      props.history.push(`/myproblems/${identifier}`);
+    }
+  }
   return (
     <div className="record_detail_area">
       <div className="record_detail_header">
@@ -114,9 +122,10 @@ function RecordDetail (props) {
             style={{ visibility: identifier ? 'visible' : 'hidden'}}
             className={'header_btn'} 
             type="primary"
+            onClick={() => handleEditorCode(identifier, detail.code)}
           >
-              {/* 编辑代码 */}
-            <Link to={`/myproblems/${identifier}`}>编辑代码</Link>
+              编辑代码
+            {/* <Link to={`/myproblems/${identifier}`}>编辑代码</Link> */}
           </Button>
         </div>
         <div className="result_code_area">

public/react/src/modules/developer/studentStudy/leftpane/commitRecord/index.js

@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-27 09:49:33
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-27 17:14:04
+ * @LastEditTime : 2019-12-27 22:40:32
  */
 import './index.scss';
 import React, { useState, useEffect } from 'react';
@@ -96,7 +96,7 @@ const CommitRecord = (props) => {
     const {
       id,
       // error_line,
-      // error_msg,
+      error_msg,
       // execute_memory,
       // execute_time,
       // input,
@@ -123,7 +123,7 @@ const CommitRecord = (props) => {
                 复制错误信息 <Icon type="copy" className={'icon_style'}/>
               </span>
             </p>
-            <p className={'show_detail'}>
+            <p className={'show_detail'} style={{ visibility: id ? 'visible' : 'hidden' }}>
               <Link to={`/myproblems/record_detail/${id}`}>
                 显示详情 <Icon type="right" className={'icon_style'}/>
               </Link>

public/react/src/modules/tpm/jupyter/index.js

@@ -168,8 +168,7 @@ function JupyterTPI (props) {
         title: '更新通知',
         content: (<div className="update_notice">
           {stopposttpip(1)}
-          <p className="update_txt">该实训已更新，您选择更新后之前编写的实训代码将会丢失</p>
-          <p className="update_txt">如有需要请先使用【jupyter中-文件-下载】保存代码，再进行更新</p>
+          <p className="update_txt">该实训已更新，您选择更新后之前编写的实训代码将会丢失，如有需要请先使用【jupyter中-文件-下载】保存代码，再进行更新</p>
           {/*<p className="update_txt">还未完成评测的任务代码，请自行保存</p>*/}
         </div>),
         okText: '立即更新',
@@ -188,6 +187,7 @@ function JupyterTPI (props) {
   // 重置实训
   const handleClickResetTpi = () => {
     stopposttpip(1)
+    updataspinning(true)
     Modal.confirm({
       title: '重置实训',
       content: (
@@ -206,6 +206,7 @@ function JupyterTPI (props) {
       },
       onCancel() {
         stopposttpip(2)
+        updataspinning(false)
       },
     })
   }

public/react/src/modules/tpm/jupyter/rightPane/index.js

@@ -26,7 +26,7 @@ function RightPane (props) {
 
   const loadInit = (
     <div className="jupyter_loading_init">
-        <Spin tip="加载中..."></Spin>
+        {/*<Spin tip="加载中..."></Spin>*/}
       </div>
   );
 

public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js

@@ -105,24 +105,16 @@ class Challengesjupyter extends Component {
 		}
 
 	}
-	componentDidMount() {
-		let that=this;
-		setTimeout(this.ChallengesList(), 1000);
-		let id = this.props.match.params.shixunId;
-		let datas={
-			identifier:id,
-		}
-    let timeinfo_with_tpm=`/jupyters/timeinfo_with_tpm.json`
-		axios.get(timeinfo_with_tpm, {params: datas}).then((response) => {
-			if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
+
+	gettimeinfo_with_tpm=(datas)=>{
+	let timeinfo_with_tpm=`/jupyters/timeinfo_with_tpm.json`
+	axios.get(timeinfo_with_tpm, {params: datas}).then((response) => {
+		if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
 
 			}else{
 				if(response.data.status===0){
 					if(response.data.useSeconds===null){
-						Modal.warning({
-							title: '提示',
-							content: '因为这个实训pod不在了，请联系系统管理人员',
-						});
+						this.handleClickResetTpi()
 					}else{
 						let useSeconds=response.data.useSeconds;
 						let summain=3600 * 1000;
@@ -132,15 +124,24 @@ class Challengesjupyter extends Component {
 							this.setState({
 								jupytertime:Date.now() +sum
 							})
-					 },500);
+						},500);
 					}
 				}else{
 
 				}
 			}
-		}).catch((error) => {
+			}).catch((error) => {
+
+			});
+	}
+	componentDidMount() {
+		let that=this;
+		setTimeout(this.ChallengesList(), 1000);
+		let id = this.props.match.params.shixunId;
+		let datas={
+			identifier:id,
+		}
 
-		});
 
 		let ChallengesURL = `/jupyters/get_info_with_tpm.json`;
 
@@ -153,6 +154,7 @@ class Challengesjupyter extends Component {
 				}, 600)
 			}else{
 				if(response.data.status===0){
+					this.gettimeinfo_with_tpm(datas)
 					setTimeout(() => {
 						this.setState({
 							jupyter_url:response.data.url,
@@ -503,6 +505,7 @@ class Challengesjupyter extends Component {
 						}
 					</style>
 					<span className={"Countdowntypes"}>
+								{/*this.state.jupytertime*/}
 						    <Countdown value={this.state.jupytertime} format="HH:mm:ss" onFinish={this.onFinish}/>
 					</span>
 

public/react/src/redux/actions/jupyter.js

@@ -248,10 +248,16 @@ export const timeinfo_with_tpi = (identifier, dispatch) => {
       if (res.status === 200) {
         if(res.data.status===0){
           if(res.data.useSeconds===null){
-            Modal.warning({
-              title: '提示',
-              content: '因为这个实训pod不在了，无法获取倒计时，请联系系统管理人员',
-            });
+            Modal.confirm({
+              title: '重置环境',
+              content:" 是否确定重置环境？" ,
+              okText: '确定',
+              cancelText: '取消',
+              onOk () {
+                reset_with_tpi(identifier, '重置成功');
+              },
+              onCancel() {}
+            })
           }else{
             let useSeconds=res.data.useSeconds;
             let summain=3600 * 1000;

public/react/src/redux/actions/ojForm.js

@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-20 16:35:46
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-27 20:13:01
+ * @LastEditTime : 2019-12-27 22:19:15
  */
 import types from './actionTypes';
 import CONST from '../../constants';
@@ -298,9 +298,14 @@ export const validateOjForm = (props, type, cb) => {
                 type: types.SAVE_OJ_FORM_ID,
                 payload: identifier
               });
+              
+              console.log(identifier , props.identifier);
+              if (identifier || props.identifier) {
+                dispatch(getOJFormById(identifier || props.identifier));
+              }
               // 保存成功后，调用编辑接口并改变路
               if (paramsObj['submitType'] === 'add' && identifier) {
-                dispatch(getOJFormById(identifier));
+                
                 props.history.push(`/problems/${identifier}/edit`);
               };
             }

public/react/src/redux/reducers/ojForUserReducer.js

@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-27 13:41:48
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-27 20:59:00
+ * @LastEditTime : 2019-12-27 21:28:28
  */
 import types from "../actions/actionTypes";
 import { Base64 } from 'js-base64';
@@ -58,7 +58,8 @@ const ojForUserReducer = (state = initialState, action) => {
         ...state,
         hack: Object.assign({}, hack),
         test_case: Object.assign({}, test_case),
-        comment_identifier: hack.identifier
+        comment_identifier: hack.identifier,
+        userCode: tempCode
       }
     case types.COMMIT_RECORD_DETAIL:
       let result = action.payload.data;