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

app/controllers/shixuns_controller.rb

@@ -3,7 +3,7 @@ class ShixunsController < ApplicationController
 	include ApplicationHelper
 
 	before_action :require_login, :check_auth, except: [:download_file, :index, :menus, :show, :show_right, :ranking_list,
-																											:discusses, :collaborators, :fork_list, :propaedeutics]
+																											:discusses, :collaborators, :fork_list, :propaedeutics, :add_file]
 	before_action :check_account, only: [:new, :create, :shixun_exec]
 
 

config/routes.rb

@@ -198,6 +198,7 @@ Rails.application.routes.draw do
         post :file_content
         post :update_file
         post :close
+        post :add_file
         get :fork_list
         post :update_propaedeutics
         get :add_collaborators