diff --git a/Gemfile.lock b/Gemfile.lock index 20107dba6..355ca422d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -96,6 +96,8 @@ GEM execjs (2.2.1) factory_girl (4.4.0) activesupport (>= 3.0.0) + faker (1.4.3) + i18n (~> 0.5) fastercsv (1.5.5) ffi (1.9.3) ffi (1.9.3-x86-mingw32) @@ -314,6 +316,7 @@ DEPENDENCIES coderay (~> 1.0.6) coffee-rails (~> 3.2.1) factory_girl (~> 4.4.0) + faker fastercsv (~> 1.5.0) grape (~> 0.9.0) grape-entity diff --git a/app/api/mobile/api.rb b/app/api/mobile/api.rb index 8226a1020..ccf155a92 100644 --- a/app/api/mobile/api.rb +++ b/app/api/mobile/api.rb @@ -1,5 +1,5 @@ module Mobile - + require_relative 'middleware/error_handler' class API < Grape::API version 'v1', using: :path format :json @@ -33,7 +33,7 @@ module Mobile mount Apis::Homeworks #add_swagger_documentation ({api_version: 'v1', base_path: 'http://u06.shellinfo.cn/trustie/api'}) - add_swagger_documentation ({api_version: 'v1', base_path: '/api'}) + add_swagger_documentation ({api_version: 'v1', base_path: '/api'}) if Rails.env.development? end end diff --git a/db/schema.rb b/db/schema.rb index 74ba6d652..98476f9dd 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -12,7 +12,6 @@ # It's strongly recommended to check this file into your version control system. ActiveRecord::Schema.define(:version => 20150123020615) do ->>>>>>> szzh create_table "activities", :force => true do |t| t.integer "act_id", :null => false