Browse Source

fixed 创建仓库开通建木DevOps

pull/313/head
xxq250 3 years ago
parent
commit
1de784e9c7
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      app/jobs/open_project_dev_ops_job.rb
  2. +1
    -1
      app/models/message_template.rb

+ 1
- 1
app/jobs/open_project_dev_ops_job.rb View File

@@ -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)


+ 1
- 1
app/models/message_template.rb View File

@@ -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: '在 <b>{nickname}/{repository}</b> 仓库,里程碑 <b>{name}</b> 的完成度已达到100%', notification_url: '{baseurl}/{owner}/{identifier}/milestones/{id}', email: email_html, email_title: "#{PLATFORM}: 仓库 {nickname}/{repository} 有里程碑已完成")
self.create(type: 'MessageTemplate::ProjectPraised', sys_notice: '<b>{nickname1}</b> 点赞了你管理的仓库 <b>{nickname2}/{repository}</b>', notification_url: '{baseurl}/{login}')
self.create(type: 'MessageTemplate::ProjectOpenDevOps', sys_notice: '您的仓库 <b>{repository}</b> 已成功开通引擎服务,可通过简单的节点编排完成自动化集成与部署。欢迎体验!', notification_url: '{baseurl}/{owner}/{identifier}')
self.create(type: 'MessageTemplate::ProjectOpenDevOps', sys_notice: '您的仓库 <b>{repository}</b> 已成功开通引擎服务,可通过简单的节点编排完成自动化集成与部署。欢迎体验!', 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}在 <b>{nickname2}/{repository}</b> 提交了一个合并请求:<b>{title}</b>', 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")


Loading…
Cancel
Save