From 490e08e6a5f42211902eb7e61a1a4c42d0efe01e Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 16 Dec 2019 09:53:54 +0800
Subject: [PATCH] Jupyter

---
 app/services/jupyter_service.rb | 43 ++++++++-------------------------
 1 file changed, 10 insertions(+), 33 deletions(-)

diff --git a/app/services/jupyter_service.rb b/app/services/jupyter_service.rb
index 143b2eda7..109cb1242 100644
--- a/app/services/jupyter_service.rb
+++ b/app/services/jupyter_service.rb
@@ -20,15 +20,8 @@ module JupyterService
             logger.info "test_juypter: #{res}"
 
             @shixun_jupyter_port = res['port']
-            jupyter_service = edu_setting('jupyter_service')
-
-            url =
-                if false
-                    "https://#{jupyter_service}:#{res['port']}/notebooks/data/workspace/myshixun_#{tpiID}/01.ipynb"
-                else
-                    "https://#{res['port']}.#{jupyter_service}/notebooks/data/workspace/myshixun_#{tpiID}/01.ipynb"
-                end
-            return url
+
+            "https://#{jupyter_service(res['port'])}}/notebooks/data/workspace/myshixun_#{tpiID}/01.ipynb"
         end
     end
 
@@ -69,14 +62,7 @@ module JupyterService
 
             repo_save_path = myshixun.repo_save_path
 
-            jupyter_service = edu_setting('jupyter_service')
-
-            if false
-                "https://#{jupyter_service}:#{res['port']}/notebooks/data/workspace/myshixun_#{tpiID}/#{repo_save_path}/01.ipynb"
-            else
-                "https://#{res['port']}.#{jupyter_service}/notebooks/data/workspace/myshixun_#{tpiID}/#{repo_save_path}/01.ipynb"
-            end
-
+            "https://#{jupyter_service(res['port'])}}/notebooks/data/workspace/myshixun_#{tpiID}/#{repo_save_path}/01.ipynb"
         end
     end
 
@@ -99,14 +85,8 @@ module JupyterService
 
         tpiID = "tpm#{shixun.id}"
 
-        jupyter_service = edu_setting('jupyter_service')
-        src_url =
-            if false
-                "https://#{jupyter_service}:#{jupyter_port}/nbconvert/notebook/data/workspace/myshixun_#{tpiID}/01.ipynb?download=true"
-            else
-                "https://#{jupyter_port}.#{jupyter_service}/nbconvert/notebook/data/workspace/myshixun_#{tpiID}/01.ipynb?download=true"
-            end
-        #https://47526.jupyter.educoder.net/nbconvert/notebook/data/workspace/myshixun_570461/f2ef5p798r20191210163135/01.ipynb?download=true
+        src_url = "#{jupyter_service(jupyter_port)}/nbconvert/notebook/data/workspace/myshixun_#{tpiID}/01.ipynb?download=true"
+
         response = Faraday.get(src_url)
 
         if response.status.to_i != 200
@@ -134,14 +114,7 @@ module JupyterService
 
         repo_save_path = myshixun.repo_save_path
         jupyter_service = edu_setting('jupyter_service')
-
-        src_url =
-            if false
-                "https://#{jupyter_service}:#{jupyter_port}/nbconvert/notebook/data/workspace/myshixun_#{tpiID}/#{repo_save_path}/01.ipynb?download=true"
-            else
-                "https://#{jupyter_port}.#{jupyter_service}/nbconvert/notebook/data/workspace/myshixun_#{tpiID}/#{repo_save_path}/01.ipynb?download=true"
-            end
-
+        "https://#{jupyter_service(jupyter_port)}/nbconvert/notebook/data/workspace/myshixun_#{tpiID}/#{repo_save_path}/01.ipynb?download=true"
         response = Faraday.get(src_url)
 
         if response.status.to_i != 200
@@ -215,5 +188,9 @@ module JupyterService
         end
     end
 
+    def jupyter_service jupyter_port
+        edu_setting('jupyter_service').gsub("PORT", jupyter_port)
+    end
+
 
 end