Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into develop

app/services/jupyter_service.rb

@@ -22,8 +22,13 @@ module JupyterService
             @shixun_jupyter_port = res['port']
             jupyter_service = edu_setting('jupyter_service')
 
-
-            return "https://#{res['port']}.#{jupyter_service}/notebooks/data/workspace/myshixun_#{tpiID}/01.ipynb"
+            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
         end
     end
 
@@ -66,7 +71,12 @@ module JupyterService
 
             jupyter_service = edu_setting('jupyter_service')
 
-            "https://#{res['port']}.#{jupyter_service}/notebooks/data/workspace/myshixun_#{tpiID}/#{repo_save_path}/01.ipynb"
+            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
+
         end
     end
 
@@ -90,9 +100,13 @@ 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 = "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
@@ -121,7 +135,13 @@ module JupyterService
         repo_save_path = myshixun.repo_save_path
         jupyter_service = edu_setting('jupyter_service')
 
-        src_url = "https://#{jupyter_port}.#{jupyter_service}/nbconvert/notebook/data/workspace/myshixun_#{tpiID}/#{repo_save_path}/01.ipynb?download=true"
+        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
+
         response = Faraday.get(src_url)
 
         if response.status.to_i != 200