From f5aa02a775f65e5110f2e024d9a279b539492657 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 31 Dec 2019 14:04:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?jupyter=20get=E6=97=B6=E4=BC=A0=E5=85=A5git?=
 =?UTF-8?q?url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/jupyter_service.rb | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/services/jupyter_service.rb b/app/services/jupyter_service.rb
index 29f54cb02..66869d275 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}"

From cdd402c2706cf22aa2d2ad447bc55b53c603cbb7 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 31 Dec 2019 21:56:56 +0800
Subject: [PATCH 2/3] .

---
 app/services/jupyter_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/jupyter_service.rb b/app/services/jupyter_service.rb
index 66869d275..2d43a0987 100644
--- a/app/services/jupyter_service.rb
+++ b/app/services/jupyter_service.rb
@@ -53,7 +53,7 @@ module JupyterService
             params = { tpiID: tpiID, 
                        identifier: shixun.identifier,
                        myshixunIdentifier: myshixun.identifier,
-                       gitUrl: giturl,
+                       gitUrl: gitUrl,
                        needMount: mount,
                        :containers => "#{Base64.urlsafe_encode64(shixun_container_limit(shixun))}"}
             res = uri_post uri, params

From 23f99d307f8b77c06dab195b4bf30ab8476eb966 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 2 Jan 2020 12:02:25 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=BB=93=E6=9D=9F=E5=89=8D=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E5=85=B3=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/shixunHomework/Listofworksstudentone.js       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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',