FIX 新建流水线创建ci repo没有生成临时秘钥问题

This commit is contained in:
jasder duan 2023-11-17 16:40:18 +08:00
parent c371b1c2e1
commit f2a073239c
2 changed files with 12 additions and 4 deletions

View File

@ -52,7 +52,7 @@ class Ci::ProjectsController < Ci::BaseController
@project.update_columns(open_devops: true, gitea_webhook_id: result['id'])
@project.increment!(:open_devops_count)
@cloud_account.update_column(:ci_user_id, @ci_user.user_id)
Rails.logger.info "########## @cloud_account: #{@cloud_account.to_json} --- @repo: #{@repo.to_json} --- @project: #{@project}"
Rails.logger.info "########## @cloud_account: #{@cloud_account.to_json} --- @repo: #{@repo.to_json} --- @project: #{@project.to_json}"
end
end
render_ok

View File

@ -68,11 +68,13 @@ class Ci::Repo < Ci::RemoteBase
repo_timeout: 60,
repo_config: create_params[:repo_config],
repo_created: Time.now.to_i,
repo_updated: Time.now.to_i
repo_updated: Time.now.to_i,
repo_signer: Repo.generate_code!,
repo_secret: Repo.generate_code!
)
repo.repo_signer = repo.generate_code
repo.repo_secret = repo.generate_code
# repo.repo_signer = repo.generate_code
# repo.repo_secret = repo.generate_code
if repo.save!
Ci::Perm.auto_create!(create_params[:repo_user_id], repo.id)
repo.update_column(:repo_uid, repo.id)
@ -104,4 +106,10 @@ class Ci::Repo < Ci::RemoteBase
def destroy!
self.destroy
end
private
def self.generate_code!
[*'a'..'z',*'0'..'9',*'A'..'Z'].sample(32).join
end
end