floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

FIX code bug

This commit is contained in:
Jasder 2020-09-04 18:16:38 +08:00
parent 9613f4c485
commit 401efd7c9b
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/controllers/ci/cloud_accounts_controller.rb
View File

@ -134,7 +134,7 @@ class Ci::CloudAccountsController < Ci::BaseController
if user.devops_step == User::DEVOPS_UNINIT || cloud_account.blank? if user.devops_step == User::DEVOPS_UNINIT || cloud_account.blank?
return render_error('你未绑定CI服务器') return render_error('你未绑定CI服务器')
elsif user.devops_step == User::DEVOPS_UNVERIFIED || user.ci_certification? elsif user.devops_step == User::DEVOPS_UNVERIFIED || user.ci_certification?
ci_user.destroy! if ci_user ci_user.destroy! unless ci_user.blank?
Ci::Repo.where(repo_namespace: user.login).delete_all Ci::Repo.where(repo_namespace: user.login).delete_all
cloud_account.destroy! cloud_account.destroy!
end end
@ -154,15 +154,16 @@ class Ci::CloudAccountsController < Ci::BaseController
def bind_hook!(user, cloud_account, repo) def bind_hook!(user, cloud_account, repo)
hook_params = { hook_params = {
"active": true, active: true,
"config": { config: {
"content_type": "json", content_type: json,
"url": cloud_account.drone_url + "/hook?secret=#{repo.repo_signer}" url: cloud_account.drone_url + "/hook?secret=#{repo.repo_signer}"
}, },
"type": "gitea" type: gitea
} }
Rails.logger.info "----------bind hook --------" Rails.logger.info "----------bind hook -------- #{hook_params}"
result = Gitea::Hooks::CreateService.call(user.gitea_token, user.login, repo.repo_name, hook_params) result = Gitea::Hooks::CreateService.call(user.gitea_token, user.login, repo.repo_name, hook_params)
Rails.logger.info "----------gitea bind hook status -------- #{result.status}"
regurn nil unless result.status == 201 regurn nil unless result.status == 201
Rails.logger.info "----------bind hook success--------" Rails.logger.info "----------bind hook success--------"
body = JSON.parse(result.body) body = JSON.parse(result.body)