From f9bc2258ec68f006cc7d15c1a8353800eef1b500 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 11 Jan 2022 10:48:29 +0800 Subject: [PATCH] fix: migrate repo github use another addr --- app/controllers/projects_controller.rb | 27 +++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 571805324..6802dd063 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -59,18 +59,23 @@ class ProjectsController < ApplicationController Projects::MigrateForm.new(mirror_params).validate! @project = - if enable_accelerator?(mirror_params[:clone_addr]) + # if enable_accelerator?(mirror_params[:clone_addr]) + # source_clone_url = mirror_params[:clone_addr] + # uid_logger("########## 已动加速器 ##########") + # result = Gitea::Accelerator::MigrateService.call(mirror_params) + # if result[:status] == :success + # Rails.logger.info "########## 加速镜像成功 ########## " + # Projects::MigrateService.call(current_user, + # mirror_params.merge(source_clone_url: source_clone_url, + # clone_addr: accelerator_url(mirror_params[:repository_name]))) + # else + # Projects::MigrateService.call(current_user, mirror_params) + # end + if mirror_params[:clone_addr].include?("github.com") source_clone_url = mirror_params[:clone_addr] - uid_logger("########## 已动加速器 ##########") - result = Gitea::Accelerator::MigrateService.call(mirror_params) - if result[:status] == :success - Rails.logger.info "########## 加速镜像成功 ########## " - Projects::MigrateService.call(current_user, - mirror_params.merge(source_clone_url: source_clone_url, - clone_addr: accelerator_url(mirror_params[:repository_name]))) - else - Projects::MigrateService.call(current_user, mirror_params) - end + clone_url = source_clone_url.gsub('github.com', 'github.com.cnpmjs.org') + uid_logger("########## 更改clone_addr ##########") + Projects::MigrateService.call(current_user, mirror_params.merge(source_clone_url: source_clone_url, clone_addr: clone_url)) else Projects::MigrateService.call(current_user, mirror_params) end