From dfbc3e4882b2c610aaaa5dbaedf8ceb76289e058 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 26 Feb 2020 09:58:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dversion=5Frelease=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/version_releases_controller.rb | 2 +- app/services/gitea/client_service.rb | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/controllers/version_releases_controller.rb b/app/controllers/version_releases_controller.rb index 71437c7f8..5a1b76969 100644 --- a/app/controllers/version_releases_controller.rb +++ b/app/controllers/version_releases_controller.rb @@ -66,7 +66,7 @@ class VersionReleasesController < ApplicationController } version_release = VersionRelease.new(version_params.merge(user_id: current_user.id, repository_id: @repository.id)) if version_release.save! - git_version_release = Gitea::Versions::CreateService.new(@user.gitea_token, @repository.try(:login), @repository.try(:identifier), version_params).call + git_version_release = Gitea::Versions::CreateService.new(@user.gitea_token, @user.try(:login), @repository.try(:identifier), version_params).call if git_version_release update_params = { tarball_url: git_version_release["tarball_url"], diff --git a/app/services/gitea/client_service.rb b/app/services/gitea/client_service.rb index 2542a1e64..1c5da312c 100644 --- a/app/services/gitea/client_service.rb +++ b/app/services/gitea/client_service.rb @@ -117,7 +117,6 @@ class Gitea::ClientService < ApplicationService def render_status(response) mark = "[gitea] " - case response.status when 201, 200, 202 if response.body.size > 0 @@ -137,8 +136,12 @@ class Gitea::ClientService < ApplicationService puts "[gitea] " raise Error, "[gitea] delete ok" else - result = JSON.parse(response&.body) - message = result['message'] + if response&.body.blank? + message = "出现错误" + else + result = JSON.parse(response&.body) + message = result['message'] + end raise Error, mark + message end end