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

app/models/searchable/subject.rb

@@ -43,7 +43,8 @@ module Searchable::Subject
       author_school_name: user.school_name,
       visits_count: visits,
       stage_count: stages_count,
-      stage_shixuns_count: stage_shixuns_count
+      stage_shixuns_count: stage_shixuns_count,
+      shixuns_count: shixuns_count
     }
   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_type: library)
+    Attachment.where(id: attachment_ids, author_id: user.id).update_all(container_type: library.class.to_s)
   end
 
   def library_params

db/migrate/20190805004505_sync_index_to_users.rb

@@ -1,6 +1,6 @@
 class SyncIndexToUsers < ActiveRecord::Migration[5.2]
   def change
-    # add_index :users, :login, unique: true
+    add_index :users, :login, unique: true
     add_index :users, :mail, unique: true
     add_index :users, :phone, unique: true
   end

db/migrate/20190805010545_modify_ke_contents_for_markdown.rb

@@ -1,17 +1,64 @@
 class ModifyKeContentsForMarkdown < ActiveRecord::Migration[5.2]
-  # include ActionView::Helpers::SanitizeHelper
+  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
+    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
+
+    # 试卷
+    Exercise.find_each do |e|
+
+    end
+
+    # 试卷的标题
+    ExerciseQuestion.find_each do |eq|
+      question_title = ke_transform_to_md eq.question_title
+      puts("question_title:#{question_title}")
+      eq.update_column(:question_title, question_title)
+    end
+
+    # 试卷的答案
+    ExerciseStandardAnswer.find_each do |esa|
+      answer_text = ke_transform_to_md esa.answer_text
+      puts("answer_text: #{answer_text}")
+      esa.update_column(:answer_text, answer_text)
+    end
+
+
+    # 问卷的标题
+    PollQuestion.find_each do |pq|
+      question_title = ke_transform_to_md pq.question_title
+      puts("question_title:#{question_title}")
+      pq.update_column(:question_title, question_title)
+    end
+
+
+
     #
-    # MessageDetail.find_each do |m|
-    #   content = ke_transform_to_md m.content
-    #   puts("content:#{content}")
-    #   m.update_column(:content, content)
-    # end
+    # StudentWork
+    # HomeworkCommon
+    # JournalsForMessage
+    # GraduationTask
+    # GraduationTopic
+    # GraduationWork
+    # GtaskBank
+    # GtopicBank
+    # HomeworkBank
+    # QuestionBank
+    # ExerciseBankQuestion
+    # ExerciseBankStandardAnswer
+    # Memo
+
+
 
 
   end

db/migrate/20190805061306_add_exec_time_to_evaluate_records.rb

@@ -0,0 +1,7 @@
+class AddExecTimeToEvaluateRecords < ActiveRecord::Migration[5.2]
+  def change
+    remove_columns :evaluate_records, :exec_time if User.first.attributes.include?("exec_time")
+
+    add_column :evaluate_records, :exec_time, :integer
+  end
+end