From 20543c6bc27fd018f7f6c9ef8f7c6d87e8b73e3b Mon Sep 17 00:00:00 2001 From: xxq250 Date: Thu, 26 Sep 2024 13:54:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BB=BA=E6=9C=A8ci=E6=BF=80?= =?UTF-8?q?=E6=B4=BB=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/projects_helper.rb | 2 +- app/jobs/open_project_dev_ops_job.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 0f34b7c1b..80cfa92e0 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -129,7 +129,7 @@ module ProjectsHelper end def jianmu_devops_url - EduSetting.get("jianmu_devops_url") || "https://ci-v3.test.jianmuhub.com" + EduSetting.get("jianmu_devops_url") end diff --git a/app/jobs/open_project_dev_ops_job.rb b/app/jobs/open_project_dev_ops_job.rb index b3fe99e6f..c5d68a861 100644 --- a/app/jobs/open_project_dev_ops_job.rb +++ b/app/jobs/open_project_dev_ops_job.rb @@ -6,6 +6,7 @@ class OpenProjectDevOpsJob < ApplicationJob def perform(project_id, user_id) project = Project.find_by(id: project_id) return if project.blank? + return if EduSetting.get("jianmu_devops_url").blank? user = User.find_by(id: user_id) code = jianmu_devops_code(project, user) uri = URI.parse("#{jianmu_devops_url}/activate?code=#{URI.encode_www_form_component(code)}")