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

app/controllers/project_packages_controller.rb

@@ -1,7 +1,7 @@
 class ProjectPackagesController < ApplicationController
   include PaginateHelper
 
-  before_action :require_login, :check_auth, only: %i[create update destroy]
+  before_action :require_login, :check_auth, only: %i[show create update destroy]
 
   helper_method :current_package, :package_manageable?
 

app/controllers/tidings_controller.rb

@@ -1,6 +1,7 @@
 class TidingsController < ApplicationController
   include PaginateHelper
 
+  before_action :require_login
   after_action :update_onclick_time!, only: [:index]
 
   def index

app/views/games/picture_display.json.jbuilder

@@ -25,28 +25,33 @@ elsif @type == "txt"
 elsif @type =="qrcode"
   json.qrcode_str @qrcode_str
 elsif @type == "mp3" || @type == "mp4"
-  if @type == "mp4"
-    json.orignal_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378171/123.mp4"}]
-    json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378172/456.mp4"}]
-    json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378173/789.mp4"}]
-  else
-    json.orignal_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378174/58099.mp3"}]
-    json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175/654058514.mp3"}]
-    json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175/654058514.mp3"}]
-  end
-  # json.orignal_file do
-  #   json.array! @orignal_picture do |file|
-  #     json.file_url attachment_show_users_path(:file_name => file, :path => @original_path)
-  #   end
+  # if @type == "mp4"
+  #   json.orignal_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378171/123.mp4"}]
+  #   json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378172/456.mp4"}]
+  #   json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378173/789.mp4"}]
+  # else
+  #   json.orignal_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378174/58099.mp3"}]
+  #   json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175/654058514.mp3"}]
+  #   json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175/654058514.mp3"}]
   # end
+  json.orignal_file do
+    json.array! @orignal_picture do |file|
+      json.file_url attachment_show_users_path(:file_name => file, :path => @original_path)
+    end
+  end
   # json.user_file do
   #   json.array! @user_picture do |file|
   #     json.file_url attachment_show_users_path(:file_name => file, :path => @user_path, :time => Time.now.to_i)
   #   end
   # end
-  # json.answer_file do
-  #   json.array! @answer_picture do |file|
-  #     json.file_url attachment_show_users_path(:file_name => file, :path => @answer_path)
-  #   end
-  # end
+  if @type == "mp4"
+    json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378172/456.mp4"}]
+  else
+    json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175/654058514.mp3"}]
+  end
+  json.answer_file do
+    json.array! @answer_picture do |file|
+      json.file_url attachment_show_users_path(:file_name => file, :path => @answer_path)
+    end
+  end
 end

app/views/libraries/show.json.jbuilder

@@ -38,7 +38,7 @@ json.operation do
 
     json.can_deletable manageable
     json.can_editable manageable
-    json.user_praised PraiseTread.exists?(user_id: current_user&.id)
+    json.user_praised library.praise_treads.exists?(user_id: current_user&.id)
   else
     json.can_deletable false
     json.can_editable false

app/views/tidings/_tiding.json.jbuilder

@@ -1,4 +1,5 @@
-json.extract! tiding, :id, :status, :viewed, :user_id, :tiding_type, :container_id, :container_type, :parent_container_id, :parent_container_type
+json.extract! tiding, :id, :status, :viewed, :user_id, :tiding_type, :container_id, :container_type,
+              :parent_container_id, :parent_container_type, :belong_container_id, :belong_container_type
 json.content tiding.content
 
 json.identifier tiding.identifier

public/react/src/common/components/media/Clappr.js

@@ -90,12 +90,19 @@ class Clappr extends Component{
       <React.Fragment>
         {/* https://github.com/CookPete/react-player/issues/686 */}
         <ReactPlayer url={source} playing={false} controls={true} width={400} height={ type == 'mp3' ? 55 : 290}/>
+        
         {/* <style>{`
             .playback_rate {
                 margin-right: 16px;
             }
         `}</style>
         <div id={_id} className={className + ' ' + type}></div> */}
+
+        {/* 原生 */}
+        {/* { type == 'mp3' ? <audio src={source} preload controls></audio>
+        : <video src={source} controls="controls">
+          您的浏览器不支持 video 标签。
+        </video>} */}
       </React.Fragment>
     )
   }