From 1de784e9c7c52cf8301e6361e9653bc2383c15de Mon Sep 17 00:00:00 2001 From: xxq250 Date: Thu, 15 Dec 2022 14:02:47 +0800 Subject: [PATCH] =?UTF-8?q?fixed=20=E5=88=9B=E5=BB=BA=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E5=BC=80=E9=80=9A=E5=BB=BA=E6=9C=A8DevOps?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/jobs/open_project_dev_ops_job.rb | 2 +- app/models/message_template.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/jobs/open_project_dev_ops_job.rb b/app/jobs/open_project_dev_ops_job.rb index 218237b80..008d19e51 100644 --- a/app/jobs/open_project_dev_ops_job.rb +++ b/app/jobs/open_project_dev_ops_job.rb @@ -6,7 +6,7 @@ class OpenProjectDevOpsJob < ApplicationJob def perform(project_id, user_id) project = Project.find_by(id: project_id) user = User.find_by(id: user_id) - url = URI("#{jianmu_devops_url}/oauth2/authorize?code=#{jianmu_devops_code(project, user)}") + url = URI.parse(URI.encode("#{jianmu_devops_url}/oauth2/authorize?code=#{jianmu_devops_code(project, user)}")) puts "jianmu_devops_url ===== #{url}" http = Net::HTTP.new(url.host, url.port) request = Net::HTTP::Get.new(url) diff --git a/app/models/message_template.rb b/app/models/message_template.rb index 399134b02..200c2f676 100644 --- a/app/models/message_template.rb +++ b/app/models/message_template.rb @@ -52,7 +52,7 @@ class MessageTemplate < ApplicationRecord email_html = File.read("#{email_template_html_dir}/project_milestone_completed.html") self.create(type: 'MessageTemplate::ProjectMilestoneCompleted', sys_notice: '在 {nickname}/{repository} 仓库，里程碑 {name} 的完成度已达到100%', notification_url: '{baseurl}/{owner}/{identifier}/milestones/{id}', email: email_html, email_title: "#{PLATFORM}: 仓库 {nickname}/{repository} 有里程碑已完成") self.create(type: 'MessageTemplate::ProjectPraised', sys_notice: '{nickname1} 点赞了你管理的仓库 {nickname2}/{repository}', notification_url: '{baseurl}/{login}') - self.create(type: 'MessageTemplate::ProjectOpenDevOps', sys_notice: '您的仓库 {repository} 已成功开通引擎服务，可通过简单的节点编排完成自动化集成与部署。欢迎体验！', notification_url: '{baseurl}/{owner}/{identifier}') + self.create(type: 'MessageTemplate::ProjectOpenDevOps', sys_notice: '您的仓库 {repository} 已成功开通引擎服务，可通过简单的节点编排完成自动化集成与部署。欢迎体验！', notification_url: '{baseurl}/{owner}/{identifier}/devops') email_html = File.read("#{email_template_html_dir}/project_pull_request.html") self.create(type: 'MessageTemplate::ProjectPullRequest', sys_notice: '{nickname1}在 {nickname2}/{repository} 提交了一个合并请求：{title}', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}', email: email_html, email_title: "#{PLATFORM}: {nickname1} 在 {nickname2}/{repository} 提交了一个合并请求") email_html = File.read("#{email_template_html_dir}/project_role.html")