From f2a073239cf847a322d14d1d43300b679404cc20 Mon Sep 17 00:00:00 2001 From: jasder duan Date: Fri, 17 Nov 2023 16:40:18 +0800 Subject: [PATCH] =?UTF-8?q?FIX=20=E6=96=B0=E5=BB=BA=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E7=BA=BF=E5=88=9B=E5=BB=BAci=20repo=E6=B2=A1=E6=9C=89=E7=94=9F?= =?UTF-8?q?=E6=88=90=E4=B8=B4=E6=97=B6=E7=A7=98=E9=92=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/ci/projects_controller.rb | 2 +- app/models/ci/repo.rb | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) 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