Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm

app/controllers/accounts_controller.rb

@@ -33,7 +33,7 @@ class AccountsController < ApplicationController
       uid_logger("start register:  verifi_code is #{verifi_code}, code is #{code}, time is #{Time.now.to_i - verifi_code.try(:created_at).to_i}")
       # check_code = (verifi_code.try(:code) == code.strip && (Time.now.to_i - verifi_code.created_at.to_i) <= 10*60)
       # todo 上线前请删除万能验证码"513231"
-      if code != "513231"
+      unless code == "513231" && request.host == "47.96.87.25"
         return normal_status(-2, "验证码不正确") if verifi_code.try(:code) != code.strip
         return normal_status(-2, "验证码已失效") if !verifi_code&.effective?
       end

app/controllers/files_controller.rb

@@ -210,6 +210,7 @@ class FilesController < ApplicationController
 
     is_unified_setting = params[:is_unified_setting]
     publish_time = params[:publish_time]
+    publish_time = format_time(Time.parse(publish_time)) unless publish_time.blank?
     is_public = params[:is_public]
     course_group_publish_times = params[:course_group_publish_times] || []
 
@@ -221,8 +222,10 @@ class FilesController < ApplicationController
         @new_attachment_history = @old_attachment.become_history
         @new_attachment_history.save!
 
+        old_course_second_category_id = @old_attachment.course_second_category_id
         @old_attachment.copy_attributes_from_new_attachment(@new_attachment)
         @old_attachment.is_public = is_public == true ? 1 : 0 if is_public
+        @old_attachment.course_second_category_id = old_course_second_category_id
         @old_attachment.save!
         @new_attachment.delete
       end
@@ -260,12 +263,7 @@ class FilesController < ApplicationController
 
     return normal_status(-2, "该课程下没有id为 #{params[:id]}的资源") if @file.nil?
     return normal_status(403, "您没有权限进行该操作") if @user != @file.author && !@user.teacher_of_course?(@course) && !@file.public?
-    @is_pdf = false
-    file_content_type = @file.content_type
-    file_ext_type = File.extname(@file.filename).strip.downcase[1..-1]
-    if (file_content_type.present? && file_content_type.downcase.include?("pdf")) || (file_ext_type.present? && file_ext_type.include?("pdf"))
-      @is_pdf = true
-    end
+
     @attachment_histories = @file.attachment_histories
   end
 

app/controllers/shixuns_controller.rb

@@ -555,23 +555,23 @@ class ShixunsController < ApplicationController
 
 			# 判断实训是否全为选择题
 			is_choice_type = (min_challenges.size == min_challenges.select{|challenge| challenge.last == 1}.count)
-			# if !is_choice_type
-			# 	commit = GitService.commits(repo_path: @repo_path).try(:first)
-			# 	uid_logger("First comit########{commit}")
-			# 	tip_exception("开启实战前请先在版本库中提交代码") if commit.blank?
-			# 	commit_id = commit["id"]
-			# end
+			if !is_choice_type
+				commit = GitService.commits(repo_path: @repo_path).try(:first)
+				uid_logger("First comit########{commit}")
+				tip_exception("开启实战前请先在版本库中提交代码") if commit.blank?
+				commit_id = commit["id"]
+			end
 
 			# 如果该实训是金课中的实训，则将当前用户加入到当期开课的课堂
-			if StageShixun.exists?(shixun_id: @shixun.id, subject_id: Subject.where(excellent: 1))
-				subject = Subject.where(excellent: 1, id: StageShixun.where(shixun_id: @shixun.id).pluck(:subject_id)).take
-				course = subject.courses.where("start_date is not null and start_date <= '#{Date.today}' and end_date is not null and end_date >= '#{Date.today}'").take
-				if course.present? && !CourseMember.exists?(course_id: course.id, user_id: current_user.id)
-					# 为了不影响后续操作，用create而不是create!
-					CourseMember.create(course_id: course.id, user_id: current_user.id, role: 4)
-					CourseAddStudentCreateWorksJob.perform_later(course.id, [current_user.id])
-				end
-			end
+			# if StageShixun.exists?(shixun_id: @shixun.id, subject_id: Subject.where(excellent: 1))
+			# 	subject = Subject.where(excellent: 1, id: StageShixun.where(shixun_id: @shixun.id).pluck(:subject_id)).take
+			# 	course = subject.courses.where("start_date is not null and start_date <= '#{Date.today}' and end_date is not null and end_date >= '#{Date.today}'").take
+			# 	if course.present? && !CourseMember.exists?(course_id: course.id, user_id: current_user.id)
+			# 		# 为了不影响后续操作，用create而不是create!
+			# 		CourseMember.create(course_id: course.id, user_id: current_user.id, role: 4)
+			# 		CourseAddStudentCreateWorksJob.perform_later(course.id, [current_user.id])
+			# 	end
+			# end
 
 			ActiveRecord::Base.transaction do
 				begin

