From af220cfffcadb4eaf66ce366276a9aa75fd67b14 Mon Sep 17 00:00:00 2001 From: Jasder <2053003901@@qq.com> Date: Mon, 17 Aug 2020 14:22:26 +0800 Subject: [PATCH] FIX config drone database --- app/controllers/ci/cloud_accounts_controller.rb | 2 +- app/libs/ci/drone/server.rb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/ci/cloud_accounts_controller.rb b/app/controllers/ci/cloud_accounts_controller.rb index f4ab4ba3c..d941a9ae2 100644 --- a/app/controllers/ci/cloud_accounts_controller.rb +++ b/app/controllers/ci/cloud_accounts_controller.rb @@ -11,7 +11,7 @@ class Ci::CloudAccountsController < Ci::BaseController # 1. 保存华为云服务器帐号 create_params = devops_params.merge(ip_num: IPAddr.new(devops_params[:ip_num]).to_i, secret: Ci::CloudAccount.encrypted_secret(devops_params[:secret])) - if cloud_account = @project.dev_ops_cloud_account + if cloud_account = @project.ci_cloud_account return render_error('该仓库已绑定了云帐号.') else cloud_account = Ci::CloudAccount.new(create_params) diff --git a/app/libs/ci/drone/server.rb b/app/libs/ci/drone/server.rb index 2a350cc95..5a699bea6 100644 --- a/app/libs/ci/drone/server.rb +++ b/app/libs/ci/drone/server.rb @@ -40,19 +40,19 @@ class Ci::Drone::Server end def database_username - database_config[Rails.env]["username"] + database_config[Rails.env]["ci"]["username"] end def database_password - database_config[Rails.env]["password"] + database_config[Rails.env]["ci"]["password"] end def database_host - database_config[Rails.env]["host"] + database_config[Rails.env]["ci"]["host"] end def database - database_config[Rails.env]["database"] + database_config[Rails.env]["ci"]["database"] end def database_config