From 6440bfabe266acca359c4a7143393e70d3054e49 Mon Sep 17 00:00:00 2001
From: p31729568 <winse.wang@foxmail.com>
Date: Tue, 30 Jul 2019 15:15:17 +0800
Subject: [PATCH 1/3] fix create project package api

---
 app/services/project_packages/save_service.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/services/project_packages/save_service.rb b/app/services/project_packages/save_service.rb
index caf4cf6c7..a876f56b3 100644
--- a/app/services/project_packages/save_service.rb
+++ b/app/services/project_packages/save_service.rb
@@ -25,7 +25,9 @@ class ProjectPackages::SaveService < ApplicationService
     end
 
     ActiveRecord::Base.transaction do
-      package.assign_attributes(params)
+      columns = %i[project_package_category_id title content deadline_at
+                   min_price max_price contact_name contact_phone]
+      package.assign_attributes(params.slice(*columns))
       package.save!
 
       # 处理附件

From f6fe2f0ed20f47ea2176d30f5386ca4d1cab8b47 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 30 Jul 2019 15:24:48 +0800
Subject: [PATCH 2/3] top

---
 .../src/modules/courses/busyWork/CommonWorkDetailIndex.js      | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
index a690fedc0..2d3361492 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
@@ -305,9 +305,6 @@ class CommonWorkDetailIndex extends Component{
                         .floatSpinParent .ant-spin-nested-loading {
                           float: right;
                         }
-                        .floatSpinParent .ant-spin-nested-loading .ant-spin-spinning{
-                          top: 10px;
-                        }
                         `}</style>
                         {this.props.isAdmin()? <Spin spinning={this.state.donwloading} style={{  }}>
                         <li className="li_line drop_down fr color-blue font-16 mr8 mt20" style={{"padding":"0 20px"}}>

From fb55382dd131b90117eec2cc835e64f7c41089b4 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 30 Jul 2019 15:34:21 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E7=9A=84bug?=
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  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/concerns/git_helper.rb b/app/controllers/concerns/git_helper.rb
index d77e1c3f6..c0c68ee81 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.try(:strip)}/#{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 6c3f34a60..26effd12e 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -714,6 +714,7 @@ class ShixunsController < ApplicationController
 					end
 				end
 			rescue Exception => e
+				logger.info("shixun_exec error: #{e.message}")
 				if e.message != "ActiveRecord::RecordInvalid"
 					logger.error("##########project_fork error #{e.message}")
 					@myshixun.destroy!