merge from develop

This commit is contained in:
2022-02-22 10:38:42 +08:00
9 changed files with 197 additions and 23 deletions

View File

@@ -9,7 +9,6 @@ Rails.application.routes.draw do
# Serve websocket cable requests in-process
mount ActionCable.server => '/cable'
get 'attachments/entries/get_file', to: 'attachments#get_file'
get 'attachments/download/:id', to: 'attachments#show'
get 'attachments/download/:id/:filename', to: 'attachments#show'
@@ -25,7 +24,6 @@ Rails.application.routes.draw do
resources :edu_settings
scope '/api' do
resources :topics, only: [:index]
namespace :ci do
resources :languages, only: [:index, :show] do
collection do
@@ -147,16 +145,6 @@ Rails.application.routes.draw do
get :get_children_journals
end
end
resources :claims, only: [:index] do
collection do
post :create
delete :destroy
get :index
put :update
end
end
resources :issue_times, only: [:create] do
collection do
post :end_work
@@ -385,6 +373,7 @@ Rails.application.routes.draw do
resource :bind_user, only: [:create]
resources :hot_keywords, only: [:index]
resources :notices, only: [:create]
namespace :weapps do
resource :home, only: [:show]
@@ -683,16 +672,6 @@ Rails.application.routes.draw do
namespace :admins do
mount Sidekiq::Web => '/sidekiq'
get '/', to: 'dashboards#index'
namespace :topic do
resources :activity_forums
resources :banners
resources :cards
resources :cooperators
resources :excellent_projects
resources :experience_forums
resources :pinned_forums
end
resources :project_statistics, only: [:index] do
collection do
get :visits_static