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

config/routes.rb

@@ -7,9 +7,6 @@ Rails.application.routes.draw do
   get 'attachments/download/:id', to: 'attachments#show'
   get 'attachments/download/:id/:filename', to: 'attachments#show'
 
-  get '/auth/qq/callback', to: 'oauth/qq#create'
-  get '/auth/wechat/callback', to: 'oauth/wechat#create'
-
   resources :edu_settings
   scope '/api' do
     get 'home/index'
@@ -828,6 +825,9 @@ Rails.application.routes.draw do
     end
     resource :template, only: [:show]
     resource :setting, only: [:show]
+
+    get '/auth/qq/callback', to: 'oauth/qq#create'
+    get '/auth/wechat/callback', to: 'oauth/wechat#create'
     resource :bind_user, only: [:create]
   end