app/controllers/subjects_controller.rb

@@ -86,6 +86,16 @@ class SubjectsController < ApplicationController
     @shixuns = @subject.shixuns.published.pluck(:id)
     @courses = @subject.courses if @subject.excellent
 
+    @members = @subject.subject_members.includes(:user)
+    shixuns = @subject.shixuns.published.pluck(:id)
+    challenge_ids = Challenge.where(shixun_id: shixuns).pluck(:id)
+    # 实训路径中的所有实训标签
+    @tags = ChallengeTag.where(challenge_id: challenge_ids).pluck(:name).uniq
+    # 用户获取的实训标签
+    # @user_tags = @subject.shixuns.map(&:user_tags_name).flatten.uniq
+    @user_tags = user_shixun_tags challenge_ids, @user.id
+    @my_subject_progress = @subject.my_subject_progress
+
     # 访问数变更
     @subject.increment!(:visits)
   end

app/controllers/users/base_controller.rb

@@ -26,6 +26,12 @@ class Users::BaseController < ApplicationController
     render_forbidden
   end
 
+  def require_auth_teacher!
+    return if current_user.admin_or_business? || observed_user.certification_teacher?
+
+    render_forbidden
+  end
+
   def page_value
     params[:page].to_i <= 0 ? 1 : params[:page].to_i
   end

app/controllers/users/video_auths_controller.rb

@@ -1,5 +1,5 @@
 class Users::VideoAuthsController < Users::BaseController
-  before_action :private_user_resources!
+  before_action :private_user_resources!, :require_auth_teacher!
 
   def create
     result = Videos::CreateAuthService.call(observed_user, create_params)

app/controllers/users/videos_controller.rb

@@ -1,5 +1,5 @@
 class Users::VideosController < Users::BaseController
-  before_action :private_user_resources!
+  before_action :private_user_resources!, :require_auth_teacher!
 
   helper_method :current_video
 

app/helpers/application_helper.rb

@@ -258,7 +258,7 @@ module ApplicationHelper
   end
 
   def download_url attachment
-    attachment_path(attachment)
+    attachment_path(attachment).gsub("/api","")
   end
 
   # 耗时：天、小时、分、秒

app/libs/aliyun_vod/service/video_upload.rb

@@ -16,6 +16,15 @@ module AliyunVod::Service::VideoUpload
 
     result = request(:post, params)
 
+    if result['Code'].present?
+      message =
+        case result['Code']
+        when 'InvalidFileName.Extension' then '不支持的文件格式'
+        when 'IllegalCharacters' then '文件名称包含非法字符'
+        end
+      raise AliyunVod::Error, message if message.present?
+    end
+
     raise AliyunVod::Error, '获取上传凭证失败' if result['UploadAddress'].blank?
 
     result

app/models/attachment.rb

@@ -115,4 +115,15 @@ class Attachment < ApplicationRecord
     end
   end
 
+  #判断是否为pdf文件
+  def is_pdf?
+    is_pdf = false
+    file_content_type = content_type
+    file_ext_type = File.extname(filename).strip.downcase[1..-1]
+    if (file_content_type.present? && file_content_type.downcase.include?("pdf")) || (file_ext_type.present? && file_ext_type.include?("pdf"))
+      is_pdf = true
+    end
+    is_pdf
+  end
+
 end

app/models/attachment_history.rb

@@ -20,4 +20,14 @@ class AttachmentHistory < ApplicationRecord
     is_public == 1
   end
 
+  def is_history_pdf?
+    is_pdf = false
+    file_content_type = content_type
+    file_ext_type = File.extname(filename).strip.downcase[1..-1]
+    if (file_content_type.present? && file_content_type.downcase.include?("pdf")) || (file_ext_type.present? && file_ext_type.include?("pdf"))
+      is_pdf = true
+    end
+    is_pdf
+  end
+
 end

