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

app/controllers/challenges_controller.rb

@@ -227,8 +227,10 @@ class ChallengesController < ApplicationController
             @challenge.update_attributes(picture_path: nil, web_route: nil, expect_picture_path: nil, original_picture_path: nil)
           end
           # 关卡评测执行文件如果被修改，需要修改脚本内容
-          script = modify_shixun_script @shixun, @shixun.evaluate_script
-          @shixun.shixun_info.update_column(:evaluate_script, script)
+          unless @shixun.published
+            script = modify_shixun_script @shixun, @shixun.evaluate_script
+            @shixun.shixun_info.update_column(:evaluate_script, script)
+          end
           # TODO:
           # if path != params[:challenge][:path]
           #   shixun_modify_status_without_publish(@shixun, 1)

app/services/videos/batch_publish_service.rb

@@ -17,20 +17,22 @@ class Videos::BatchPublishService < ApplicationService
     ActiveRecord::Base.transaction do
       video_params.each do |param|
         video = user.videos.find_by(uuid: param[:video_id])
+        Rails.logger.info("video.processing_video_apply:#{video}")
+        Rails.logger.info("video.processing_video_apply:#{video.blank? || video.processing_video_apply}")
         next if video.blank? || video.processing_video_apply.present?
 
         raise Error, '视频还未上传完成' if video.vod_uploading?
 
         video.title = param[:title].to_s.strip.presence || video.title
-        if param[:course_id].present?
-          video.publish
-        else
-          video.apply_publish
-        end
+        video.apply_publish
 
         video.save!
 
-        video.video_applies.create!
+        if param[:course_id].present?
+          video.video_applies.create!(status: "agreed")
+        else
+          video.video_applies.create!
+        end
 
         video_ids << video.id