Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

config/application.rb

@@ -38,7 +38,6 @@ 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