app/services/duplicate_course_service.rb

@@ -11,7 +11,7 @@ class DuplicateCourseService < ApplicationService
       @course = copy_course!
 
       copy_course_modules!
-
+      Rails.logger.info("###########second_category_list#{@second_category_list}")
       join_course!
 
       copy_homework_commons!
@@ -36,9 +36,17 @@ class DuplicateCourseService < ApplicationService
   end
 
   def copy_course_modules!
+    @second_category_list = {}
     origin_course.course_modules.each do |course_module|
       attrs = course_module.as_json(only: %i[module_type position hidden module_name])
-      CourseModule.create!(attrs.merge(course_id: course.id))
+      new_course_module = CourseModule.create!(attrs.merge(course_id: course.id))
+      # 复制子目录
+      course_module.course_second_categories.each do |second_category|
+        category_attr =  second_category.as_json(only: %i[category_type name position])
+        new_second_category =
+            CourseSecondCategory.create!(category_attr.merge(course_id: course.id, course_module_id: new_course_module.id))
+        @second_category_list[second_category.id] = new_second_category.id
+      end
     end
   end
 
@@ -50,7 +58,10 @@ class DuplicateCourseService < ApplicationService
     origin_course.homework_commons.where(homework_type: %i[normal group practice]).find_each do |origin_homework|
       homework_attrs = origin_homework.as_json(only: %i[name description homework_type homework_bank_id reference_answer])
 
-      homework = HomeworkCommon.create!(homework_attrs.merge(user_id: user.id, course_id: course.id))
+      course_second_category_id = @second_category_list[origin_homework.course_second_category_id]
+
+      homework = HomeworkCommon.create!(homework_attrs.merge(user_id: user.id, course_id: course.id,
+                                                             course_second_category_id:course_second_category_id))
 
       origin_homework.attachments.find_each do |origin_attachment|
         attachment = origin_attachment.copy
@@ -71,6 +82,7 @@ class DuplicateCourseService < ApplicationService
         HomeworksService.new.create_shixun_homework_cha_setting(homework, origin_homework.shixuns.first)
       end
 
+
       origin_homework.increment!(:quotes)
       origin_homework.homework_bank.increment!(:quotes) if origin_homework.homework_bank
     end
@@ -138,9 +150,9 @@ class DuplicateCourseService < ApplicationService
       attachment.copy_from = origin_attachment.copy_from || origin_attachment.id
       attachment.is_publish = 0
       attachment.attachtype ||= 4
+      attachment.course_second_category_id = @second_category_list[origin_attachment.course_second_category_id]
 
       attachment.save!
-
       origin_course.update_quotes(attachment)
     end
   end

app/services/users/update_account_service.rb

@@ -51,8 +51,10 @@ class Users::UpdateAccountService < ApplicationService
 
     if first_full_reward
       RewardGradeService.call(user, container_id: user.id, container_type: 'Account', score: 500)
-
-      sms_notify_admin(user.lastname) if user.user_extension.teacher?
+      if user.user_extension.teacher?
+        join_course(user.id,1309, 2)
+        sms_notify_admin(user.lastname)
+      end
     end
 
     user
@@ -73,4 +75,11 @@ class Users::UpdateAccountService < ApplicationService
   rescue => ex
     Util.logger_error(ex)
   end
+
+  def join_course(user_id, course_id, identity)
+    course = Course.find_by(id: course_id)
+    return unless course
+    attr = {course_id: course_id, role: identity, user_id: user_id}
+    CourseMember.create!(attr)
+  end
 end

app/services/videos/create_auth_service.rb

@@ -35,7 +35,7 @@ class Videos::CreateAuthService < ApplicationService
 
   def upload_video_result
     AliyunVod::Service.create_upload_video(title, filename, params)
-  rescue AliyunVod::Error => _
-    raise Error, '获取视频上传凭证失败'
+  rescue AliyunVod::Error => ex
+    raise Error, ex.message || '获取视频上传凭证失败'
   end
 end

app/views/attachment_histories/_attachment_history.json.jbuilder

