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

app/controllers/courses_controller.rb

@@ -60,6 +60,7 @@ class CoursesController < ApplicationController
       #                  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a")
       #                  .order("courses.id = 1309 desc, a desc")
     if @order == "mine"
+      tip_exception(401, "..") unless current_user.logged?
       @courses = Course.joins(:course_members)
                        .where("is_delete = 0 AND is_hidden = 0 AND course_members.user_id = ?", @user.id)
     elsif @order == "created_at"

app/controllers/shixuns_controller.rb

@@ -22,6 +22,7 @@ class ShixunsController < ApplicationController
     ## 我的实训
     @shixuns =
         if params[:order_by] == 'mine'
+					tip_exception(401, "..") unless current_user.logged?
           current_user.my_shixuns
         else
           Shixun.unhidden

app/controllers/subjects_controller.rb

@@ -37,6 +37,8 @@ class SubjectsController < ApplicationController
     else
       # 我的路径
       if reorder == "mine"
+        tip_exception(401, "..") unless current_user.logged?
+
         mine_subject_id = StageShixun.find_by_sql("select DISTINCT(subject_id) from stage_shixuns where shixun_id in
                                                 (select distinct(shixun_id) from myshixuns where user_id=#{current_user.id})").map(&:subject_id)
         manage_subject_id = SubjectMember.where(user_id: current_user.id).pluck(:subject_id)
@@ -137,7 +139,7 @@ class SubjectsController < ApplicationController
     if current_user.admin?
       @shixuns = Shixun.select([:id, :name, :status, :myshixuns_count, :identifier]).where(hidden: 0)
     else
-      none_shixun_ids = ShixunSchool.where("school_id != #{current_user.user_extension.try(:school_id)}").pluck(:shixun_id)
+      none_shixun_ids = ShixunSchool.where("school_id != #{current_user.user_extension.try(:school_id).to_i}").pluck(:shixun_id)
 
       @shixuns = Shixun.select([:id, :name, :status, :myshixuns_count, :identifier]).where.not(id: none_shixun_ids).where(hidden: 0)
     end
@@ -174,7 +176,7 @@ class SubjectsController < ApplicationController
                                       WHERE m.course_id = c.id AND m.role in (1,2,3)
                                       AND m.user_id=#{current_user.id} AND c.is_delete = 0 AND c.is_end = 0").map(&:id)
     @courses = Course.where(id: course_ids)
-    @none_shixun_ids = ShixunSchool.where("school_id != #{current_user.user_extension.try(:school_id)}").pluck(:shixun_id)
+    @none_shixun_ids = ShixunSchool.where("school_id != #{current_user.user_extension.try(:school_id).to_i}").pluck(:shixun_id)
   end
 
   def send_to_course

app/services/concerns/elasticsearch_able.rb

@@ -20,7 +20,17 @@ module ElasticsearchAble
   def highlight_options
     {
       fragment_size: EduSetting.get('es_highlight_fragment_size') || 30,
-      tag: '<span class="highlight">'
+      tag: '<span class="highlight">',
+      fields: {
+        name: { type: 'plain' },
+        subject: { type: 'plain' },
+        challenge_names: { type: 'plain' },
+        challenge_tag_names: { type: 'plain' },
+        description: { type: 'plain' },
+        subject_stages: { type: 'plain' },
+        content: { type: 'plain' },
+        descendants_contents: { type: 'plain' },
+      }
     }
   end
 

db/migrate/20190720025309_add_ts_mem_for_outputs.rb

@@ -0,0 +1,5 @@
+class AddTsMemForOutputs < ActiveRecord::Migration[5.2]
+  def change
+    add_column :outputs, :ts_mem, :float
+  end
+end

db/migrate/20190720025341_add_ts_time_for_outputs.rb

@@ -0,0 +1,5 @@
+class AddTsTimeForOutputs < ActiveRecord::Migration[5.2]
+  def change
+    add_column :outputs, :ts_time, :float
+  end
+end