From bd441d024bbde0344df49fb6ece71e6bd5a9addb Mon Sep 17 00:00:00 2001 From: chenjing <28122123@qq.com> Date: Fri, 1 Sep 2023 13:36:07 +0800 Subject: [PATCH] update --- app/controllers/site_pages_controller.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/controllers/site_pages_controller.rb b/app/controllers/site_pages_controller.rb index b830a064b..903e037db 100644 --- a/app/controllers/site_pages_controller.rb +++ b/app/controllers/site_pages_controller.rb @@ -32,11 +32,8 @@ class SitePagesController < ApplicationController @page = Page.find params[:id] return normal_status(-1, @page.state_description) unless @page.state response_str = @page.deploy_page(params[:branch]) - data = JSON.parse(response_str)["result"] - if data.nil? - data = JSON.parse(response_str)["error"] - end - if data.include?("部署成功") + data = JSON.parse(response_str)["result"] || data = JSON.parse(response_str)["error"] + if data.to_s.include?("部署成功") @page.update(last_build_at: Time.now, build_state: true, last_build_info: data) else @page.update(build_state:false, last_build_info: data)