From f8735c56fd274e466447f02f25be7a39c4f0e42d Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Mon, 23 Dec 2019 21:27:12 +0800 Subject: [PATCH 01/30] add get pod timeinfo --- app/controllers/jupyters_controller.rb | 13 +++++++++++++ app/services/jupyter_service.rb | 23 +++++++++++++++++++++++ bin/bundle | 0 bin/rails | 0 bin/rake | 0 bin/setup | 0 bin/update | 0 bin/yarn | 0 config/routes.rb | 2 ++ 9 files changed, 38 insertions(+) mode change 100644 => 100755 bin/bundle mode change 100644 => 100755 bin/rails mode change 100644 => 100755 bin/rake mode change 100644 => 100755 bin/setup mode change 100644 => 100755 bin/update mode change 100644 => 100755 bin/yarn diff --git a/app/controllers/jupyters_controller.rb b/app/controllers/jupyters_controller.rb index 988cef01a..6cc78536a 100644 --- a/app/controllers/jupyters_controller.rb +++ b/app/controllers/jupyters_controller.rb @@ -80,4 +80,17 @@ class JupytersController < ApplicationController render json: {status: 0} end + def timeinfo_with_tpm + shixun = Shixun.find_by(identifier: params[:identifier]) + info = jupyter_timeinfo_tpm(shixun) + render json: {status: 0}.merge(info) + end + + def timeinfo_with_tpi + myshixun = Myshixun.find_by(identifier: params[:identifier]) + info = jupyter_timeinfo_tpi(shixun) + render json: {status: 0}.merge(info) + end + + end diff --git a/app/services/jupyter_service.rb b/app/services/jupyter_service.rb index bff9b5dc6..29f54cb02 100644 --- a/app/services/jupyter_service.rb +++ b/app/services/jupyter_service.rb @@ -213,4 +213,27 @@ module JupyterService _jupyter_active(tpiID) end + def _jupyter_timeinfo(tpiID) + shixun_tomcat = edu_setting('cloud_bridge') + uri = "#{shixun_tomcat}/bridge/jupyter/getTimeInfo" + params = {:tpiID => tpiID} + res = uri_post uri, params + if res && res['code'].to_i != 0 + raise("实训云平台繁忙（繁忙等级：130）") + end + + res['data'] + end + + # 获取时间参数 + def jupyter_timeinfo_tpm(shixun) + tpiID = "tpm#{shixun.id}" + _jupyter_timeinfo(tpiID) + end + + # 获取时间参数 + def jupyter_timeinfo_tpi(myshixun) + tpiID = myshixun.id + _jupyter_timeinfo(tpiID) + end end diff --git a/bin/bundle b/bin/bundle old mode 100644 new mode 100755 diff --git a/bin/rails b/bin/rails old mode 100644 new mode 100755 diff --git a/bin/rake b/bin/rake old mode 100644 new mode 100755 diff --git a/bin/setup b/bin/setup old mode 100644 new mode 100755 diff --git a/bin/update b/bin/update old mode 100644 new mode 100755 diff --git a/bin/yarn b/bin/yarn old mode 100644 new mode 100755 diff --git a/config/routes.rb b/config/routes.rb index 73756ece3..fc281f0d3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -35,6 +35,8 @@ Rails.application.routes.draw do get :reset_with_tpm get :active_with_tpm get :active_with_tpi + get :timeinfo_with_tpm + get :timeinfo_with_tpi post :import_with_tpm end From 28a7698475c2be38ad06f026db067e0cefcc5bb9 Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Tue, 24 Dec 2019 15:58:49 +0800 Subject: [PATCH 02/30] =?UTF-8?q?=E5=B0=86jupyter=E7=9A=84=E9=87=8D?= =?UTF-8?q?=E7=BD=AE=E6=8E=A5=E5=8F=A3=E6=94=B9=E4=B8=BAresetJupyterTpm?= =?UTF-8?q?=E3=80=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/myshixuns_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb index 0e9ba477a..255c0f42e 100644 --- a/app/controllers/myshixuns_controller.rb +++ b/app/controllers/myshixuns_controller.rb @@ -376,7 +376,7 @@ class MyshixunsController < ApplicationController # todo: identifier 是以前的密码,用来验证的,新版如果不需要,和中间层协调更改. params = {tpiID: "#{@myshixun.try(:id)}", tpiGitURL: "#{git_myshixun_url}", tpmGitURL: "#{git_shixun_url}", identifier: "xinhu1ji2qu3"} - uri = "#{shixun_tomcat}/bridge/game/resetTpmRepository" + uri = "#{shixun_tomcat}/bridge/game/resetJupyterTpm" res = uri_post uri, params if (res && res['code'] != 0) tip_exception("实训云平台繁忙（繁忙等级：95）") From c38d9f290f36a072573e9e7ad92c348b769b7097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Tue, 24 Dec 2019 16:42:56 +0800 Subject: [PATCH 03/30] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/public/css/css_min_all.css | 4 ++-- public/react/public/css/edu-all.css | 6 ++++++ .../shixunHomework/Listofworksstudentone.js | 15 +++++++++------ public/stylesheets/educoder/edu-all.css | 5 +++++ public/stylesheets/educoder/edu-main.css | 4 ++++ 5 files changed, 26 insertions(+), 8 deletions(-) diff --git a/public/react/public/css/css_min_all.css b/public/react/public/css/css_min_all.css index cf453ac21..431a4da8e 100755 --- a/public/react/public/css/css_min_all.css +++ b/public/react/public/css/css_min_all.css @@ -1883,9 +1883,8 @@ a:hover.task_icons_close{background: url(../images/popup/sy_icons_close.png) -40 .newupload_nav li:last-child{ border-right: none;} .newupload_nav li a{font-size:12px; color:#444;} .newupload_nav_hover{ background: #3498db; } -.newupload_nav_nomal { } .newupload_nav_hover a{color: #fff !important; } - +.markdown-body { text-align: justify;word-break: break-all;} .bor-reds{ border:1px solid #FF0000!important; border-radius: 4px; @@ -1894,6 +1893,7 @@ a:hover.task_icons_close{background: url(../images/popup/sy_icons_close.png) -40 border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; } + @charset "UTF-8"; /*! diff --git a/public/react/public/css/edu-all.css b/public/react/public/css/edu-all.css index 5988709eb..141f5b8e1 100644 --- a/public/react/public/css/edu-all.css +++ b/public/react/public/css/edu-all.css @@ -3478,3 +3478,9 @@ a.singlepublishtwo{ /*width: auto !important;*/ /*max-width: 600px !important;*/ /*}*/ + + +.markdown-body { + text-align: justify; + word-break: break-all; +} \ No newline at end of file diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 459421dcd..1111dcb12 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -1667,7 +1667,7 @@ class Listofworksstudentone extends Component { ], yslpros: false, datajs: [], - homework_status: [], + homework_status: undefined, } } @@ -3597,7 +3597,14 @@ class Listofworksstudentone extends Component { starttimesend={this.state.starttimesend} typs={this.state.typs} /> : ""} - { + {homework_status===undefined? +
+
+
+ +
+
+
: homework_status && homework_status.length === 0 ?
@@ -3609,11 +3616,7 @@ class Listofworksstudentone extends Component {
:
- -
- - diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js index cc8e28bf7..f72c4ac94 100644 --- a/public/react/src/modules/tpm/TPMIndexHOC.js +++ b/public/react/src/modules/tpm/TPMIndexHOC.js @@ -35,14 +35,14 @@ if (!window['indexHOCLoaded']) { // $('head').append($('') // .attr('href', `${_url_origin}/stylesheets/educoder/antd.min.css?1525440977`)); $('head').append($('') - .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?1`)); + .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?66`)); $('head').append($('') - .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?1`)); + .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?66`)); // index.html有加载 $('head').append($('') - .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?1`)); + .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?66`)); // $('head').append($('') diff --git a/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css b/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css index 34f71fb1e..83d8fb15d 100644 --- a/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css +++ b/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css @@ -1,5 +1,5 @@ .editormd-html-preview, .editormd-preview-container { - width: 95% !important; + width: 100% !important; } .Finish_button{ height: 30px; diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index 2832f226f..562ba09c2 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -2939,7 +2939,7 @@ a.singlepublishtwo{ padding: 40px !important; } .editormd-html-preview{ - width: 94% !important; + width:100% !important; color: #323232 !important; } #homework_editorMd_description hr{ From a4f872bf49dab6ff14e35374bb10e0fb3348637d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Tue, 24 Dec 2019 19:02:58 +0800 Subject: [PATCH 06/30] =?UTF-8?q?=E8=B0=83=E6=95=B4fork?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/tpm/TPMBanner.js | 29 +++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js index 884efd4c2..73a09bb45 100644 --- a/public/react/src/modules/tpm/TPMBanner.js +++ b/public/react/src/modules/tpm/TPMBanner.js @@ -59,7 +59,8 @@ class TPMBanner extends Component { openknow:false, openshowpublictype:false, Radiovalue:1, - TextAreaintshow:false + TextAreaintshow:false, + } } @@ -112,6 +113,15 @@ class TPMBanner extends Component { componentDidUpdate(prevProps, prevState) { if (prevProps != this.props) { + + if(prevProps.user != this.props.user){ + if(this.props.user&&this.props.user.admin===true||this.props.user&&this.props.user.business===true){ + this.setState({ + TextArea:"云上实验室使用" + }) + } + } + let shixunopenprocess=window.localStorage.shixunopenprocess; let openopenpublictype=window.localStorage.openopenpublictype; if(this.props.status===0&&this.props.openknows===false){ @@ -173,8 +183,12 @@ class TPMBanner extends Component { }) } + if (this.props.user && this.props.user.admin === true || this.props.user && this.props.user.business === true) { + this.setState({ + TextArea: "云上实验室使用" + }) + } } - /* * Fork * */ @@ -736,6 +750,11 @@ class TPMBanner extends Component { this.setState({ Radiovalue:e.target.value }) + if(e.target.value!=4){ + this.setState({ + TextAreaintshow:false + }) + } } render() { @@ -827,7 +846,7 @@ class TPMBanner extends Component { }; // // console.log(this.props.shixunsDetails&&this.props.shixunsDetails.is_jupyter) - // console.log(this.props) + // console.log(this.state) return ( @@ -1318,7 +1337,9 @@ class TPMBanner extends Component { 其它原因 {this.state.Radiovalue === 4 ? -