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

* 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder:
  ..
  调整bd引入方式
  权限调整

config/application.rb

@@ -38,6 +38,7 @@ module Educoderplus
         origins '*'
         # location of your api
         resource '/*', :headers => :any, :methods => [:get, :post, :delete, :options, :put]
+        resource 'http://outin-396971199eed11e991a100163e1c7426.oss-cn-shanghai.aliyuncs.com/*', :headers => :any, :methods => [:get, :post, :delete, :options, :put]
       end
     end
   end

public/react/scripts/build.js

@@ -209,7 +209,9 @@ function generateNewIndexJsp() {
             } else if (window.location.host == 'www.educoder.net') {
                 _host = 'https://ali-cdn.educoder.net/react/build/'
             }
+            
             document.write('<script type="text/javascript" src="' + _host + 'js/js_min_all.js"><\\/script>');
+            document.write('<script type="text/javascript" src="' + _host + 'js/flv.min.js"><\\/script>');
             document.write('<script type="text/javascript" src="' + _host + 'static/js/main.${matchResult[1]}.js"><\\/script>');
          })()
       </script>

public/react/src/modules/user/usersInfo/video/VideoUploadList.js

@@ -74,7 +74,10 @@ function VideoUploadList (props) {
             clearInput()
             return;
         }
-        if (file.size >(parseInt(MAX_FILE_SIZE) * 1024 * 1024)) {
+
+        if(props&&props.user.admin===true||props&&props.user.business===true){
+
+        }else if (file.size >(parseInt(MAX_FILE_SIZE) * 1024 * 1024)) {
             // 超过500m TODO
             clearInput()
             showNotification(`视频大小超过${MAX_FILE_SIZE}M`)