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

合并aliyun

app/assets/javascripts/admins/laboratories/index.js

@@ -65,7 +65,7 @@ $(document).on('turbolinks:load', function() {
         },
         matcher: matcherFunc
       });
-    }
+    };
 
     $.ajax({
       url: '/api/schools/for_option.json',
@@ -171,5 +171,19 @@ $(document).on('turbolinks:load', function() {
               data: json
           })
       });
+
+      $(".laboratory-list-container").on("change", '.laboratory-sync-form', function () {
+          var s_id = $(this).attr("data-id");
+          var s_value = $(this).val();
+          var s_name = $(this).attr("name");
+          var json = {};
+          json[s_name] = s_value;
+          $.ajax({
+              url: "/admins/laboratories/" + s_id,
+              type: "PUT",
+              dataType:'script',
+              data: json
+          });
+      });
   }
 });

app/assets/javascripts/admins/laboratory_subjects/index.js

@@ -107,7 +107,7 @@ $(document).on('turbolinks:load', function() {
       },
       templateResult: function (item) {
         if(!item.id || item.id === '') return item.text;
-        var ele = '<span>'
+        var ele = '<span>';
         ele += '<span>' + item.name + '</span>';
         ele += '<span class="font-12"> -- ' + item.creator_name + '</span>';
         ele += '<span class="font-12"> -- ' + item.status_text+ '</span>';
@@ -116,10 +116,9 @@ $(document).on('turbolinks:load', function() {
         return $(ele);
       },
       templateSelection: function(item){
-        if (item.id) {
-        }
-        var ele = '<span>' + (item.name || item.text) + '<span class="font-12"> -- ' + item.creator_name + '</span></span>'
-        return $(ele);
+          if(!item.id || item.id === '') return item.text;
+          var ele = '<span>' + (item.name || item.text) + '<span class="font-12"> -- ' + item.creator_name + '</span></span>';
+          return $(ele);
       }
     });
 

app/controllers/admins/courses_controller.rb

@@ -29,9 +29,7 @@ class Admins::CoursesController < Admins::BaseController
   end
 
   def update
-    if @course.update_attributes(setting_params)
-      render_ok
-    else
+    unless @course.update_attributes!(setting_params)
       redirect_to admins_courses_path
       flash[:danger] = "更新失败"
     end

app/controllers/admins/laboratories_controller.rb

@@ -61,6 +61,14 @@ class Admins::LaboratoriesController < Admins::BaseController
     @laboratory = current_laboratory
   end
 
+  def update
+    @laboratory = current_laboratory
+    unless @laboratory.update_attributes!(setting_params)
+      redirect_to admins_laboratories_path
+      flash[:danger] = "更新失败"
+    end
+  end
+
   private
 
   def current_laboratory
@@ -70,4 +78,8 @@ class Admins::LaboratoriesController < Admins::BaseController
   def create_params
     params.permit(:school_id)
   end
+
+  def setting_params
+    params.permit(:sync_course, :sync_subject, :sync_shixun)
+  end
 end

app/controllers/competitions/competitions_controller.rb

@@ -125,7 +125,7 @@ class Competitions::CompetitionsController < Competitions::BaseController
     end
 
     @all_records = @competition.competition_teams.joins(:competition_scores).where(competition_scores: {competition_stage_id: @stage&.id.to_i})
-                 .select("competition_teams.*, score, cost_time").order("score desc, cost_time desc")
+                 .select("competition_teams.*, score, cost_time").order("score desc, cost_time asc")
 
     current_team_ids = @competition.team_members.where(user_id: current_user.id).pluck(:competition_team_id).uniq
     @user_ranks = @all_records.select{|com_team| current_team_ids.include?(com_team.id)}
@@ -213,7 +213,7 @@ class Competitions::CompetitionsController < Competitions::BaseController
       if personal
         row_cells_column << record_user.real_name
         row_cells_column << record_user.school_name
-        row_cells_column << record_user.student_id.present? ? (record_user.student_id.to_s + "\t") : "--"
+        row_cells_column << (record_user.student_id.present? ? (record_user.student_id.to_s + "\t") : "--")
       else
         row_cells_column << record.name
         row_cells_column << record.teachers_name

app/controllers/exercise_answers_controller.rb

@@ -4,85 +4,83 @@ class ExerciseAnswersController < ApplicationController
   include ExercisesHelper
 
   def create  #每一次答案的点击，请求一次，实训题不在这里回答
-    ActiveRecord::Base.transaction do
-      begin
-        q_type = @exercise_question.question_type  #试卷的类型
-        choice_id = params[:exercise_choice_id].present? ? params[:exercise_choice_id] : ""
-        answer_text = params[:answer_text].present? ? params[:answer_text].strip : ""  #为字符串
-        if q_type < Exercise::SUBJECTIVE && (q_type != Exercise::MULTIPLE) && choice_id.blank?
-          normal_status(-1,"请选择序号")
-        else
-          ea = @exercise_question.exercise_answers.search_answer_users("user_id",current_user.id)  #试卷的当前用户的答案
-          if q_type == Exercise::SINGLE || q_type == Exercise::JUDGMENT  #选择题（单选）/判断题
-            if ea.exists?
-              ea.first.update_attribute(:exercise_choice_id,choice_id )
-            else
-              answer_option = {
-                :user_id => current_user.id,
-                :exercise_question_id => @exercise_question.id,
-                :exercise_choice_id => choice_id,
-                :answer_text => ""
-              }
-              ex_a = ExerciseAnswer.new(answer_option)
-              ex_a.save!
-            end
-          elsif q_type == Exercise::MULTIPLE   #多选题的
-            choice_ids = params[:exercise_choice_id].present? ? params[:exercise_choice_id] : []
-
-            ea_ids = ea.pluck(:exercise_choice_id)
-            common_answer_ids = choice_ids & ea_ids   #已经存在的试卷选项id
-            new_ids = choice_ids - common_answer_ids   # 新增的id
-            old_ids = ea_ids - common_answer_ids  #没有选择的，则删掉
-            if new_ids.size > 0
-              new_ids.each do |e|
-                answer_option = {
-                    :user_id => current_user.id,
-                    :exercise_question_id => @exercise_question.id,
-                    :exercise_choice_id => e,
-                    :answer_text => ""
-                }
-                ex_a = ExerciseAnswer.new(answer_option)
-                ex_a.save!
-              end
-            end
-            if old_ids.size > 0
-              ea_answer = ea.search_answer_users("exercise_choice_id",old_ids)
-              ea_answer.destroy_all
-            end
-          elsif q_type == Exercise::COMPLETION  #填空题
-            answer_option = {
-                :user_id => current_user.id,
-                :exercise_question_id => @exercise_question.id,
-                :exercise_choice_id => choice_id,
-                :answer_text => answer_text
-            }
-            ea_answer = ea.search_answer_users("exercise_choice_id",choice_id)
-            if ea.present? && ea_answer.present?
-              ea_answer.update(answer_option)
-            else
-              ex_new = ExerciseAnswer.new(answer_option)
-              ex_new.save!
-            end
-          elsif q_type == Exercise::SUBJECTIVE  #简答题
+    begin
+      q_type = @exercise_question.question_type  #试卷的类型
+      choice_id = params[:exercise_choice_id].present? ? params[:exercise_choice_id] : ""
+      answer_text = params[:answer_text].present? ? params[:answer_text].strip : ""  #为字符串
+      if q_type < Exercise::SUBJECTIVE && (q_type != Exercise::MULTIPLE) && choice_id.blank?
+        normal_status(-1,"请选择序号")
+      else
+        ea = @exercise_question.exercise_answers.search_answer_users("user_id",current_user.id)  #试卷的当前用户的答案
+        if q_type == Exercise::SINGLE || q_type == Exercise::JUDGMENT  #选择题（单选）/判断题
+          if ea.exists?
+            ea.first.update_attribute(:exercise_choice_id,choice_id )
+          else
             answer_option = {
-                :user_id => current_user.id,
-                :exercise_question_id => @exercise_question.id
+              :user_id => current_user.id,
+              :exercise_question_id => @exercise_question.id,
+              :exercise_choice_id => choice_id,
+              :answer_text => ""
             }
-            if ea.present? #已经回答了的，
-              ea.first.update_attribute("answer_text",answer_text)
-            else
-              answer_option.merge!(answer_text:answer_text)
+            ex_a = ExerciseAnswer.new(answer_option)
+            ex_a.save!
+          end
+        elsif q_type == Exercise::MULTIPLE   #多选题的
+          choice_ids = params[:exercise_choice_id].present? ? params[:exercise_choice_id] : []
+
+          ea_ids = ea.pluck(:exercise_choice_id)
+          common_answer_ids = choice_ids & ea_ids   #已经存在的试卷选项id
+          new_ids = (choice_ids - common_answer_ids).uniq   # 新增的id
+          old_ids = (ea_ids - common_answer_ids).uniq  #没有选择的，则删掉
+          if new_ids.size > 0
+            new_ids.each do |e|
+              answer_option = {
+                  :user_id => current_user.id,
+                  :exercise_question_id => @exercise_question.id,
+                  :exercise_choice_id => e,
+                  :answer_text => ""
+              }
               ex_a = ExerciseAnswer.new(answer_option)
               ex_a.save!
             end
           end
-          normal_status(0,"回答成功")
+          if old_ids.size > 0
+            ea_answer = ea.search_answer_users("exercise_choice_id",old_ids)
+            ea_answer.destroy_all
+          end
+        elsif q_type == Exercise::COMPLETION  #填空题
+          answer_option = {
+              :user_id => current_user.id,
+              :exercise_question_id => @exercise_question.id,
+              :exercise_choice_id => choice_id,
+              :answer_text => answer_text
+          }
+          ea_answer = ea.search_answer_users("exercise_choice_id",choice_id)
+          if ea.present? && ea_answer.present?
+            ea_answer.update(answer_option)
+          else
+            ex_new = ExerciseAnswer.new(answer_option)
+            ex_new.save!
+          end
+        elsif q_type == Exercise::SUBJECTIVE  #简答题
+          answer_option = {
+              :user_id => current_user.id,
+              :exercise_question_id => @exercise_question.id
+          }
+          if ea.present? #已经回答了的，
+            ea.first.update_attribute("answer_text",answer_text)
+          else
+            answer_option.merge!(answer_text:answer_text)
+            ex_a = ExerciseAnswer.new(answer_option)
+            ex_a.save!
+          end
         end
-      rescue Exception => e
-        uid_logger_error(e.message)
-        tip_exception("页面调用失败！")
-        raise ActiveRecord::Rollback
+        normal_status(0,"回答成功")
       end
+    rescue Exception => e
+      uid_logger_error(e.message)
+      tip_exception("页面调用失败！")
+      raise ActiveRecord::Rollback
     end
   end
 

app/controllers/home_controller.rb

@@ -20,8 +20,8 @@ class HomeController < ApplicationController
       shixuns = shixuns.where(homepage_show: true)
       subjects = subjects.where(homepage_show: true)
     else
-      shixuns = shixuns.where(laboratory_shixuns: { homepage: true })
-      subjects = subjects.where(laboratory_subjects: { homepage: true })
+      shixuns = shixuns.joins(:laboratory_shixuns).where(laboratory_shixuns: { homepage: true, laboratory_id: current_laboratory.id})
+      subjects = subjects.joins(:laboratory_subjects).where(laboratory_subjects: { homepage: true, laboratory_id: current_laboratory.id})
     end
 
     @shixuns = shixuns.includes(:tag_repertoires, :challenges).limit(8)

app/controllers/homework_commons_controller.rb

@@ -591,6 +591,10 @@ class HomeworkCommonsController < ApplicationController
           # tip_exception("challenge_id参数的长度与challenge_score参数的长度不匹配") if
           #     params[:challenge_settings][:challenge_score].length != params[:challenge_settings][:challenge_id].length
 
+          sum_challenge_score = params[:challenge_settings].pluck(:challenge_score).reject(&:blank?).map{|score| score.to_f}.sum
+          total_score = params[:work_efficiency] ? (params[:eff_score].to_f + sum_challenge_score) : sum_challenge_score
+          tip_exception("分值之和必须等于总分值：#{params[:total_score]}分") if params[:total_score].to_f.round(2) != total_score.to_f.round(2)
+
           current_eff_score = @homework.eff_score.to_f.round(2)
           @homework.total_score = params[:total_score]
           @homework.work_efficiency = params[:work_efficiency]

app/controllers/poll_votes_controller.rb

@@ -6,119 +6,117 @@ class PollVotesController < ApplicationController
 
 
   def create  #每一次答案的点击，请求一次
-    ActiveRecord::Base.transaction do
-      begin
-        question_votes = @poll_question.poll_votes
-        question_type = @poll_question.question_type
-        question_answer_id = params[:poll_answer_id] ? params[:poll_answer_id] : nil #该答案的id
-        question_answer_text = params[:vote_text].present? ? params[:vote_text] : nil    #其他选项的内容
-        user_votes = question_votes.find_current_vote("user_id",current_user.id) #当前用户的答案，可能有多个
-        # 当前用户的当前答案，如果已存在，当再次点击的时候，取消答案，即删除该答案
-        current_vote_text = nil
+    begin
+      question_votes = @poll_question.poll_votes
+      question_type = @poll_question.question_type
+      question_answer_id = params[:poll_answer_id] ? params[:poll_answer_id] : -1 #该答案的id
+      question_answer_text = params[:vote_text].present? ? params[:vote_text] : nil    #其他选项的内容
+      user_votes = question_votes.find_current_vote("user_id",current_user.id) #当前用户的答案，可能有多个
+      # 当前用户的当前答案，如果已存在，当再次点击的时候，取消答案，即删除该答案
+      current_vote_text = nil
 
-        # if user_votes.find_vote_text.present?
-        #   current_vote_text = user_votes.find_vote_text.first
-        # end
+      # if user_votes.find_vote_text.present?
+      #   current_vote_text = user_votes.find_vote_text.first
+      # end
 
-          vote_answer_params = {
-              :user_id => current_user.id,
-              :poll_question_id => @poll_question.id,
-              :poll_answer_id => question_answer_id,
-              :vote_text => question_answer_text
-          }
-        #begin
-        if question_type == 1
-          if user_votes.present?  #用户曾经回答过的，答案选择不一样，否则新建
-            current_user_answer = user_votes.first
-            if current_user_answer&.poll_answer_id != question_answer_id   #如果说更换了答案，则以前的答案删除，并新建记录
-              current_user_answer.destroy
-              PollVote.create(vote_answer_params)
-            else
+        vote_answer_params = {
+            :user_id => current_user.id,
+            :poll_question_id => @poll_question.id,
+            :poll_answer_id => question_answer_id,
+            :vote_text => question_answer_text
+        }
+      #begin
+      if question_type == 1
+        if user_votes.present?  #用户曾经回答过的，答案选择不一样，否则新建
+          current_user_answer = user_votes.first
+          if current_user_answer&.poll_answer_id != question_answer_id   #如果说更换了答案，则以前的答案删除，并新建记录
+            current_user_answer.destroy
+            PollVote.create(vote_answer_params)
+          else
 
-              if question_answer_text.present?
-                current_user_answer.update_attribute("vote_text", question_answer_text)
-              end
+            if question_answer_text.present?
+              current_user_answer.update_attribute("vote_text", question_answer_text)
             end
-          else
-            PollVote.create(vote_answer_params)
           end
-        elsif question_type == 2   #多选题的话，答案应该是1个以上
-          question_answer_ids = params[:poll_answer_id] ? params[:poll_answer_id] : [] #该答案的id
-          if question_answer_ids.present?
-            if question_answer_text.present?   #有文字输入，但是不存在其他选项的
-              ques_vote_id = question_answer_ids.map(&:to_i).max
-              if user_votes.find_vote_text.present?
-                current_vote_text = user_votes.find_vote_text.first
-                current_vote_text.update_attribute("vote_text", question_answer_text)
-              else
-                answer_option = {
-                  :user_id => current_user.id,
-                  :poll_question_id => @poll_question.id,
-                  :poll_answer_id => ques_vote_id,
-                  :vote_text => question_answer_text
-                }
-                PollVote.create(answer_option)
-              end
-              # if current_vote_text.present?   #已有其他输入文字的选项
-              #   current_vote_text.update_attribute("vote_text", question_answer_text)
-              # else
-              #
-              # end
+        else
+          PollVote.create(vote_answer_params)
+        end
+      elsif question_type == 2   #多选题的话，答案应该是1个以上
+        question_answer_ids = params[:poll_answer_id] ? params[:poll_answer_id] : [] #该答案的id
+        if question_answer_ids.present?
+          if question_answer_text.present?   #有文字输入，但是不存在其他选项的
+            ques_vote_id = question_answer_ids.map(&:to_i).max
+            if user_votes.find_vote_text.present?
+              current_vote_text = user_votes.find_vote_text.first
+              current_vote_text.update_attribute("vote_text", question_answer_text)
+            else
+              answer_option = {
+                :user_id => current_user.id,
+                :poll_question_id => @poll_question.id,
+                :poll_answer_id => ques_vote_id,
+                :vote_text => question_answer_text
+              }
+              PollVote.create(answer_option)
             end
+            # if current_vote_text.present?   #已有其他输入文字的选项
+            #   current_vote_text.update_attribute("vote_text", question_answer_text)
+            # else
+            #
+            # end
+          end
 
-            ea_ids = user_votes.pluck(:poll_answer_id)
-            common_answer_ids = question_answer_ids & ea_ids   #已经存在的试卷选项id
-            new_ids = question_answer_ids - common_answer_ids   # 新增的id
-            old_ids = ea_ids - common_answer_ids  #没有选择的，则删掉
-            if new_ids.size > 0
-              new_ids.each do |e|
-                answer_option = {
-                    :user_id => current_user.id,
-                    :poll_question_id => @poll_question.id,
-                    :poll_answer_id => e,
-                    :vote_text => nil
-                }
-                ex_a = PollVote.new(answer_option)
-                ex_a.save!
-              end
-            end
-            if old_ids.size > 0
-              ea_answer = user_votes.find_current_vote("poll_answer_id",old_ids)
-              ea_answer.destroy_all
+          ea_ids = user_votes.pluck(:poll_answer_id)
+          common_answer_ids = question_answer_ids & ea_ids   #已经存在的试卷选项id
+          new_ids = question_answer_ids - common_answer_ids   # 新增的id
+          old_ids = ea_ids - common_answer_ids  #没有选择的，则删掉
+          if new_ids.size > 0
+            new_ids.each do |e|
+              answer_option = {
+                  :user_id => current_user.id,
+                  :poll_question_id => @poll_question.id,
+                  :poll_answer_id => e,
+                  :vote_text => nil
+              }
+              ex_a = PollVote.new(answer_option)
+              ex_a.save!
             end
-          else
-            user_votes.destroy_all
           end
-        else   #主观题的输入
-          # current_vote_text = user_votes.find_vote_text
-          if user_votes.present?
-            user_votes.first.update_attribute("vote_text", question_answer_text)
-            # if question_answer_text.present?
-            #   user_votes.first.update_attribute("vote_text", question_answer_text)
-            # else
-            #   user_votes.destroy_all
-            # end
-          else
-            PollVote.create(vote_answer_params)
+          if old_ids.size > 0
+            ea_answer = user_votes.find_current_vote("poll_answer_id",old_ids)
+            ea_answer.destroy_all
           end
+        else
+          user_votes.destroy_all
         end
-        @current_question_number = @poll_question.question_number
-        @current_question_necessary = @poll_question.is_necessary
-        #问答记录存在，且有值，才会有返回值。
-        @current_question_status = 0
-        new_user_votes = question_votes.where(user_id: current_user.id)
-        if new_user_votes.present?
-          vote_answer_id = new_user_votes.pluck(:poll_answer_id).reject(&:blank?).size
-          vote_text_count = new_user_votes.pluck(:vote_text).reject(&:blank?).size
-          if vote_text_count > 0 || vote_answer_id > 0
-            @current_question_status = 1
-          end
+      else   #主观题的输入
+        # current_vote_text = user_votes.find_vote_text
+        if user_votes.present?
+          user_votes.first.update_attribute("vote_text", question_answer_text)
+          # if question_answer_text.present?
+          #   user_votes.first.update_attribute("vote_text", question_answer_text)
+          # else
+          #   user_votes.destroy_all
+          # end
+        else
+          PollVote.create(vote_answer_params)
+        end
+      end
+      @current_question_number = @poll_question.question_number
+      @current_question_necessary = @poll_question.is_necessary
+      #问答记录存在，且有值，才会有返回值。
+      @current_question_status = 0
+      new_user_votes = question_votes.where(user_id: current_user.id)
+      if new_user_votes.present?
+        vote_answer_id = new_user_votes.pluck(:poll_answer_id).reject(&:blank?).size
+        vote_text_count = new_user_votes.pluck(:vote_text).reject(&:blank?).size
+        if vote_text_count > 0 || vote_answer_id > 0
+          @current_question_status = 1
         end
-      rescue Exception => e
-        uid_logger_error(e.message)
-        tip_exception("页面调用失败！")
-        raise ActiveRecord::Rollback
       end
+    rescue Exception => e
+      uid_logger_error(e.message)
+      tip_exception("页面调用失败！")
+      raise ActiveRecord::Rollback
     end
   end
 

app/controllers/shixuns_controller.rb

@@ -26,22 +26,7 @@ class ShixunsController < ApplicationController
 
 	## 获取课程列表
   def index
-    ## 我的实训
-    @shixuns =
-        if params[:order_by] == 'mine'
-					tip_exception(401, "..") unless current_user.logged?
-          current_user.my_shixuns
-        else
-          Shixun.unhidden
-				end
-
-		## 云上实验室过滤
-		unless current_laboratory.main_site?
-			@shixuns = @shixuns.joins(:laboratory_shixuns).where(laboratory_shixuns: { laboratory_id: current_laboratory.id })
-		else
-			not_shixun_ids = Shixun.joins(:laboratory_shixuns).where("laboratory_shixuns.laboratory_id != #{current_laboratory.id}")
-			@shixuns = @shixuns.where.not(id: not_shixun_ids)
-		end
+		@shixuns = current_laboratory.shixuns.unhidden
 
 		## 方向
 		if params[:tag_level].present? && params[:tag_id].present?

app/controllers/subjects_controller.rb

@@ -25,15 +25,9 @@ class SubjectsController < ApplicationController
 
     # 最热排序
     if reorder == "myshixun_count"
-      if current_laboratory.main_site?
-        not_subject_ids = Subject.joins(:laboratory_subjects).where("laboratory_subjects.laboratory_id != #{current_laboratory.id}").pluck(:id)
-        not_subject_ids = not_subject_ids.length > 0 ? "(" + not_subject_ids.join(",") + ")" : "(-1)"
-        laboratory_join = " AND subjects.id not in #{not_subject_ids} "
-      else
-        subject_ids = Subject.joins(:laboratory_subjects).where(laboratory_subjects: { laboratory_id: current_laboratory.id }).pluck(:id)
-        subject_ids = subject_ids.length > 0 ? "(" + subject_ids.join(",") + ")" : "(-1)"
-        laboratory_join = " AND subjects.id in #{subject_ids} "
-      end
+      subject_ids = current_laboratory.subjects.pluck(:id)
+      subject_ids = subject_ids.length > 0 ? "(" + subject_ids.join(",") + ")" : "(-1)"
+      laboratory_join = " AND subjects.id in #{subject_ids} "
 
       if select
         @subjects = Subject.find_by_sql("SELECT subjects.id, subjects.user_id, subjects.name, subjects.stages_count, subjects.repertoire_id, subjects.status,
@@ -49,6 +43,7 @@ class SubjectsController < ApplicationController
                       GROUP BY subjects.id ORDER BY myshixun_member_count DESC")
       end
     else
+      @subjects = current_laboratory.subjects
       # 我的路径
       if reorder == "mine"
         tip_exception(401, "..") unless current_user.logged?
@@ -57,19 +52,11 @@ class SubjectsController < ApplicationController
                                                 (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)
         total_subject_id = (mine_subject_id + manage_subject_id).uniq
-        @subjects = Subject.where(id: total_subject_id)
+        @subjects = @subjects.where(id: total_subject_id)
       elsif reorder == "publish_time"
-        @subjects = Subject.unhidden
-      else
-        @subjects = Subject.visible.unhidden
-      end
-
-      # 云上实验室过滤
-      unless current_laboratory.main_site?
-        @subjects = @subjects.joins(:laboratory_subjects).where(laboratory_subjects: { laboratory_id: current_laboratory.id })
+        @subjects = @subjects.unhidden
       else
-        not_subject_ids = Subject.joins(:laboratory_subjects).where("laboratory_subjects.laboratory_id != #{current_laboratory.id}")
-        @subjects = @subjects.where.not(id: not_subject_ids)
+        @subjects = @subjects.visible.unhidden
       end
 
       # 类型

app/controllers/users/shixuns_controller.rb

@@ -1,14 +1,6 @@
 class Users::ShixunsController < Users::BaseController
   def index
-    shixuns = Users::ShixunService.new(observed_user, query_params).call
-
-    ## 云上实验室过滤
-    if current_laboratory.main_site?
-      not_shixun_ids = Shixun.joins(:laboratory_shixuns).where("laboratory_shixuns.laboratory_id != #{current_laboratory.id}")
-      shixuns = shixuns.where.not(id: not_shixun_ids)
-    else
-      shixuns = shixuns.joins(:laboratory_shixuns).where(laboratory_shixuns: { laboratory_id: current_laboratory.id })
-    end
+    shixuns = Users::ShixunService.new(observed_user, query_params, current_laboratory).call
 
     @count = shixuns.count
     @shixuns = paginate(shixuns.includes(:first_tag_repertoire), special: observed_user.is_teacher?)

app/controllers/users/subjects_controller.rb

@@ -2,13 +2,7 @@ class Users::SubjectsController < Users::BaseController
   def index
     subjects = Users::SubjectService.new(observed_user, query_params).call
 
-    ## 云上实验室过滤
-    if current_laboratory.main_site?
-      not_subject_ids = Subject.joins(:laboratory_subjects).where("laboratory_subjects.laboratory_id != #{current_laboratory.id}")
-      subjects = subjects.where.not(id: not_subject_ids)
-    else
-      subjects = subjects.joins(:laboratory_subjects).where(laboratory_subjects: { laboratory_id: current_laboratory.id })
-    end
+    subjects = subjects.where(id: current_laboratory.subjects)
 
     @count = subjects.count
     @subjects = paginate(subjects.includes(:user, :repertoire), special: observed_user.is_teacher?)

app/controllers/weapps/code_sessions_controller.rb

@@ -6,7 +6,9 @@ class Weapps::CodeSessionsController < Weapps::BaseController
     logged = false
 
     result = Wechat::Weapp.jscode2session(params[:code])
-
+    Rails.logger.info("###########result: #{result}")
+    Rails.logger.info("###########result: #{result['session_key']}")
+    Rails.logger.info("###########result: #{result['unionid']}")
     # 能根据 code 拿到 unionid
     open_user = OpenUsers::Wechat.find_by(uid: result['unionid'])
     if open_user.present? && open_user.user

app/controllers/weapps/courses_controller.rb

@@ -1,6 +1,7 @@
 class Weapps::CoursesController < Weapps::BaseController
   before_action :require_login
   before_action :set_course, :user_course_identity, except: [:create]
+  before_action :check_account, only: [:create]
   before_action :teacher_allowed, only: [:edit, :update]
   before_action :teacher_or_admin_allowed, only: [:change_member_roles, :delete_course_teachers]
 

app/models/laboratory.rb

@@ -47,11 +47,31 @@ class Laboratory < ApplicationRecord
   end
 
   def shixuns
-    main_site? ? Shixun.all : Shixun.joins(:laboratory_shixuns).where(laboratory_shixuns: { laboratory_id: id })
+    if main_site?
+      not_shixun_ids = Shixun.joins(:laboratory_shixuns).where("laboratory_shixuns.laboratory_id != #{Laboratory.current.id}")
+      Shixun.where.not(id: not_shixun_ids.pluck(:shixun_id))
+    elsif sync_shixun
+      laboratory_shixun_ids = laboratory_shixuns.pluck(:shixun_id)
+      school_shixun_ids = Shixun.joins("join user_extensions on shixuns.user_id=user_extensions.user_id").where(user_extensions: { school_id: school_id }).pluck(:id)
+      shixun_ids = laboratory_shixun_ids + school_shixun_ids
+      Shixun.where(id: shixun_ids.uniq)
+    else
+      Shixun.joins(:laboratory_shixuns).where(laboratory_shixuns: { laboratory_id: id })
+    end
   end
 
   def subjects
-    main_site? ? Subject.all : Subject.joins(:laboratory_subjects).where(laboratory_subjects: { laboratory_id: id })
+    if main_site?
+      not_subject_ids = Subject.joins(:laboratory_subjects).where("laboratory_subjects.laboratory_id != #{Laboratory.current.id}")
+      Subject.where.not(id: not_subject_ids.pluck(:subject_id))
+    elsif sync_subject
+      laboratory_subject_ids = laboratory_subjects.pluck(:subject_id)
+      school_subject_ids = Subject.joins("join user_extensions on subjects.user_id=user_extensions.user_id").where(user_extensions: { school_id: school_id }).pluck(:id)
+      subject_ids = laboratory_subject_ids + school_subject_ids
+      Subject.where(id: subject_ids.uniq)
+    else
+      Subject.joins(:laboratory_subjects).where(laboratory_subjects: { laboratory_id: id })
+    end
   end
 
   def all_courses

app/services/application_service.rb

@@ -3,6 +3,12 @@ class ApplicationService
 
   Error = Class.new(StandardError)
 
+  def regix_emoji content
+    " " if content.blank?
+    regex = /[^a-zA-Z0-9\u4E00-\u9FFF]/
+    content.gsub(regex, '')
+  end
+
   private
 
   def strip(str)

app/services/oauth/create_or_find_qq_account_service.rb

@@ -17,7 +17,8 @@ class Oauth::CreateOrFindQqAccountService < ApplicationService
       new_user = true
       # 新用户
       login = User.generate_login('Q')
-      @user = User.new(login: login, nickname: params.dig('info', 'nickname'), type: 'User', status: User::STATUS_ACTIVE)
+      #nickname = regix_emoji params.dig('info', 'nickname')
+      @user = User.new(login: login, type: 'User', status: User::STATUS_ACTIVE)
     end
 
     ActiveRecord::Base.transaction do
@@ -31,7 +32,7 @@ class Oauth::CreateOrFindQqAccountService < ApplicationService
         Util.download_file(params.dig('info', 'image'), avatar_path)
       end
 
-      new_open_user = OpenUsers::QQ.create!(user: user, uid: params['uid'], extra: params.dig('extra', 'raw_info'))
+      new_open_user = OpenUsers::QQ.create!(user: user, uid: params['uid'])
 
       Rails.cache.write(new_open_user.can_bind_cache_key, 1, expires_in: 1.hours) if new_user # 方便后面进行账号绑定
     end

app/services/oauth/create_or_find_wechat_account_service.rb

@@ -24,7 +24,10 @@ class Oauth::CreateOrFindWechatAccountService < ApplicationService
       new_user = true
       # 新用户
       login = User.generate_login('w')
-      @user = User.new(login: login, nickname: result['nickname'], type: 'User', status: User::STATUS_ACTIVE)
+     # result['nickname'] = regix_emoji(result['nickname'])
+      @user = User.new(login: login, type: 'User', status: User::STATUS_ACTIVE)
+      #@user = User.new(login: login, nickname: result['nickname'], type: 'User', status: User::STATUS_ACTIVE)
+
     end
 
     ActiveRecord::Base.transaction do
@@ -39,7 +42,7 @@ class Oauth::CreateOrFindWechatAccountService < ApplicationService
         Util.download_file(result['headimgurl'], avatar_path)
       end
 
-      new_open_user= OpenUsers::Wechat.create!(user: user, uid: result['unionid'], extra: result)
+      new_open_user= OpenUsers::Wechat.create!(user: user, uid: result['unionid'])
 
       Rails.cache.write(new_open_user.can_bind_cache_key, 1, expires_in: 1.hours) if new_user # 方便后面进行账号绑定
     end

app/services/search_service.rb

@@ -40,23 +40,11 @@ class SearchService < ApplicationService
   def extra_options
     case params[:type].to_s.strip
     when 'shixun' then
-      if Laboratory.current.main_site?
-        not_shixun_ids = Shixun.joins(:laboratory_shixuns).where("laboratory_shixuns.laboratory_id != #{Laboratory.current.id}")
-        shixun_ids = Shixun.where.not(id: not_shixun_ids).pluck(:id)
-      else
-        shixun_ids = Laboratory.current.shixuns.pluck(:id)
-      end
-      { where: { id: shixun_ids } }
+      { where: { id: Laboratory.current.shixuns.pluck(:id) } }
     when 'subject' then
-      if Laboratory.current.main_site?
-        not_subject_ids = Subject.joins(:laboratory_subjects).where("laboratory_subjects.laboratory_id != #{Laboratory.current.id}")
-        subject_ids = Subject.where.not(id: not_subject_ids).pluck(:id)
-      else
-        subject_ids = Laboratory.current.subjects.pluck(:id)
-      end
-      { where: { id: subject_ids } }
+      { where: { id: Laboratory.current.subjects.pluck(:id) } }
     when 'course' then
-      { where: { laboratory_id: Laboratory.current.id } }
+      { where: { id: Laboratory.current.all_courses.pluck(:id) } }
     else
       {}
     end

app/services/shixun_search_service.rb

@@ -14,16 +14,18 @@ class ShixunSearchService < ApplicationService
     # 状态：已发布/未发布
     status = params[:status] || "all"
 
+    @shixuns = laboratory.shixuns.none_closed
+
     # 超级管理员用户显示所有未隐藏的实训、非管理员显示所有已发布的实训（对本单位公开且未隐藏未关闭）
     if type == "mine"
-      @shixuns = User.current.shixuns.none_closed
+      @shixuns = @shixuns.where(id: User.current.shixuns)
     else
-      if User.current.admin? || User.current.business?
-        @shixuns = Shixun.none_closed.where(hidden: 0)
+      if User.current.admin? || User.current.business? || !User.current.school_id
+        @shixuns = @shixuns.where(hidden: 0)
       else
         none_shixun_ids = ShixunSchool.where("school_id != #{User.current.school_id}").pluck(:shixun_id)
 
-        @shixuns = Shixun.where.not(id: none_shixun_ids).none_closed.where(hidden: 0)
+        @shixuns = @shixuns.where.not(id: none_shixun_ids).where(hidden: 0)
       end
     end
 
@@ -36,17 +38,6 @@ class ShixunSearchService < ApplicationService
       @shixuns = @shixuns.where(trainee: params[:diff])
     end
 
-    ## 云上实验室过滤
-    if laboratory.main_site?
-      not_shixun_ids = Shixun.joins(:laboratory_shixuns).where("laboratory_shixuns.laboratory_id != #{laboratory.id}")
-      @shixuns = @shixuns.where.not(id: not_shixun_ids)
-    else
-      @shixuns = @shixuns.joins(:laboratory_shixuns).where(laboratory_shixuns: { laboratory_id: laboratory.id })
-    end
-
-    # laboratory = Laboratory.find_by_subdomain(subdomain)
-    # @shixuns = @shixuns.where(id: laboratory.shixuns) if laboratory
-
     Shixun.search(keyword, search_options)
   end
 

app/services/subject_search_service.rb

@@ -12,21 +12,12 @@ class SubjectSearchService < ApplicationService
     # 全部实训/我的实训
     type = params[:type] || "all"
 
-    if type == "mine"
-      @subjects = User.current.subjects.visible.unhidden
-    else
-      @subjects = Subject.visible.unhidden
-    end
+    @subjects = laboratory.subjects
 
-    # laboratory = Laboratory.find_by_subdomain(subdomain)
-    # @subjects = @subjects.where(id: laboratory.subjects) if laboratory
-
-    ## 云上实验室过滤
-    if laboratory.main_site?
-      not_subject_ids = Subject.joins(:laboratory_subjects).where("laboratory_subjects.laboratory_id != #{laboratory.id}")
-      @subjects = @subjects.where.not(id: not_subject_ids)
+    if type == "mine"
+      @subjects = @subjects.where(id: User.current.subjects).visible.unhidden
     else
-      @subjects = @subjects.joins(:laboratory_subjects).where(laboratory_subjects: { laboratory_id: laboratory.id })
+      @subjects = @subjects.visible.unhidden
     end
 
     Subject.search(keyword, search_options)

app/services/users/shixun_service.rb

@@ -1,12 +1,14 @@
 class Users::ShixunService
-  attr_reader :user, :params
+  attr_reader :user, :params, :laboratory
 
-  def initialize(user, params)
+  def initialize(user, params, laboratory)
     @user   = user
     @params = params
+    @laboratory = laboratory
   end
 
   def call
+
     shixuns = category_scope_shixuns
 
     shixuns = user_policy_filter(shixuns)
@@ -19,12 +21,12 @@ class Users::ShixunService
   def category_scope_shixuns
     case params[:category]
     when 'study' then
-      user.study_shixuns
+      user.study_shixuns.where(shixuns: {id: laboratory.shixuns})
     when 'manage' then
-      user.shixuns
+      laboratory.shixuns.where(id: user.shixuns)
     else
       ids = user.study_shixuns.pluck(:id) + user.shixuns.pluck(:id)
-      Shixun.where(id: ids)
+      laboratory.shixuns.where(id: ids)
     end
   end
 

app/views/admins/courses/shared/_list.html.erb

@@ -24,33 +24,7 @@
   <% if courses.present? %>
     <% courses.each do |course| %>
       <tr class="course-item-<%= course.id %>">
-        <td><%= course.id %></td>
-        <td class="text-left">
-          <%= link_to(course.name, "/courses/#{course.id}", target: '_blank') %>
-        </td>
-        <td><%= course.course_members_count %></td>
-        <td><%= get_attachment_count(course, 0) %></td>
-        <td><%= course.course_homework_count(1) %></td>
-        <td><%= course.course_homework_count(3) %></td>
-        <td><%= course.course_homework_count(4) %></td>
-        <td><%= course.exercises_count %></td>
-        <td><%= course.evaluate_count %></td>
-        <td><%= course.is_public == 1 ? "--" : "√" %></td>
-        <td><%= course.is_end ? "已结束" : "正在进行" %></td>
-        <td><%= course.school&.name %></td>
-        <td><%= course.teacher&.real_name %></td>
-        <td><%= course.created_at&.strftime('%Y-%m-%d %H:%M') %></td>
-        <td>
-          <%= check_box_tag :homepage_show,!course.homepage_show,course.homepage_show,remote:true,data:{id:course.id},class:"course-setting-form" %>
-        </td>
-        <td>
-          <%= check_box_tag :email_notify,!course.email_notify,course.email_notify,remote:true,data:{id:course.id},class:"course-setting-form" %>
-        </td>
-        <td class="action-container">
-          <% if course.is_delete == 0 %>
-            <%= delete_link '删除', admins_course_path(course, element: ".course-item-#{course.id}"), class: 'delete-course-action' %>
-          <% end %>
-        </td>
+        <%= render 'admins/courses/shared/td', course: course %>
       </tr>
     <% end %>
   <% else %>

app/views/admins/courses/shared/_td.html.erb

@@ -0,0 +1,27 @@
+<td><%= course.id %></td>
+<td class="text-left">
+  <%= link_to(course.name, "/courses/#{course.id}", target: '_blank') %>
+</td>
+<td><%= course.course_members_count %></td>
+<td><%= get_attachment_count(course, 0) %></td>
+<td><%= course.course_homework_count(1) %></td>
+<td><%= course.course_homework_count(3) %></td>
+<td><%= course.course_homework_count(4) %></td>
+<td><%= course.exercises_count %></td>
+<td><%= course.evaluate_count %></td>
+<td><%= course.is_public == 1 ? "--" : "√" %></td>
+<td><%= course.is_end ? "已结束" : "正在进行" %></td>
+<td><%= course.school&.name %></td>
+<td><%= course.teacher&.real_name %></td>
+<td><%= course.created_at&.strftime('%Y-%m-%d %H:%M') %></td>
+<td>
+  <%= check_box_tag :homepage_show,!course.homepage_show,course.homepage_show,remote:true,data:{id:course.id},class:"course-setting-form" %>
+</td>
+<td>
+  <%= check_box_tag :email_notify,!course.email_notify,course.email_notify,remote:true,data:{id:course.id},class:"course-setting-form" %>
+</td>
+<td class="action-container">
+  <% if course.is_delete == 0 %>
+    <%= delete_link '删除', admins_course_path(course, element: ".course-item-#{course.id}"), class: 'delete-course-action' %>
+  <% end %>
+</td>

app/views/admins/courses/update.js.erb

@@ -0,0 +1 @@
+$("#course-item-<%= @course.id %>").html("<%= j render partial: "admins/courses/shared/td",locals: {course: @course} %>")

app/views/admins/laboratories/shared/_laboratory_item.html.erb

@@ -31,7 +31,17 @@
 <td><%= laboratory.created_at.strftime('%Y-%m-%d %H:%M') %></td>
 <td>
   <% if school.present? && laboratory.id != 1 %>
-    <%= check_box_tag :sync_course,!laboratory.sync_course,laboratory.sync_course,remote:true,data:{id:laboratory.id},class:"laboratory-sync-course" %>
+    <%= check_box_tag :sync_course,!laboratory.sync_course,laboratory.sync_course,remote:true,data:{id:laboratory.id},class:"laboratory-sync-form" %>
+  <% end %>
+</td>
+<td>
+  <% if school.present? && laboratory.id != 1 %>
+    <%= check_box_tag :sync_subject,!laboratory.sync_subject,laboratory.sync_subject,remote:true,data:{id:laboratory.id},class:"laboratory-sync-form" %>
+  <% end %>
+</td>
+<td>
+  <% if school.present? && laboratory.id != 1 %>
+    <%= check_box_tag :sync_shixun,!laboratory.sync_shixun,laboratory.sync_shixun,remote:true,data:{id:laboratory.id},class:"laboratory-sync-form" %>
   <% end %>
 </td>
 <td class="action-container">

app/views/admins/laboratories/shared/_list.html.erb

@@ -3,10 +3,12 @@
   <tr>
     <th width="14%" class="text-left">单位名称</th>
     <th width="16%" class="text-left">域名</th>
-    <th width="10%">统计链接</th>
+    <th width="6%">统计链接</th>
     <th width="22%">管理员</th>
-    <th width="14%"><%= sort_tag('创建时间', name: 'id', path: admins_laboratories_path) %></th>
-    <th width="6%" title="同步显示显示主站下该单位的课堂">同步课堂</th>
+    <th width="10%"><%= sort_tag('创建时间', name: 'id', path: admins_laboratories_path) %></th>
+    <th width="4%" title="同步显示主站下该单位的课堂">同步课堂</th>
+    <th width="4%" title="同步显示主站下该单位用户创建的实践课程">同步实践课程</th>
+    <th width="4%" title="同步显示主站下该单位用户创建的实训">同步实训</th>
     <th width="20%">操作</th>
   </tr>
   </thead>

app/views/admins/laboratories/update.js.erb

@@ -0,0 +1 @@
+$(".laboratory-item-<%= @laboratory.id %>").html("<%= j render partial: "admins/laboratories/shared/laboratory_item",locals: {laboratory: @laboratory} %>")

app/views/users/courses/shared/_course.json.jbuilder

@@ -6,6 +6,7 @@ json.members_count course.course_members_count
 json.homework_commons_count get_tasks_count course
 json.attachments_count course.attachments.count
 json.visits course.visits
+json.school course.school&.name
 
 json.first_category_url module_url(course.course_modules.where(hidden: 0).order(position: :desc).first, course)
 

config/routes.rb

@@ -1090,7 +1090,7 @@ Rails.application.routes.draw do
       post :drag, on: :collection
       post :replace_image_url, on: :member
     end
-    resources :laboratories, only: [:index, :create, :destroy] do
+    resources :laboratories, only: [:index, :create, :destroy, :update] do
       member do
         get :shixuns_for_select
         get :subjects_for_select

db/migrate/20191129064841_add_sync_shixun_subject_to_laboratory.rb

@@ -0,0 +1,6 @@
+class AddSyncShixunSubjectToLaboratory < ActiveRecord::Migration[5.2]
+  def change
+    add_column :laboratories, :sync_subject, :boolean, default: 0
+    add_column :laboratories, :sync_shixun, :boolean, default: 0
+  end
+end

db/migrate/20191203032557_add_uniq_index_to_exercise_answer.rb

@@ -0,0 +1,17 @@
+class AddUniqIndexToExerciseAnswer < ActiveRecord::Migration[5.2]
+  def change
+    remove_index :exercise_answers, column: [:exercise_question_id, :user_id]
+
+    change_column_default :exercise_answers, :exercise_choice_id, from: nil, to: -1
+    ExerciseAnswer.where(exercise_choice_id: nil).update_all(exercise_choice_id: -1)
+
+    sql = %Q(delete from exercise_answers where (exercise_question_id, user_id, exercise_choice_id) in
+            (select * from (select exercise_question_id, user_id, exercise_choice_id from exercise_answers group by exercise_question_id, user_id, exercise_choice_id having count(*) > 1) a)
+            and id not in (select * from (select min(id) from exercise_answers group by exercise_question_id, user_id, exercise_choice_id having count(*) > 1 order by id) b))
+    ActiveRecord::Base.connection.execute sql
+
+    add_index :exercise_answers, [:exercise_question_id, :user_id, :exercise_choice_id], name: 'exercise_choice_index', unique: true
+
+
+  end
+end

db/migrate/20191203040140_add_uniq_index_to_poll_votes.rb

@@ -0,0 +1,16 @@
+class AddUniqIndexToPollVotes < ActiveRecord::Migration[5.2]
+  def change
+    remove_index :poll_votes, column: [:poll_question_id, :user_id]
+
+    change_column_default :poll_votes, :poll_question_id, from: nil, to: -1
+    PollVote.where(poll_answer_id: nil).update_all(poll_answer_id: -1)
+
+    sql = %Q(delete from poll_votes where (poll_question_id, user_id, poll_answer_id) in
+            (select * from (select poll_question_id, user_id, poll_answer_id from poll_votes group by poll_question_id, user_id, poll_answer_id having count(*) > 1) a)
+            and id not in (select * from (select min(id) from poll_votes group by poll_question_id, user_id, poll_answer_id having count(*) > 1 order by id) b))
+    ActiveRecord::Base.connection.execute sql
+
+    add_index :poll_votes, [:poll_question_id, :user_id, :poll_answer_id], name: 'poll_answer_index', unique: true
+
+  end
+end

public/assets/admin-1bd781fc5959b4f0e8879fa92afc5cec47e2d1a9b79cad9e55177fc1197a0e5b.js

@@ -139935,6 +139935,29 @@ $(document).on('turbolinks:load', function() {
   }
 })
 ;
+$(document).on('turbolinks:load', function(){
+    if ($('body.admins-shixun-feedback-messages-index-page').length > 0) {
+
+        var baseOptions = {
+            autoclose: true,
+            language: 'zh-CN',
+            format: 'yyyy-mm-dd 00:00:00',
+            startDate: '2017-04-01'
+        }
+
+        var defineDateRangeSelect = function(element){
+            var options = $.extend({inputs: $(element).find('.start-date, .end-date')}, baseOptions);
+            $(element).datepicker(options);
+
+            $(element).find('.start-date').datepicker().on('changeDate', function(e){
+                $(element).find('.end-date').datepicker('setStartDate', e.date);
+            })
+        };
+
+        defineDateRangeSelect('.grow-date-input-daterange');
+    }
+})
+;
 $(document).on('turbolinks:load', function() {
   if ($('body.admins-shixun-settings-index-page').length > 0) {
     let searchContainer = $(".shixun-settings-list-form");

public/react/src/modules/tpm/TPMIndexHOC.js

@@ -20,6 +20,7 @@ import Trialapplication from "../login/Trialapplication";
 
 const $ = window.$;
 const versionNum = '0001';
+const timestamp = Date.parse(new Date());
 // let _url_origin = getUrl()
 let _url_origin='';
 if(window.location.port === "3007"){
@@ -35,14 +36,14 @@ if (!window['indexHOCLoaded']) {
   // $('head').append($('<link rel="stylesheet" type="text/css" />')
   //     .attr('href', `${_url_origin}/stylesheets/educoder/antd.min.css?1525440977`));
   $('head').append($('<link rel="stylesheet" type="text/css" />')
-      .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?8`));
+      .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?${timestamp}`));
 
   $('head').append($('<link rel="stylesheet" type="text/css" />')
-      .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?8`));
+      .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?${timestamp}`));
 
   // index.html有加载
 	$('head').append($('<link rel="stylesheet" type="text/css" />')
-		.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?8`));
+		.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?${timestamp}`));
 
 
   // $('head').append($('<link rel="stylesheet" type="text/css" />')

public/react/src/modules/user/usersInfo/InfosCourse.js

@@ -345,7 +345,7 @@ class InfosCourse extends Component{
                     </p>
                     <span><img alt="用户" className="radius mt15" height="60" src={getImageUrl('images/'+`${item.teacher && item.teacher.avatar_url}`)} width="60"/></span>
                     <p className="font-14 mt10 task-hide"><span>{item.teacher && item.teacher.real_name}</span></p>
-                    <p className="font-16 mb15 task-hide mt10"><span className="color-grey-98">{item.teacher && item.teacher.school_name}</span></p>
+                    <p className="font-16 mb15 task-hide mt10"><span className="color-grey-98">{item&&item.school}</span></p>
                   </div>
                   <div className="edu-txt-center course-bottom">
                     <div className="inline color-grey-6">

public/react/src/tpm/TPMIndexHOC.js

@@ -20,6 +20,7 @@ import Trialapplication from "../login/Trialapplication";
 
 const $ = window.$;
 const versionNum = '0001';
+const timestamp = Date.parse(new Date());
 // let _url_origin = getUrl()
 let _url_origin='';
 if(window.location.port === "3007"){
@@ -35,14 +36,14 @@ if (!window['indexHOCLoaded']) {
   // $('head').append($('<link rel="stylesheet" type="text/css" />')
   //     .attr('href', `${_url_origin}/stylesheets/educoder/antd.min.css?1525440977`));
   $('head').append($('<link rel="stylesheet" type="text/css" />')
-      .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?8`));
+      .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?${timestamp}`));
 
   $('head').append($('<link rel="stylesheet" type="text/css" />')
-      .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?8`));
+      .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?${timestamp}`));
 
   // index.html有加载
 	$('head').append($('<link rel="stylesheet" type="text/css" />')
-		.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?8`));
+		.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?${timestamp}`));
 
 
   // $('head').append($('<link rel="stylesheet" type="text/css" />')

public/stylesheets/educoder/edu-all.css

@@ -3795,3 +3795,7 @@ a.singlepublishtwo{
 .fontweightbold{
     font-weight: bold !important;
 }
+
+.ant-drawer{
+    z-index: 10000 !important;
+}