Merge pull request 'github导入项目功能' (#55) from KingChan/forgeplus:chenjing into standalone_develop

This commit is contained in:
KingChan
2023-06-06 10:36:30 +08:00
6 changed files with 28 additions and 11 deletions

View File

@@ -9,7 +9,6 @@ class Projects::MigrateService < ApplicationService
def call
raise Error, "user_id不正确." unless authroize_user_id_success
@project = Project.new(project_params)
if @project.save!
ProjectUnit.init_types(@project.id, project.project_type)
@@ -55,6 +54,7 @@ class Projects::MigrateService < ApplicationService
user_id: params[:user_id],
login: params[:auth_username],
password: params[:auth_password],
auth_token: params[:auth_token],
is_mirror: params[:is_mirror],
source_clone_url: params[:source_clone_url]
}

View File

@@ -32,7 +32,8 @@ class Repositories::MigrateService < ApplicationService
private: params[:hidden],
mirror: wrapper_mirror || false,
auth_username: params[:login],
auth_password: Base64.decode64(params[:password] || "")
auth_password: Base64.decode64(params[:password] || ""),
auth_token: params[:auth_token]
}
end