@@ -6,4 +6,5 @@ json.publish_time attachment.publish_time
 json.quotes attachment.quotes_count
 json.downloads_count attachment.downloads_count
 json.created_on attachment.created_on
-json.url attachment_path(attachment, type: 'history')
+json.url attachment_path(attachment, type: 'history').gsub("/api","")
+json.is_pdf attachment.is_history_pdf?

app/views/attachments/_attachment_small.json.jbuilder

@@ -2,4 +2,5 @@ json.id attachment.id
 json.title attachment.title
 json.filesize number_to_human_size(attachment.filesize)
 json.url download_url(attachment)
-json.created_on attachment.created_on
+json.created_on attachment.created_on
+json.is_pdf attachment.is_pdf?

app/views/files/histories.json.jbuilder

@@ -1,3 +1,3 @@
-json.is_pdf @is_pdf
+
 json.partial! 'attachments/attachment_small', attachment: @file
 json.partial! "attachment_histories/list", attachment_histories: @attachment_histories

app/views/subjects/show.json.jbuilder

@@ -22,4 +22,26 @@ if @subject.excellent
     json.course_identity @user.course_identity(course)
     json.course_status subject_course_status course
   end
+end
+
+
+json.members @members do |member|
+  json.partial! 'subject_member', locals: { user: member.user }
+  json.role member.role
+end
+
+# 技能标签
+json.tags @tags do |tag|
+  unless tag.blank?
+    json.tag_name tag
+    json.status @user_tags.include?(tag)
+  end
+end
+
+# 我的进展
+json.progress do
+  json.my_score @subject.my_subject_score
+  json.all_score @subject.all_score
+  json.learned @subject.my_subject_progress
+  json.time  @subject.my_consume_time
 end

lib/tasks/excellent_course_exercise.rake

@@ -1,19 +1,186 @@
 #coding=utf-8
-# 执行示例  bundle exec rake excellent_course_exercise:student_answer args=149,2903
+# 执行示例  bundle exec rake excellent_course_exercise:student_answer args=2933,1042,823
+# args 第一个是course_id, 第二个是参与人数， 第三个是通过人数
 desc "同步精品课的学生试卷数据"
 namespace :excellent_course_exercise do
+  if ENV['args']
+    course_id = ENV['args'].split(",")[0] # 对应课堂的id
+    participant_count = ENV['args'].split(",")[1].to_i # 表示参与人数
+    pass_count = ENV['args'].split(",")[2].to_i # 表示通过人数
+  end
+
   task :student_answer => :environment do
 
-    course = Course.find_by(id: 2933)
-    exercises = course.exercises
+    course = Course.find_by(id: course_id)
+
+    course.exercises.each_with_index do |exercise, index|
+      # 第一个试卷的参与人数和通过人数都是传的数据，后续的随机
+      if index == 0
+        members = course.students.order("id asc").limit(participant_count)
+        update_exercise_user(exercise, members, pass_count)
+      else
+        new_participant_count = rand((participant_count - 423)..participant_count)
+        new_pass_count = rand((new_participant_count - 113)..new_participant_count)
+
+        members = course.students.order("id asc").limit(new_participant_count)
+        update_exercise_user(exercise, members, new_pass_count)
+      end
+    end
+  end
+
+  def update_exercise_user exercise, members, pass_count
+    exercise_question_ids = exercise.exercise_questions.where(question_type: 0).pluck(:id)
+
+    # index < pass_count 之前的学生都是通关的，之后的未通过
+    members.each_with_index do |member, index|
+      exercise_user = exercise.exercise_users.where(user_id: member.user_id).take
+      if exercise_question_ids.length == 20
+        rand_num = index < pass_count - 1 ? 20 : rand(1..16)
+      elsif exercise_question_ids.length == 17
+        rand_num = index < pass_count - 1 ? rand(13..17) : rand(1..11)
+      else
+        rand_num = exercise_question_ids.length
+      end
 
-    participant_count = 1042
-    pass_count = 823
+      if exercise_user && exercise_user.commit_status == 0
+        exercise_question_ids = exercise_question_ids.sample(rand_num)
+        questions = exercise.exercise_questions.where(id: exercise_question_ids)
+        create_exercise_answer questions, member.user_id
 
