Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/controllers/shixuns_controller.rb

@@ -216,7 +216,7 @@ class ShixunsController < ApplicationController
 					ShixunInfo.create!(shixun_id: @new_shixun.id,
 														 description: @shixun.description,
 														 evaluate_script: @shixun.evaluate_script,
-														 shixun_reason: params[:reason].to_s.strip)
+														 fork_reason: params[:reason].to_s.strip)
 				end
 
 				# 同步私密版本库

app/models/hack.rb

@@ -56,7 +56,7 @@ class Hack < ApplicationRecord
   private
   def send_delete_tiding
     base_attrs = {
-        user_id: user_id, viewed: 0, tiding_type: 'System', trigger_user_id: current_user.id,
+        user_id: user_id, viewed: 0, tiding_type: 'System', trigger_user_id: User.current.id,
         parent_container_type: "HackDelete"
     }
     tidings.create!(base_attrs)

db/migrate/20191225035117_modify_open_or_not_for_hacks.rb

@@ -0,0 +1,5 @@
+class ModifyOpenOrNotForHacks < ActiveRecord::Migration[5.2]
+  def change
+    change_column :hacks, :open_or_not, :boolean, :default => false
+  end
+end