Merge branch 'dev_daiao' into dev_aliyun

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)

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

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