加入api在线文档
This commit is contained in:
parent
70bc6acbd2
commit
5eba06ddf9
|
@ -17,3 +17,4 @@
|
||||||
/config/configuration.yml
|
/config/configuration.yml
|
||||||
.rbenv-gemsets
|
.rbenv-gemsets
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
public/api_doc/
|
||||||
|
|
1
Gemfile
1
Gemfile
|
@ -20,6 +20,7 @@ gem "builder", "3.0.0"
|
||||||
gem 'acts-as-taggable-on', '2.4.1'
|
gem 'acts-as-taggable-on', '2.4.1'
|
||||||
|
|
||||||
group :development do
|
group :development do
|
||||||
|
gem 'grape-swagger'
|
||||||
gem 'puma'
|
gem 'puma'
|
||||||
gem 'better_errors', path: 'lib/better_errors'
|
gem 'better_errors', path: 'lib/better_errors'
|
||||||
gem 'rack-mini-profiler', path: 'lib/rack-mini-profiler'
|
gem 'rack-mini-profiler', path: 'lib/rack-mini-profiler'
|
||||||
|
|
|
@ -110,6 +110,9 @@ GEM
|
||||||
grape-entity (0.4.4)
|
grape-entity (0.4.4)
|
||||||
activesupport
|
activesupport
|
||||||
multi_json (>= 1.3.2)
|
multi_json (>= 1.3.2)
|
||||||
|
grape-swagger (0.8.0)
|
||||||
|
grape
|
||||||
|
grape-entity
|
||||||
guard (2.6.1)
|
guard (2.6.1)
|
||||||
formatador (>= 0.2.4)
|
formatador (>= 0.2.4)
|
||||||
listen (~> 2.7)
|
listen (~> 2.7)
|
||||||
|
@ -307,6 +310,7 @@ DEPENDENCIES
|
||||||
fastercsv (~> 1.5.0)
|
fastercsv (~> 1.5.0)
|
||||||
grape (~> 0.9.0)
|
grape (~> 0.9.0)
|
||||||
grape-entity
|
grape-entity
|
||||||
|
grape-swagger
|
||||||
guard-rails (~> 0.5.3)
|
guard-rails (~> 0.5.3)
|
||||||
guard-spork (~> 1.5.1)
|
guard-spork (~> 1.5.1)
|
||||||
guard-test (~> 1.0.0)
|
guard-test (~> 1.0.0)
|
||||||
|
|
|
@ -28,6 +28,7 @@ module Mobile
|
||||||
mount Apis::Users
|
mount Apis::Users
|
||||||
mount Apis::Courses
|
mount Apis::Courses
|
||||||
|
|
||||||
|
add_swagger_documentation ({api_version: 'v1', base_path: '/api'})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -10,12 +10,12 @@ module Mobile
|
||||||
module Apis
|
module Apis
|
||||||
class Auth < Grape::API
|
class Auth < Grape::API
|
||||||
resource :auth do
|
resource :auth do
|
||||||
desc "Creates and returns access_token if valid login"
|
desc "用户登录"
|
||||||
params do
|
params do
|
||||||
requires :login, type: String, desc: 'Username or email'
|
requires :login, type: String, desc: 'Username or email'
|
||||||
requires :password, type: String, desc: 'Password'
|
requires :password, type: String, desc: 'Password'
|
||||||
end
|
end
|
||||||
post :login do
|
post do
|
||||||
user,last_logon = ::User.try_to_login(params[:login], params[:password])
|
user,last_logon = ::User.try_to_login(params[:login], params[:password])
|
||||||
if user
|
if user
|
||||||
::ApiKey.delete_all(user_id: user.id)
|
::ApiKey.delete_all(user_id: user.id)
|
||||||
|
@ -27,6 +27,16 @@ module Mobile
|
||||||
{status: 1, message: 'Unauthorized.'}
|
{status: 1, message: 'Unauthorized.'}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
desc "用户登出"
|
||||||
|
params do
|
||||||
|
end
|
||||||
|
delete do
|
||||||
|
authenticate!
|
||||||
|
::ApiKey.delete_all(user_id: current_user.id)
|
||||||
|
{status: 0}
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -40,7 +40,7 @@ module Mobile
|
||||||
authenticate!
|
authenticate!
|
||||||
us = UsersService.new
|
us = UsersService.new
|
||||||
begin
|
begin
|
||||||
ue = us.edit_user params
|
ue = us.edit_user params.merge(id: current_user.id)
|
||||||
{status: 0, data: ue}
|
{status: 0, data: ue}
|
||||||
rescue => e
|
rescue => e
|
||||||
{status: 1, message: e.message}
|
{status: 1, message: e.message}
|
||||||
|
|
Loading…
Reference in New Issue