Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/libraries_controller.rb

@@ -38,7 +38,7 @@ class LibrariesController < ApplicationController
   def create
     library = current_user.libraries.new
     Libraries::SaveService.call(library, current_user, save_params)
-    render_ok
+    render_ok({id: library})
   rescue Libraries::SaveService::Error => ex
     render_error(ex.message)
   end
@@ -47,7 +47,7 @@ class LibrariesController < ApplicationController
     return render_forbidden unless library_manageable?(current_library)
 
     Libraries::SaveService.call(current_library, current_user, save_params)
-    render_ok
+    render_ok({id: current_library.id})
   rescue Libraries::SaveService::Error => ex
     render_error(ex.message)
   end

app/controllers/shixuns_controller.rb

@@ -782,8 +782,8 @@ class ShixunsController < ApplicationController
 		school_name = "%#{params[:school_name].to_s.strip}%"
 		if user_name.present? || school_name.present?
 			@users = User.joins(user_extension: :school).where("users.id not in #{member_ids} AND users.status = 1 AND
-																								 (LOWER(users.lastname) LIKE ? or users.phone like ?) AND LOWER(schools.name) LIKE
-																								 ?", user_name, user_name, school_name)
+																								 (LOWER(concat(users.lastname, users.firstname)) LIKE ? or users.phone like ?)
+																									AND LOWER(schools.name) LIKE ?", user_name, user_name, school_name)
 		else
 			@users = User.none
 		end

app/services/libraries/save_service.rb

@@ -56,7 +56,7 @@ class Libraries::SaveService < ApplicationService
     destroy_ids = old_attachment_id - attachment_ids
     library.attachments.where(id: destroy_ids).delete_all
 
-    Attachment.where(id: attachment_ids, author_id: user.id).update_all(container: library)
+    Attachment.where(id: attachment_ids, author_id: user.id).update_all(container_type: library)
   end
 
   def library_params

db/migrate/20190805010545_modify_ke_contents_for_markdown.rb

@@ -0,0 +1,18 @@
+class ModifyKeContentsForMarkdown < ActiveRecord::Migration[5.2]
+  # include ActionView::Helpers::SanitizeHelper
+  def change
+    # def ke_transform_to_md content
+    #   sanitize(content, tags: %w(img a span), attributes: %w(src href target style))
+    #       .gsub(/^(\n)/, "").gsub(/(\n)+/, "<br />").gsub(/$(\n)/, "")
+    #       .gsub(/(\n)+/, "<br />").gsub("\t", "&nbsp;&nbsp;&nbsp;&nbsp;")
+    # end
+    #
+    # MessageDetail.find_each do |m|
+    #   content = ke_transform_to_md m.content
+    #   puts("content:#{content}")
+    #   m.update_column(:content, content)
+    # end
+
+
+  end
+end