From 527be293c375804baf32ce0c27f6ec44e1f257fc Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 29 Jul 2019 16:19:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=90=AF=E5=AE=9E=E8=AE=AD=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/concerns/git_helper.rb              | 2 +-
 app/controllers/shixuns_controller.rb               | 2 +-
 db/migrate/20190729080934_modify_login_for_users.rb | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20190729080934_modify_login_for_users.rb

diff --git a/app/controllers/concerns/git_helper.rb b/app/controllers/concerns/git_helper.rb
index 65ebd4074..d77e1c3f6 100644
--- a/app/controllers/concerns/git_helper.rb
+++ b/app/controllers/concerns/git_helper.rb
@@ -48,7 +48,7 @@ module GitHelper
   def project_fork(container, original_rep_path, username)
     raise Educoder::TipException.new("fork源路径为空,fork失败!") if original_rep_path.blank?
     # 将要生成的仓库名字
-    new_repo_name = "#{username}/#{container.try(:identifier)}#{ Time.now.strftime("%Y%m%d%H%M%S")}"
+    new_repo_name = "#{username.try(:strip)}/#{container.try(:identifier)}#{ Time.now.strftime("%Y%m%d%H%M%S")}"
     uid_logger("start fork container: repo_name is #{new_repo_name}")
     GitService.fork_repository(repo_path: original_rep_path, fork_repository_path: (new_repo_name + ".git"))
     container.update_attributes!(:repo_name => new_repo_name)
diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index 1c272e02d..6c3f34a60 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -716,7 +716,7 @@ class ShixunsController < ApplicationController
 			rescue Exception => e
 				if e.message != "ActiveRecord::RecordInvalid"
 					logger.error("##########project_fork error #{e.message}")
-					@current_task.destroy!
+					@myshixun.destroy!
 				end
 				raise "实训云平台繁忙（繁忙等级：81）"
 			end
diff --git a/db/migrate/20190729080934_modify_login_for_users.rb b/db/migrate/20190729080934_modify_login_for_users.rb
new file mode 100644
index 000000000..96fb9f1d1
--- /dev/null
+++ b/db/migrate/20190729080934_modify_login_for_users.rb
@@ -0,0 +1,8 @@
+class ModifyLoginForUsers < ActiveRecord::Migration[5.2]
+  def change
+    users = User.where("created_on > '2019-07-26 19:00:00'")
+    users.find_each do |use|
+      use.update_column(:login, use.login.strip)
+    end
+  end
+end