-    members_1 = course.students.order("id asc").limit(987)
-    members_2 = course.students.order("id asc").limit(1042)
-    members_1 = course.students.order("id asc").limit(322)
+        total_score = calculate_student_score(exercise, member.user)
+        commit_option = {
+          :status => 1,
+          :commit_status => 1,
+          :start_at => exercise.publish_time,
+          :end_at => exercise.end_time,
+          :objective_score => total_score,
+          :score => total_score,
+          :subjective_score => 0
+        }
+        exercise_user.update_columns(commit_option)
+      end
+    end
+  end
 
+  def create_exercise_answer questions, user_id
+    questions.each do |question|
+      choice_position = question.exercise_standard_answers.take&.exercise_choice_id
+      choice = question.exercise_choices.where(choice_position: choice_position).take
+
+      answer_option = {
+        :user_id => user_id,
+        :exercise_question_id => question.id,
+        :exercise_choice_id => choice&.id,
+        :answer_text => ""
+      }
+      ex_a = ExerciseAnswer.new(answer_option)
+      ex_a.save!
+    end
+  end
 
+  #计算试卷的总分和试卷的答题状态
+  def calculate_student_score(exercise,user)
+    score1 = 0.0 #选择题/判断题
+    score2 = 0.0 #填空题
+    score5 = 0.0  #实训题
+    total_score = 0.0
+    ques_stand = []  #问题是否正确
+    exercise_questions = exercise.exercise_questions.includes(:exercise_answers,:exercise_shixun_answers,:exercise_standard_answers,:exercise_shixun_challenges)
+    exercise_questions&.each do |q|
+      begin
+        if q.question_type != 5
+          answers_content = q.exercise_answers.where(user_id: user.id)  #学生的答案
+        else
+          answers_content = q.exercise_shixun_answers.where(user_id: user.id)  #学生的答案
+        end
+        if q.question_type <= 2  #为选择题或判断题时
+          if answers_content.present?   #学生有回答时
+            answer_choice_array = []
+            answers_content.each do |a|
+              answer_choice_array.push(a.exercise_choice.choice_position)  #学生答案的位置
+            end
+            user_answer_content = answer_choice_array.sort
+            standard_answer = q.exercise_standard_answers.pluck(:exercise_choice_id).sort  #该问题的标准答案，可能有多个
+            if user_answer_content == standard_answer  #答案一致,多选或单选才给分，答案不对不给分
+              if standard_answer.size > 0
+                q_score_1 = q.question_score
+                # q_score_1 = (q.question_score.to_f / standard_answer.count)   #当多选答案正确时，每个answer的分数均摊。
+              else
+                q_score_1 = 0.0
+              end
+              answers_content.update_all(:score => q_score_1)
+              score1 = score1 + q.question_score
+            else
+              answers_content.update_all(:score => -1.0)
+              score1 += 0.0
+            end
+          else
+            score1 += 0.0
+          end
+        elsif q.question_type == 5   #实训题时，主观题这里不评分
+          q.exercise_shixun_challenges&.each do |exercise_cha|
+            game = Game.user_games(user.id,exercise_cha.challenge_id)&.first  #当前用户的关卡
+            if game.present?
+              exercise_cha_score = 0.0
+              answer_status = 0
+              # if game.status == 2 && game.final_score >= 0
+              if game.final_score > 0
+                exercise_cha_score = game.real_score(exercise_cha.question_score)
+                # exercise_cha_score = exercise_cha.question_score #每一关卡的得分
+                answer_status = 1
+              end
+              ex_shixun_answer_content = answers_content&.where(exercise_shixun_challenge_id: exercise_cha.id)
+              code = nil
+              if exercise_cha.challenge&.path.present?
+                cha_path = challenge_path(exercise_cha.challenge&.path)
+                game_challenge = game.game_codes.search_challenge_path(cha_path)&.first
+                if game_challenge.present?
+                  game_code = game_challenge
+                  code = game_code.try(:new_code)
+                else
+                  code = git_fle_content(game.myshixun.repo_path,cha_path)
+                end
+              end
+              if ex_shixun_answer_content.blank?  #把关卡的答案存入试卷的实训里
+                ### Todo 实训题的_shixun_details里的代码是不是直接从这里取出就可以了？涉及到code的多个版本库的修改
+                sx_option = {
+                  :exercise_question_id => q.id,
+                  :exercise_shixun_challenge_id => exercise_cha.id,
+                  :user_id => user.id,
+                  :score => exercise_cha_score.round(1),
+                  :answer_text => code,
+                  :status => answer_status
+                }
+                ExerciseShixunAnswer.create(sx_option)
+              else
+                ex_shixun_answer_content.first.update_attributes(score:exercise_cha_score.round(1),answer_text:code)
+              end
+              score5 += exercise_cha_score
+            else
+              score5 += 0.0
+            end
+          end
+        end
+        user_scores = answers_content.blank? ? 0.0 : answers_content.score_reviewed.pluck(:score).sum
+        if user_scores > 0.0
+          stand_answer = 1
+        else
+          stand_answer = 0
+        end
+        ques_option = {
+          "q_id":q.id,   #该问题的id
+          "q_type":q.question_type,
+          "q_position":q.question_number, #该问题的位置
+          "stand_status":stand_answer,  #该问题是否正确,1为正确，0为错误
+          "user_score":user_scores.round(1)  #每个问题的总得分
+        }
+        ques_stand.push(ques_option)
+      rescue Exception => e
+        Rails.logger.info("calcuclate_score_have_error____________________________#{e}")
+        next
+      end
+    end
+    total_score = score1 + score2 + score5
+    total_score
   end
 end

