From 0d8de9537aa9d7a81847a03aef7ba144e8cba0ca Mon Sep 17 00:00:00 2001 From: p31729568 Date: Sat, 17 Aug 2019 15:35:31 +0800 Subject: [PATCH 1/3] modify per_page max 100 --- app/controllers/users/base_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/users/base_controller.rb b/app/controllers/users/base_controller.rb index eb6b98048..01ddee8fc 100644 --- a/app/controllers/users/base_controller.rb +++ b/app/controllers/users/base_controller.rb @@ -37,7 +37,7 @@ class Users::BaseController < ApplicationController end def per_page_value - params[:per_page].to_i > 0 && params[:per_page].to_i < 50 ? params[:per_page].to_i : 20 + params[:per_page].to_i > 0 && params[:per_page].to_i <= 100 ? params[:per_page].to_i : 20 end alias_method :limit_value, :per_page_value From 29ab7e95c2c0e4c1e61b8368da8e0f77d2aea68a Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Sat, 17 Aug 2019 15:41:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=B4=E9=83=A8=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/tpm/NewHeader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index a6a849183..dff749515 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -727,7 +727,7 @@ submittojoinclass=(value)=>{ src={require('./roundedRectangle.png')} /> -
  • 教学案例
  • +
  • 教学案例
  • 众包创新
  • From 95c8f28a74b14fd203f8975adb75a16ed73f0603 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Sat, 17 Aug 2019 15:51:50 +0800 Subject: [PATCH 3/3] video feature: modify refresh auth api --- app/controllers/users/video_auths_controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/users/video_auths_controller.rb b/app/controllers/users/video_auths_controller.rb index a7d41bce5..2231dcfdf 100644 --- a/app/controllers/users/video_auths_controller.rb +++ b/app/controllers/users/video_auths_controller.rb @@ -10,7 +10,9 @@ class Users::VideoAuthsController < Users::BaseController def update video = observed_user.videos.find_by(uuid: params[:video_id]) - return render_error('该视频凭证不存在') if video.blank? + if video.blank? + video = observed_user.videos.create!(uuid: params[:video_id], title: params[:title], cover_url: params[:cover_url]) + end result = AliyunVod::Service.refresh_upload_video(video.uuid) render_ok(data: result)