From 758bb904addafb68ac49c2cf14471bb6108454b4 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 13 Dec 2019 21:13:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/services/jupyter_service.rb b/app/services/jupyter_service.rb
index d35d9a041..ef31b8a14 100644
--- a/app/services/jupyter_service.rb
+++ b/app/services/jupyter_service.rb
@@ -20,8 +20,10 @@ module JupyterService
             logger.info "test_juypter: #{res}"
 
             @shixun_jupyter_port = res['port']
-    
-            return "https://#{res['port']}.jupyter.educoder.net/notebooks/data/workspace/myshixun_#{tpiID}/01.ipynb"
+            jupyter_service = edu_setting('jupyter_service')
+
+
+            return "https://#{res['port']}.#{jupyter_service}/notebooks/data/workspace/myshixun_#{tpiID}/01.ipynb"
         end
     end
 
@@ -62,7 +64,9 @@ module JupyterService
 
             repo_save_path = myshixun.repo_save_path
 
-            "https://#{res['port']}.jupyter.educoder.net/notebooks/data/workspace/myshixun_#{tpiID}/#{repo_save_path}/01.ipynb"
+            jupyter_service = edu_setting('jupyter_service')
+
+            "https://#{res['port']}.#{jupyter_service}/notebooks/data/workspace/myshixun_#{tpiID}/#{repo_save_path}/01.ipynb"
         end
     end
 
@@ -85,8 +89,10 @@ module JupyterService
 
         tpiID = "tpm#{shixun.id}"
 
+        jupyter_service = edu_setting('jupyter_service')
+
         #https://47526.jupyter.educoder.net/nbconvert/notebook/data/workspace/myshixun_570461/f2ef5p798r20191210163135/01.ipynb?download=true
-        src_url = "https://#{jupyter_port}.jupyter.educoder.net/nbconvert/notebook/data/workspace/myshixun_#{tpiID}/01.ipynb?download=true"
+        src_url = "https://#{jupyter_port}.#{jupyter_service}/nbconvert/notebook/data/workspace/myshixun_#{tpiID}/01.ipynb?download=true"
         response = Faraday.get(src_url)
 
         if response.status.to_i != 200
@@ -113,8 +119,9 @@ module JupyterService
         tpiID = myshixun.id
 
         repo_save_path = myshixun.repo_save_path
+        jupyter_service = edu_setting('jupyter_service')
 
-        src_url = "https://#{jupyter_port}.jupyter.educoder.net/nbconvert/notebook/data/workspace/myshixun_#{tpiID}/#{repo_save_path}/01.ipynb?download=true"
+        src_url = "https://#{jupyter_port}.#{jupyter_service}/nbconvert/notebook/data/workspace/myshixun_#{tpiID}/#{repo_save_path}/01.ipynb?download=true"
         response = Faraday.get(src_url)
 
         if response.status.to_i != 200