From b64847d7cf1dc6722e4ae8552ad52ec729afc241 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 3 Jan 2020 10:04:13 +0800
Subject: [PATCH] =?UTF-8?q?git=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admins/customers_controller.rb | 1 +
 app/controllers/shixuns_controller.rb          | 9 +++++++++
 app/services/jupyter_service.rb                | 3 ++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/controllers/admins/customers_controller.rb b/app/controllers/admins/customers_controller.rb
index 80b01757b..1901b5490 100644
--- a/app/controllers/admins/customers_controller.rb
+++ b/app/controllers/admins/customers_controller.rb
@@ -1,4 +1,5 @@
 class Admins::CustomersController < Admins::BaseController
+  skip_before_action :check_sign
   helper_method :current_partner
 
   def index
diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index 3de5970b6..b76704c07 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -896,6 +896,15 @@ class ShixunsController < ApplicationController
 		render_ok
 	end
 
+	def upload_git_folder
+		raise("文件夹名不合法") if params[:folder_name] =~ /^[^\\\/\?\*\"\>\<\:\|]*$/
+
+	end
+
+	def delete_git_file
+
+	end
+
   def add_collaborators
 		member_ids = "(" + @shixun.shixun_members.map(&:user_id).join(',') + ")"
 		user_name = "%#{params[:user_name].to_s.strip}%"
diff --git a/app/services/jupyter_service.rb b/app/services/jupyter_service.rb
index 2d43a0987..bbe0330bb 100644
--- a/app/services/jupyter_service.rb
+++ b/app/services/jupyter_service.rb
@@ -8,7 +8,8 @@ module JupyterService
             uri = "#{shixun_tomcat}/bridge/jupyter/get"
             tpiID = "tpm#{shixun.id}"
             mount = shixun.data_sets.present?
-            params = {tpiID: tpiID, identifier: shixun.identifier, needMount: mount, gitUrl: '',
+            gitUrl = "#{edu_setting('git_address_domain')}/#{shixun.repo_path}"
+            params = {tpiID: tpiID, identifier: shixun.identifier, needMount: mount, gitUrl: gitUrl,
                       :containers => "#{Base64.urlsafe_encode64(shixun_container_limit(shixun))}"}
     
             logger.info "test_juypter: uri->#{uri}, params->#{params}"