From 4574e13a884ffefa42e276dbb88114dbca50d260 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 26 Sep 2019 11:00:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=B7=E5=B7=A5=E8=B4=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/welcome_controller.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index 6e297161..37efc762 100755
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -610,7 +610,8 @@ class WelcomeController < ApplicationController
     g = Gitlab.client
     shixun.update_column(:git_url, g.project(shixun.gpid).path_with_namespace)
     local_git_path = local_shixun.local_giturl.split('/').last if local_shixun.local_giturl.present?
-    new_giturl = "http://educoder:xinhu1ji2qu3@"+g.project(shixun.gpid).http_url_to_repo.split('//').last
+    # 海工版本
+    # new_giturl = "http://educoder:xinhu1ji2qu3@"+g.project(shixun.gpid).http_url_to_repo.split('//').last
     # 如果有目录才执行
     # logger.info("##########_------------- path: #{File.directory?("/home/pdl/trustie24/tmp/repositories/local/#{local_git_path}")}")
     # logger.info("##########_------------- new_giturl: #{new_giturl}")
@@ -622,6 +623,7 @@ class WelcomeController < ApplicationController
     # end
 
     # 如果有目录才执行
+    new_giturl = "http://edugit:xinedugit#@"+g.project(shixun.gpid).http_url_to_repo.split('//').last
     logger.info("##########_------------- path: #{File.directory?("/home/pdl/educoder/tmp/repositories/local/#{local_git_path}")}")
     logger.info("##########_------------- path: #{"/home/pdl/educoder/tmp/repositories/local/#{local_git_path}"}")
     logger.info("##########_------------- new_giturl: #{new_giturl}")