diff --git a/app/controllers/ci/projects_controller.rb b/app/controllers/ci/projects_controller.rb index 3fac273f7..c26bbc314 100644 --- a/app/controllers/ci/projects_controller.rb +++ b/app/controllers/ci/projects_controller.rb @@ -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 diff --git a/app/models/ci/repo.rb b/app/models/ci/repo.rb index 6c2a6d744..866a39d51 100644 --- a/app/models/ci/repo.rb +++ b/app/models/ci/repo.rb @@ -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