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 config drone database

This commit is contained in:
Jasder 2020-08-17 14:22:26 +08:00
parent 7bb43700b4
commit af220cfffc
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

8
app/libs/ci/drone/server.rb
View File

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