lib/tasks/public_course.rake

@@ -9,10 +9,13 @@
 
 desc "同步精品课数据"
 namespace :public_course do
-  subject_id = ENV['args'].split(",")[0] # 对应课程的id
-  course_id = ENV['args'].split(",")[1] # 对应课堂的id
-  status = ENV['args'].split(",")[2] # 表示相应的期数
-  type = ENV['args'].split(",")[3] # 表示课程模块
+  if ENV['args']
+    subject_id = ENV['args'].split(",")[0] # 对应课程的id
+    course_id = ENV['args'].split(",")[1] # 对应课堂的id
+    status = ENV['args'].split(",")[2] # 表示相应的期数
+    type = ENV['args'].split(",")[3] # 表示课程模块
+  end
+
 
   if status.to_i == 1
     start_time = '2018-12-16'
@@ -65,14 +68,56 @@ namespace :public_course do
 
 
   # 更新某个课程的某类时间
-  # 执行示例  bundle exec rake public_course:student tiems=149,2903
+  # 执行示例  bundle exec rake public_course:student args=2903,1
   task :time => :environment do
-    course_id = ENV['args'].split(",")[0] # 对应课堂的id
-    satus = ENV['args'].split(",")[1]
+    # course_id = ENV['args'].split(",")[0] # 对应课堂的id
+    # type = ENV['args'].split(",")[1]
 
     course = Course.find(course_id)
 
-    hour = (6..24).to_a.sample(1).first
+    case type.to_i
+    when 1
+      # 讨论区
+
+    when 2
+      # 作业
+        course.homework_commons.each do |homework|
+        created_at = random_time(start_time, end_time)
+        publish_time = random_larger_time created_at, start_time, end_time
+        end_time = random_larger_time publish_time, start_time, end_time
+        updated_at = end_time
+
+        homework.update_columns(publish_time: publish_time, end_time: end_time, created_at: created_at, updated_at: updated_at)
+        homework.homework_detail_manual.update_columns(comment_status: 6, created_at: created_at, updated_at: updated_at)
+      end
+    when 3
+      # 试卷
+      course.exercises.each do |exercise|
+        created_at = random_time start_time, end_time
+        publish_time = random_larger_time created_at, start_time, end_time
+        end_time = random_larger_time publish_time, start_time, end_time
+        updated_at = end_time
+
+        exercise.update_columns(publish_time: publish_time, end_time: end_time, created_at: created_at, updated_at: updated_at, exercise_status: 3)
+      end
+    when 4
+      # 资源
+      course.attachments.each do |atta|
+        created_on = random_time start_time, end_time
+
+        atta.update_columns(is_publish: 1, created_on: created_on, publish_time: created_on)
+      end
+    end
+
+  end
+
+  def min_swith(time)
+    puts time
+    return time < 9 ? "0#{time}" : time
+  end
+
+  def random_time(start_time, end_time)
+    hour = (6..23).to_a.sample(1).first
     min = rand(60)
     sec = rand(60)
 
