Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/services/jupyter_service.rb

@@ -21,7 +21,7 @@ module JupyterService
 
             @shixun_jupyter_port = res['port']
 
-            "https://#{jupyter_service(res['port'])}}/notebooks/data/workspace/myshixun_#{tpiID}/01.ipynb"
+            "#{jupyter_service(res['port'])}/notebooks/data/workspace/myshixun_#{tpiID}/01.ipynb"
         end
     end
 
@@ -62,7 +62,7 @@ module JupyterService
 
             repo_save_path = myshixun.repo_save_path
 
-            "https://#{jupyter_service(res['port'])}}/notebooks/data/workspace/myshixun_#{tpiID}/#{repo_save_path}/01.ipynb"
+            "#{jupyter_service(res['port'])}/notebooks/data/workspace/myshixun_#{tpiID}/#{repo_save_path}/01.ipynb"
         end
     end
 
@@ -113,8 +113,7 @@ module JupyterService
         tpiID = myshixun.id
 
         repo_save_path = myshixun.repo_save_path
-        jupyter_service = edu_setting('jupyter_service')
+        src_url = "#{jupyter_service(jupyter_port)}/nbconvert/notebook/data/workspace/myshixun_#{tpiID}/#{repo_save_path}/01.ipynb?download=true"
-        "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

app/services/shixuns/create_shixun_service.rb

@@ -44,9 +44,9 @@ class CreateShixunService < ApplicationService
         end
         # 如果是jupyter，先创建一个目录,为了挂载(因为后续数据集，开启Pod后环境在没销毁前，你上传数据集是挂载不上目录的，因此要先创建目录，方便中间层挂载)
         if shixun.is_jupyter?
-          folder = edu_setting('shixun_folder')
+          folder = EduSetting.get('shixun_folder')
           path = "#{folder}/#{identifier}"
-          FileUtils.mkdir_p(path, :mode => 0777) unless File.directory?(dir)
+          FileUtils.mkdir_p(path, :mode => 0777) unless File.directory?(path)
         end
         return shixun
       end