Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/controllers/shixuns_controller.rb

@@ -408,16 +408,14 @@ class ShixunsController < ApplicationController
 					smr.update_attributes(service)
 				end
 				# 添加第二仓库（管理员权限）
-				if current_user.admin_or_business?
-					if params[:is_secret_repository]
-						add_secret_repository if @shixun.shixun_secret_repository.blank?
-					else
-						# 如果有仓库，就要删
-						if @shixun.shixun_secret_repository&.repo_name
-							@shixun.shixun_secret_repository.lock!
-							GitService.delete_repository(repo_path: @shixun.shixun_secret_repository.repo_path)
-							@shixun.shixun_secret_repository.destroy
-						end
+				if params[:is_secret_repository]
+					add_secret_repository if @shixun.shixun_secret_repository.blank?
+				else
+					# 如果有仓库，就要删
+					if @shixun.shixun_secret_repository&.repo_name
+						@shixun.shixun_secret_repository.lock!
+						GitService.delete_repository(repo_path: @shixun.shixun_secret_repository.repo_path)
+						@shixun.shixun_secret_repository.destroy
 					end
 				end
 			end

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