Merge branches 'dev_aliyun', 'dev_jupyter' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into develop

app/controllers/shixuns_controller.rb

@@ -756,7 +756,7 @@ class ShixunsController < ApplicationController
 			else
 				commit = GitService.commits(repo_path: @repo_path).try(:first)
 				uid_logger("First comit########{commit}")
-				tip_exception("开启实战前请先在版本库中提交代码") if commit.blank?
+				tip_exception("开启挑战前，请先在Jupyter中填写内容") if commit.blank?
 				commit_id = commit["id"]
 				cloud_bridge = edu_setting('cloud_bridge')
 				myshixun_identifier = generate_identifier Myshixun, 10
@@ -774,7 +774,7 @@ class ShixunsController < ApplicationController
 			end
 		rescue => e
 			uid_logger_error(e.message)
-			tip_exception("实训云平台繁忙（繁忙等级：81）")
+			tip_exception("#{e.message}")
 		end
 	end
 

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

@@ -181,7 +181,7 @@ class TPMDataset extends Component {
 	getdatastwo = (page,limit) => {
 		let id=this.props.match.params.shixunId;
 
-		let collaborators=`/shixuns/${id}/jupyter_data_sets.json`;
+		let collaborators=`/shixuns/${id}/get_data_sets.json`;
 		axios.get(collaborators,{params:{
 				page:page,
 				limit:limit,
@@ -233,7 +233,7 @@ class TPMDataset extends Component {
 	getdatasthree = (page,limit) => {
 		let id=this.props.match.params.shixunId;
 
-		let collaborators=`/shixuns/${id}/jupyter_data_sets.json`;
+		let collaborators=`/shixuns/${id}/get_data_sets.json`;
 		axios.get(collaborators,{params:{
 				page:page,
 				limit:limit,

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

@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-12-12 10:34:03
  * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-13 21:19:30
+ * @LastEditTime: 2019-12-13 22:46:51
  */
 import './index.scss';
 import React, { useState, useEffect } from 'react';
@@ -71,7 +71,7 @@ function LeftPane (props) {
         {/* <span className="iconfont icon-java jupyter_data_icon"></span>数据集 */}
       </h2>
       { renderCtx }
-      <div className='jupyter_pagination' style={{ display: dataSets > 0 ? 'flex' : 'none'}}>
+      <div className='jupyter_pagination'>
         <Pagination 
           simple 
           current={pagination.page}