diff --git a/README.md b/README.md index 9aeb633d2..fedd75c2a 100644 --- a/README.md +++ b/README.md @@ -1148,16 +1148,13 @@ POST /api/projects/:id/watchers/follow ``` *示例* ``` -curl -X POST \ --d "login=18816895620" \ -http://localhost:3000/api/projects/mirror_demo/watchers/follow | jq +curl -X POST http://localhost:3000/api/projects/3263/watchers/follow | jq ``` *请求参数说明:* |参数名|必选|类型|说明| -|-|-|- -|id |是|string |项目标识(identifier) | -|login |是|string |用户标识/登录名(login) | +|id |是|int |项目id | *返回参数说明:* @@ -1182,16 +1179,13 @@ DELETE /api/projects/:id/watchers/unfollow ``` *示例* ``` -curl -X DELETE \ --d "login=18816895620" \ -http://localhost:3000//api/projects/mirror_demo/watchers/unfollow | jq +curl -X DELETE http://localhost:3000//api/projects/3263/watchers/unfollow | jq ``` *请求参数说明:* |参数名|必选|类型|说明| -|-|-|- -|id |是|string |项目标识(identifier) | -|login |是|string |用户标识/登录名(login) | +|id |是|int |项目id | *返回参数说明:* @@ -1217,17 +1211,15 @@ GET /api/projects/:id/watchers *示例* ``` curl -X GET \ --d "login=18816895620" \ -d "page=1" \ -d "limit=5" \ -http://localhost:3000//api/projects/mirror_demo/watchers | jq +http://localhost:3000//api/projects/3263/watchers | jq ``` *请求参数说明:* |参数名|必选|类型|说明| -|-|-|- -|id |是|string |项目标识(identifier) | -|login |是|string |用户标识/登录名(login) | +|id |是|int |项目id | |page |否|string |页数,第几页 | |limit |否|string |每页多少条数据,默认15条 | diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb index f018959ee..d9a8e898c 100644 --- a/app/controllers/watchers_controller.rb +++ b/app/controllers/watchers_controller.rb @@ -1,6 +1,6 @@ class WatchersController < ApplicationController before_action :require_login, except: %i[index] - before_action :find_user, :set_project + before_action :set_project def index scope = @project.watchers.includes(:user) @@ -33,8 +33,9 @@ class WatchersController < ApplicationController private def set_project - @project = @user.projects.find_by_identifier params[:project_id] - render_not_found("未找到’#{params[:id]}’相关的项目") unless @project + @project = Project.find params[:project_id] + rescue Exception => e + tip_exception(e.message) end end