diff --git a/app/services/jupyter_service.rb b/app/services/jupyter_service.rb index 29f54cb02..2d43a0987 100644 --- a/app/services/jupyter_service.rb +++ b/app/services/jupyter_service.rb @@ -8,7 +8,7 @@ module JupyterService uri = "#{shixun_tomcat}/bridge/jupyter/get" tpiID = "tpm#{shixun.id}" mount = shixun.data_sets.present? - params = {tpiID: tpiID, identifier: shixun.identifier, needMount: mount, + params = {tpiID: tpiID, identifier: shixun.identifier, needMount: mount, gitUrl: '', :containers => "#{Base64.urlsafe_encode64(shixun_container_limit(shixun))}"} logger.info "test_juypter: uri->#{uri}, params->#{params}" @@ -48,8 +48,14 @@ module JupyterService tpiID = myshixun.id mount = myshixun.shixun.data_sets.present? - params = {tpiID: tpiID, identifier: shixun.identifier, myshixunIdentifier: myshixun.identifier, needMount: mount, - :containers => "#{Base64.urlsafe_encode64(shixun_container_limit(shixun))}"} + + gitUrl = "#{edu_setting('git_address_domain')}/#{myshixun.repo_path}" + params = { tpiID: tpiID, + identifier: shixun.identifier, + myshixunIdentifier: myshixun.identifier, + gitUrl: gitUrl, + needMount: mount, + :containers => "#{Base64.urlsafe_encode64(shixun_container_limit(shixun))}"} res = uri_post uri, params logger.info "test_juypter: #{res}" diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index fee00d4eb..879508ea1 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -363,7 +363,7 @@ class Listofworksstudentone extends Component { ), }, { - title: '截止前完成关卡', + title: '结束前完成关卡', dataIndex: 'completion', key: 'completion', align: "center", @@ -757,7 +757,7 @@ class Listofworksstudentone extends Component { ), }, { - title: '截止前完成关卡', + title: '结束前完成关卡', dataIndex: 'completion', key: 'completion', align: "center", @@ -1110,7 +1110,7 @@ class Listofworksstudentone extends Component { ), }, { - title: '截止前完成关卡', + title: '结束前完成关卡', dataIndex: 'completion', key: 'completion', align: 'center', @@ -1473,7 +1473,7 @@ class Listofworksstudentone extends Component { ), }, { - title: '截止前完成关卡', + title: '结束前完成关卡', dataIndex: 'completion', key: 'completion', align: 'center',