floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

新增：分支列表分支信息以及gitlink admin token

This commit is contained in:
yystopf 2024-04-23 17:42:26 +08:00
parent 946b449d9d
commit 81d39588c6
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/api/v1/projects/sync_repositories_controller.rb
View File

@ -95,9 +95,9 @@ class Api::V1::Projects::SyncRepositoriesController < Api::V1::BaseController
return render_error("请输入正确的同步分支ID") unless params[:reposync_branch_ids]
@reposync_branch_logs = []
params[:reposync_branch_ids].split(",").each do |branch_id|
branch = SyncRepositoryBranch.find_by(reposync_branch_id: branch_id)
repo = branch.sync_repository
_, logs, _ = Reposync::GetLogsService.call(repo.repo_name, branch_id)
@branch = SyncRepositoryBranch.find_by(reposync_branch_id: branch_id)
repo = @branch&.sync_repository
_, logs, _ = Reposync::GetLogsService.call(repo&.repo_name, branch_id)
@reposync_branch_logs += logs
end
end

4
app/services/api/v1/projects/sync_repositories/create_service.rb
View File

@ -97,6 +97,8 @@ class Api::V1::Projects::SyncRepositories::CreateService < ApplicationService
end
def gitlink_repo_address
"#{EduSetting.get("gitlink_repo_domain")}/#{project.owner&.login}/#{project.identifier}.git"
internal_repo_address = "#{EduSetting.get("gitlink_repo_domain")}/#{project.owner&.login}/#{project.identifier}.git"
body = internal_repo_address.split("https://")[1]
return "https://oauth2:#{EduSetting.get("gitlink_admin_token")}@#{body}"
end
end

4
app/views/api/v1/projects/sync_repositories/create.json.jbuilder
View File

@ -1,5 +1,5 @@
json.gitlink_repo_address "#{EduSetting.get("gitlink_repo_domain")}/#{@project.owner&.login}/#{@project.identifier}.git"
json.external_repo_address @sync_repository1.external_repo_address
json.sync_granularity @sync_repository1.sync_granularity
json.gitlink_branch_name @sync_repository_branch1.gitlink_branch_name
json.external_branch_name @sync_repository_branch1.external_branch_name
json.gitlink_branch_name @sync_repository_branch1&.gitlink_branch_name
json.external_branch_name @sync_repository_branch1&.external_branch_name

3
app/views/api/v1/projects/sync_repositories/history.json.jbuilder
View File

@ -1,4 +1,7 @@
json.total_count @reposync_branch_logs.count
json.gitlink_branch_name @branch&.gitlink_branch_name
json.external_type @branch&.repository&.type
json.external_branch_name @branch&.external_branch_name
json.logs @reposync_branch_logs.each do |log|
type = log['repo_name'].start_with?('gitee') ? 'gitee' : 'github'
json.change_from log['sync_direct'] == "to_inter" ? type : 'gitlink'