From 53224881bace4a322fb3173c5743088153ac427f Mon Sep 17 00:00:00 2001 From: Jasder <2053003901@@qq.com> Date: Wed, 23 Sep 2020 11:40:13 +0800 Subject: [PATCH] =?UTF-8?q?ADD=20devops=E4=B8=AD=E9=99=90=E5=88=B6?= =?UTF-8?q?=E6=AF=8F=E5=8F=B0=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=8F=AA=E8=83=BD?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E4=B8=80=E4=B8=AA=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/ci/cloud_accounts_controller.rb | 5 +++++ app/controllers/concerns/ci/cloud_account_manageable.rb | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/controllers/ci/cloud_accounts_controller.rb b/app/controllers/ci/cloud_accounts_controller.rb index c4ffa27ba..ecbfdbf41 100644 --- a/app/controllers/ci/cloud_accounts_controller.rb +++ b/app/controllers/ci/cloud_accounts_controller.rb @@ -12,6 +12,11 @@ class Ci::CloudAccountsController < Ci::BaseController end def create + return render_error('你已绑定了云帐号.') unless current_user.ci_cloud_account.blank? + + ip_num = IPAddr.new(devops_params[:ip_num]).to_i + return render_error("#{devops_params[:ip_num]}服务器已被使用.") if Ci::CloudAccount.exists?(ip_num: ip_num) + ActiveRecord::Base.transaction do @cloud_account = bind_account! if @cloud_account.blank? diff --git a/app/controllers/concerns/ci/cloud_account_manageable.rb b/app/controllers/concerns/ci/cloud_account_manageable.rb index f834c6b44..9bff6beaa 100644 --- a/app/controllers/concerns/ci/cloud_account_manageable.rb +++ b/app/controllers/concerns/ci/cloud_account_manageable.rb @@ -8,8 +8,6 @@ module Ci::CloudAccountManageable # 1. 保存华为云服务器帐号 create_params = devops_params.merge(ip_num: IPAddr.new(devops_params[:ip_num]).to_i, secret: Ci::CloudAccount.encrypted_secret(devops_params[:secret])) - return render_error('你已绑定了云帐号.') unless current_user.ci_cloud_account.blank? - cloud_account = Ci::CloudAccount.new(create_params) cloud_account.user = current_user cloud_account.save!