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

选trustie服务器解绑时删除drone用户

This commit is contained in:
moshenglv 2021-01-04 14:57:28 +08:00
parent 4aae60f3d8
commit bab9174966
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/concerns/ci/cloud_account_manageable.rb
View File

@ -97,7 +97,11 @@ module Ci::CloudAccountManageable
if cloud_account.server_type == Ci::CloudAccount::SERVER_TYPE_SELF if cloud_account.server_type == Ci::CloudAccount::SERVER_TYPE_SELF
@connection.execute("DROP DATABASE IF EXISTS #{current_user.login}_drone") # TOTO drop drone database @connection.execute("DROP DATABASE IF EXISTS #{current_user.login}_drone") # TOTO drop drone database
else
#删除drone用户
@trustie_db_connection.execute("DELETE FROM users WHERE user_login = '#{cloud_account.account}'")
end end
cloud_account.destroy! unless cloud_account.blank? cloud_account.destroy! unless cloud_account.blank?
current_user.unbind_account! current_user.unbind_account!
end end
@ -120,7 +124,11 @@ module Ci::CloudAccountManageable
return [true, "你已经绑定了云帐号."] unless current_user.ci_cloud_account.blank? return [true, "你已经绑定了云帐号."] unless current_user.ci_cloud_account.blank?
ip_num = IPAddr.new(devops_params[:ip_num]).to_i ip_num = IPAddr.new(devops_params[:ip_num]).to_i
Ci::CloudAccount.exists?(ip_num: ip_num) ? [true, "#{devops_params[:ip_num]}服务器已被使用."] : [false, nil]
#自有服务器进行判断
if cloud_account.server_type == Ci::CloudAccount::SERVER_TYPE_SELF
Ci::CloudAccount.exists?(ip_num: ip_num) ? [true, "#{devops_params[:ip_num]}服务器已被使用."] : [false, nil]
end
end end
def check_trustie_bind_cloud_account! def check_trustie_bind_cloud_account!