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

app/controllers/users/videos_controller.rb

@@ -40,6 +40,8 @@ class Users::VideosController < Users::BaseController
   def batch_publish
     Videos::BatchPublishService.call(observed_user, batch_publish_params)
     render_ok
+  rescue Videos::BatchPublishService::Error => ex
+    render_error(ex.message)
   end
 
   private

app/models/course_group.rb

@@ -8,7 +8,7 @@ class CourseGroup < ApplicationRecord
   has_many :homework_group_reviews, :dependent => :destroy
   scope :by_group_ids, lambda { |ids| where(id: ids)}
 
-  validates :name, length: { maximum: 20 }
+  validates :name, length: { maximum: 60 }
 
   after_create :generate_invite_code
 

app/services/videos/batch_publish_service.rb

@@ -1,4 +1,6 @@
 class Videos::BatchPublishService < ApplicationService
+  Error = Class.new(StandardError)
+
   attr_reader :user, :params
 
   def initialize(user, params)
@@ -16,6 +18,8 @@ class Videos::BatchPublishService < ApplicationService
         video = user.videos.find_by(uuid: param[:video_id])
         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
         video.apply_publish
         video.save!

app/views/exercise_questions/_exercise_questions.json.jbuilder

@@ -17,7 +17,8 @@ if question.question_type <= 2  #当为选择题或判断题时，只显示选
   end
   json.question_choices do
     json.array! exercise_choices.each_with_index.to_a do |a,index|
-      standard_answer_b = standard_answers_array.include?(a.choice_position)
+      #TODO: 旧版本来一个题只有一个标准答案的，新版又做成了一个题有多个标准答案（exercise_choice_id存放的是标准答案的位置..）
+      standard_answer_b = standard_answers_array.join("").include?(a.choice_position.to_s)
       user_answer_b = user_answer.include?(a.id)
       json.c_position (index+1) if ex_choice_random_boolean  #当选项随机时，选项位置以此为准，否则不出现
       json.choice_id a.id

public/react/src/App.js

@@ -274,6 +274,11 @@ class App extends Component {
 		// }, (error) => {
 		// 	//TODO 这里如果样式变了会出现css不加载的情况
 		// });
+
+		window.addEventListener('error', (event) => {
+			const msg = `${event.type}: ${event.message}`;
+			console.log(msg)
+		});
 	}
 	//修改登录方法
 	Modifyloginvalue=()=>{

public/react/src/common/UrlTool.js

@@ -13,7 +13,7 @@ export function getImageUrl(path) {
 export function setImagesUrl(path){
 	const local = 'http://47.96.87.25:48080'
 	let firstStr=path.substr(0,1);
-	console.log(firstStr);
+	// console.log(firstStr);
 	if(firstStr=="/"){
 		return isDev?`${local}${path}`:`${path}`;
 	}else{

public/react/src/modules/courses/busyWork/CommonWorkPost.js

@@ -278,7 +278,7 @@ class CommonWorkPost extends Component{
   }
   // 附件相关 START
   handleChange = (info) => {
-    if (info.file.status === 'uploading') {
+    if (info.file.status === 'uploading' || info.file.status === 'done') {
       let fileList = info.fileList;
 
       this.setState({ fileList: appendFileSizeToUploadFileAll(fileList) });