@@ -83,17 +128,15 @@ namespace :public_course do
     time = "#{date} #{min_swith(hour)}:#{min_swith(min)}:#{min_swith(sec)}"
 
     puts time
-    case type
-    when 1
-      # 讨论区
-
-    end
-
+    time
   end
 
-  def min_swith(time)
-    puts time
-    return time < 9 ? "0#{time}" : time
+  def random_larger_time(time, start_time, end_time)
+    large_time = random_time(start_time, end_time)
+    while large_time <= time
+      large_time = random_time(start_time, end_time)
+    end
+    large_time
   end
 end
 

lib/tasks/public_message.rake

@@ -0,0 +1,37 @@
+# bundle exec rake sync:public_message args=149,2903
+namespace :sync do
+  task :public_message => :environment do
+    subject_id = ENV['args'].split(",")[0] # 对应课程的id
+    board_id = ENV['args'].split(",")[1]
+    message_id = ENV['args'].split(",")[2]
+    status = ENV['args'].split(",")[3] # 表示相应的期数
+
+    if status.to_i == 1
+      start_time = '2018-12-16'
+      end_time = '2019-04-01'
+    elsif status.to_i == 2
+      start_time = '2019-04-07'
+      end_time = '2019-07-28'
+    else
+      # 这种情况是取所有的
+      start_time = '2015-01-01'
+      end_time = '2022-07-28'
+    end
+
+    shixun_ids = Shixun.find_by_sql("select shixun_id from stage_shixuns where stage_id in (select id from stages where
+                                     subject_id=#{subject_id}) ").map(&:shixun_id)
+
+
+    discusses = Discuss.where(dis_id: shixun_ids).where("created_at >? and created_at <?", start_time, end_time)
+    if discusses.present?
+      discusses.find_each do |discuss|
+        puts discuss.user_id
+        puts board_id
+        puts message_id
+        new_message = Message.create!(board_id: board_id.to_i, author_id: discuss.user_id, parent_id: message_id, root_id: message_id)
+        MessageDetail.create!(message_id: new_message.id, content: discuss.try(:content))
+      end
+    end
+
+  end
+end

lib/tasks/publick_course.rake

@@ -1,28 +0,0 @@
-#coding=utf-8
-# 执行示例  bundle exec rake public_course:student args=149,2903
-# args 第一个参数是subject_id，第二个参数是课程course_id
-
-desc "同步精品课数据"
-namespace :public_course do
-  task :student => :environment do
-
-
-    subject_id = ENV['args'].split(",").first
-    course_id = ENV['args'].split(",").last
-    puts "subject_id is #{subject_id}"
-    puts "course_id is #{course_id}"
-
-    user_ids = Myshixun.find_by_sql("select distinct(user_id) from myshixuns where shixun_id in (select shixun_id from stage_shixuns
-                                     where stage_id in (select id from stages where subject_id=#{subject_id}))").map(&:user_id)
-    puts user_ids
-    if user_ids.present?
-      user_ids.each do |user_id|
-        puts user_id
-        unless CourseMember.exists?(course_id: course_id, user_id: user_id)
-          CourseMember.create!(course_id: course_id, user_id: user_id, role: 4)
-          CourseAddStudentCreateWorksJob.perform_later(course_id, [user_id])
-        end
-      end
-    end
-  end
-end

public/react/config/webpack.config.dev.js

@@ -29,7 +29,7 @@ const env = getClientEnvironment(publicUrl);
 module.exports = {
   // You may want 'eval' instead if you prefer to see the compiled output in DevTools.
   // See the discussion in https://github.com/facebookincubator/create-react-app/issues/343.s
-	devtool: "cheap-module-eval-source-map",
+	// devtool: "cheap-module-eval-source-map",
 	// 开启调试
   // These are the "entry points" to our application.
   // This means they will be the "root" imports that are included in JS bundle.

public/react/src/modules/courses/Resource/Fileslistitem.js

@@ -36,22 +36,39 @@ class Fileslistitem extends Component{
                 course_id:coursesId
             },
         }).then((result)=>{
-            if(result.data.attachment_histories.length===0){
+
+						if(result.data.attachment_histories.length===0){
+							if(result.data.is_pdf===true){
+								//预览pdf
+								axios({
+									method:'get',
+								  url:result.data.url,
+									responseType: 'arraybuffer',
+								}).then((result)=>{
+										var binaryData = [];
+										binaryData.push(result.data);
+										 this.url =window.URL.createObjectURL(new Blob(binaryData, {type:"application/pdf"}));
+										window.open(this.url);
+									})
+							}else{
 							let link = document.createElement('a');
 							document.body.appendChild(link);
-							link.href = result.data.url;
+							link.href = "/api"+result.data.url;
 							link.download = result.data.title;
 							//兼容火狐浏览器
 							let evt = document.createEvent("MouseEvents");
 							evt.initEvent("click", false, false);
 							link.dispatchEvent(evt);
 							document.body.removeChild(link);
+							}
 						}else{
-                this.setState({
-                    Showoldfiles:true,
-                    allfiles:result.data
-                })
-            }
+							this.setState({
+								Showoldfiles:true,
+								allfiles:result.data
+							})
+						}
+
+
         }).catch((error)=>{
             console.log(error)
         })
@@ -144,6 +161,7 @@ class Fileslistitem extends Component{
 								loadtype={this.state.Loadtype}
 							/>:""}
                 <Showoldfiles
+									  {...this.props}
                     visible={this.state.Showoldfiles}
                     allfiles={this.state.allfiles}
                     closaoldfilesprops={this.closaoldfilesprops}

public/react/src/modules/courses/Resource/index.js

@@ -757,6 +757,7 @@ class Fileslists extends Component{
               setupdate={(id)=>this.seactall(id)}
               Cancel={this.Cancelvisible}
               has_course_groups={this.state.has_course_groups}
+							attachmentId={this.state.coursesecondcategoryid}
           />:""}
 
             <Titlesearchsection

public/react/src/modules/courses/coursesPublic/SelectSetting.js

@@ -220,12 +220,13 @@ class Selectsetting extends Component{
 
 
 		let coursesId=this.props.match.params.coursesId;
-		let attachmentId=this.props.match.params.attachmentId;
+		let attachmentId=this.props.attachmentId;
 	  let url="/files/"+this.props.discussMessageid+".json";
 		//
 		axios.put(url,{
 			course_id:coursesId,
 			new_attachment_id:newfileList.length===0?undefined:newfileList,
+			course_second_category_id:this.props.coursesidtype===undefined||this.props.coursesidtype==="node"?0:attachmentId,
 			is_public:is_public,
 			is_unified_setting:unified_setting,
 			publish_time:unified_setting===true?datatime===undefined?moment(new Date()).format('YYYY-MM-DD HH'):datatime:undefined,

public/react/src/modules/courses/coursesPublic/Showoldfiles.js

@@ -42,6 +42,18 @@ class Showoldfiles extends Component{
    this.props.closaoldfilesprops()
 	}
 
+	showfiless=(url)=>{
+		axios({
+			method:'get',
+			url:url,
+			responseType: 'arraybuffer',
+		}).then((result)=>{
+			var binaryData = [];
+			binaryData.push(result.data);
+			this.url =window.URL.createObjectURL(new Blob(binaryData, {type:"application/pdf"}));
+			window.open(this.url);
+		})
+	}
 	render(){
 		let {visible,allfiles}=this.props;
 
@@ -175,7 +187,10 @@ class Showoldfiles extends Component{
 												<div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" id={allfiles.id}>
 
 													<li className="fl fontlefts">
-														<a className={"isabox"} href={allfiles.url}>{allfiles.title}</a>
+														{allfiles.is_pdf===false?
+														<a className={"isabox"} href={"/api"+allfiles.url} >{allfiles.title}</a>:
+															<a className={"isabox"} onClick={()=>this.showfiless(allfiles.url)} >{allfiles.title}</a>
+														}
 														<span className={"newcolor-orange fl"}>当前版本</span>
 													</li>
 
@@ -191,7 +206,11 @@ class Showoldfiles extends Component{
 																<div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" id={item.id} key={key}>
 
 																	<li className="fl fontlefts">
-																		<a  className={"isabox"} href={item.url}>{item.title}</a>
+
+																		{item.is_pdf===false?
+																			<a  className={"isabox"} href={"/api"+item.url}>{item.title}</a>:
+																			<a className={"isabox"} onClick={()=>this.showfiless(item.url)} >{item.title}</a>
+																		}
 																	</li>
 
 																	<li className="fl filesves ">