From b5d3f32d6860fed7062272cd3706909001c0f534 Mon Sep 17 00:00:00 2001 From: Jasder <2053003901@@qq.com> Date: Tue, 10 Nov 2020 18:18:08 +0800 Subject: [PATCH] FIX code review --- app/services/gitea/client_service.rb | 3 ++- .../gitea/repository/commits/compare_service.rb | 11 +---------- app/services/gitea/repository/commits/get_service.rb | 12 +----------- 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/app/services/gitea/client_service.rb b/app/services/gitea/client_service.rb index f2581b724..5d3150e21 100644 --- a/app/services/gitea/client_service.rb +++ b/app/services/gitea/client_service.rb @@ -131,7 +131,6 @@ class Gitea::ClientService < ApplicationService {status: 200} end when 401 - "" raise Error, mark + "401" when 422 result = JSON.parse(response&.body) @@ -147,6 +146,8 @@ class Gitea::ClientService < ApplicationService raise Error, mark + message when 403 {status: 403, message: '你没有权限操作!'} + when 404 + {status: 404, message: '你访问的链接不存在!'} else if response&.body.blank? message = "请求失败" diff --git a/app/services/gitea/repository/commits/compare_service.rb b/app/services/gitea/repository/commits/compare_service.rb index ea0c648ce..502f6ce90 100644 --- a/app/services/gitea/repository/commits/compare_service.rb +++ b/app/services/gitea/repository/commits/compare_service.rb @@ -15,7 +15,7 @@ class Gitea::Repository::Commits::CompareService < Gitea::ClientService def call response = get(url, params) - render_result(response) + render_status(response) end private @@ -26,13 +26,4 @@ class Gitea::Repository::Commits::CompareService < Gitea::ClientService def url "/repos/#{owner}/#{repo}/compare/#{base}...#{head}".freeze end - - def render_result(response) - case response.status - when 200 - JSON.parse(response.body) - else - {status: -1, message: "#{body['message']}"} - end - end end diff --git a/app/services/gitea/repository/commits/get_service.rb b/app/services/gitea/repository/commits/get_service.rb index caee29f55..d497f1e4f 100644 --- a/app/services/gitea/repository/commits/get_service.rb +++ b/app/services/gitea/repository/commits/get_service.rb @@ -15,7 +15,7 @@ class Gitea::Repository::Commits::GetService < Gitea::ClientService def call response = get(url, params) - render_result(response) + render_status(response) end private @@ -32,14 +32,4 @@ class Gitea::Repository::Commits::GetService < Gitea::ClientService "/repos/#{owner}/#{repo}/git/commits/#{sha}".freeze end end - - def render_result(response) - body = JSON.parse(response.body) - case response.status - when 200 - JSON.parse(response.body) - else - {status: -1, message: "#{body['message']}"} - end - end end