Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/educoder into develop

app/controllers/ecloud_controller.rb

@@ -262,7 +262,7 @@ class EcloudController < ApplicationController
         u.login = "ecoder_#{user_info['mobile']}"
         u.type ='User'
         u.status = User::STATUS_ACTIVE
-        u.nickname = user_info[:username]
+        u.nickname = user_info['username']
         u.lastname = user_info['username']
       end
       

lib/tasks/get_video_data.rake

@@ -29,6 +29,24 @@ namespace :video do
     end
   end
 
+  desc "将http修改成http"
+  task modify_http_to_https_file_url: :environment do
+    p "s"
+    if ENV['args']
+      course_id = ENV['args'].split(",")[0]
+      video_ids = CourseVideo.where(course_id: course_id).pluck(:video_id)
+      videos = Video.where(id: video_ids)
+      if videos
+        videos.each do |v|
+          if v.file_url
+            file_url = v.file_url.gsub("http:", "https:")
+            v.update_column(:file_url, file_url)
+          end
+        end
+      end
+    end
+  end
+
   # 执行示例  bundle exec rake video:sample args=2933,'2019-08-19 00:00:00','2019-11-09 23:59:59'
   task :sample => :environment do
     if ENV['args']

public/react/scripts/build.js

@@ -217,9 +217,11 @@ function generateNewIndexJsp() {
       </script>
     `
     var jsMinAllRegex = /<script type="text\/javascript" src="\/js\/js_min_all.js"><\/script>/
+    var flvMinAllRegex = /<script type="text\/javascript" src="\/js\/flv.min.js"><\/script>/
     // <script type="text/javascript" src="/js/js_min_all.js"></script>
     var result = data
         .replace(jsMinAllRegex, code)
+        .replace(flvMinAllRegex, code)
         // .replace('/js/js_min_all.js', `${cdnHost}/react/build/js/js_min_all.js?v=${newVersion}`)
         // .replace('/js/js_min_all_2.js', `${cdnHost}/react/build/js/js_min_all_2.js?v=${newVersion}`)
 

public/react/src/modules/courses/Video/video-play/flv-player.jsx

@@ -9,6 +9,7 @@ export default ({ url }) => {
       player = window.flvjs.createPlayer({
         type: 'flv',
         volume: 0.8,
+        cors: true,
         url,
         muted: false
       })