From 771798220cb10c9d71ad5b2b62cbbf61da0d155e Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 23 Aug 2024 10:02:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=9C=8D=E5=8A=A1=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb            | 2 +-
 app/forms/projects/migrate_form.rb                | 2 +-
 app/services/gitea/accelerator/migrate_service.rb | 1 +
 app/services/projects/migrate_service.rb          | 1 +
 app/services/repositories/migrate_service.rb      | 3 ++-
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index d3e308450..ab7f1cdc6 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -395,7 +395,7 @@ class ProjectsController < ApplicationController
   end
 
   def mirror_params
-    params.permit(:user_id, :name, :description, :repository_name, :is_mirror, :auth_username, :auth_token,
+    params.permit(:user_id, :name, :description, :repository_name, :is_mirror, :auth_username, :auth_token, :service,
                   :auth_password, :project_category_id, :project_language_id, :clone_addr, :private)
   end
 
diff --git a/app/forms/projects/migrate_form.rb b/app/forms/projects/migrate_form.rb
index 8c1d04968..543f996d8 100644
--- a/app/forms/projects/migrate_form.rb
+++ b/app/forms/projects/migrate_form.rb
@@ -1,5 +1,5 @@
 class Projects::MigrateForm < BaseForm
-  attr_accessor :user_id, :name, :repository_name, :project_category_id, :description, :auth_token,
+  attr_accessor :user_id, :name, :repository_name, :project_category_id, :description, :auth_token, :service
                 :project_language_id, :clone_addr, :private, :is_mirror, :auth_username, :auth_password, :owner
 
   validates :user_id, :name, :repository_name, :clone_addr, presence: true
diff --git a/app/services/gitea/accelerator/migrate_service.rb b/app/services/gitea/accelerator/migrate_service.rb
index 86b8b3db1..5de97fe70 100644
--- a/app/services/gitea/accelerator/migrate_service.rb
+++ b/app/services/gitea/accelerator/migrate_service.rb
@@ -45,6 +45,7 @@ class Gitea::Accelerator::MigrateService < Gitea::Accelerator::BaseService
       repo_name: params[:repository_name],
       auth_username: params[:auth_username],
       auth_password: Base64.decode64(params[:auth_password]),
+      auth_token: params[:auth_token],
       mirror: ActiveModel::Type::Boolean.new.cast(params[:is_mirror])
     }
   end
diff --git a/app/services/projects/migrate_service.rb b/app/services/projects/migrate_service.rb
index f157ada1d..d81e24189 100644
--- a/app/services/projects/migrate_service.rb
+++ b/app/services/projects/migrate_service.rb
@@ -55,6 +55,7 @@ class Projects::MigrateService < ApplicationService
       login: params[:auth_username],
       password: params[:auth_password],
       auth_token: params[:auth_token],
+      service: params[:service],
       is_mirror: params[:is_mirror],
       source_clone_url: params[:source_clone_url]
     }
diff --git a/app/services/repositories/migrate_service.rb b/app/services/repositories/migrate_service.rb
index deb0e30d3..e423fe164 100644
--- a/app/services/repositories/migrate_service.rb
+++ b/app/services/repositories/migrate_service.rb
@@ -33,7 +33,8 @@ class Repositories::MigrateService < ApplicationService
       mirror: wrapper_mirror || false,
       auth_username: params[:login],
       auth_password: Base64.decode64(params[:password] || ""),
-      auth_token: params[:auth_token]
+      auth_token: params[:auth_token],
+      service: params[:service] || 'git',
     }
   end