diff --git a/app/controllers/api/v1/projects/sync_repositories_controller.rb b/app/controllers/api/v1/projects/sync_repositories_controller.rb index d1c668baa..feabfc1ec 100644 --- a/app/controllers/api/v1/projects/sync_repositories_controller.rb +++ b/app/controllers/api/v1/projects/sync_repositories_controller.rb @@ -114,7 +114,7 @@ class Api::V1::Projects::SyncRepositoriesController < Api::V1::BaseController def history return render_error("请输入正确的同步分支ID") unless params[:reposync_branch_ids] @branch = SyncRepositoryBranch.find_by(reposync_branch_id: params[:reposync_branch_ids].split(",")[0]) - _, @reposync_branch_logs, _ = Reposync::GetLogsService.call(nil, params[:reposync_branch_ids], page, limit) + _, @reposync_branch_logs, @total_count, _ = Reposync::GetLogsService.call(nil, params[:reposync_branch_ids], page, limit) end private diff --git a/app/services/reposync/client_service.rb b/app/services/reposync/client_service.rb index cca073df7..a8ddc18bd 100644 --- a/app/services/reposync/client_service.rb +++ b/app/services/reposync/client_service.rb @@ -95,4 +95,21 @@ class Reposync::ClientService < ApplicationService end end end + + def render_list_response(response) + status = response.status + body = JSON.parse(response&.body) + + log_error(status, body) + + if status == 200 + if body["code_status"].to_i == 0 + return [body["code_status"], body["data"], body["total"], body["msg"]] + else + puts "[reposync][ERROR] code: #{body["code_status"]}" + puts "[reposync][ERROR] message: #{body["msg"]}" + return [body["code_status"], body["data"], body["total"], body["msg"]] + end + end + end end \ No newline at end of file diff --git a/app/services/reposync/get_logs_service.rb b/app/services/reposync/get_logs_service.rb index b2d0df333..1288de6bf 100644 --- a/app/services/reposync/get_logs_service.rb +++ b/app/services/reposync/get_logs_service.rb @@ -11,7 +11,7 @@ class Reposync::GetLogsService < Reposync::ClientService def call result = get(url, request_params) - response = render_response(result) + response = render_list_response(result) end private diff --git a/app/views/api/v1/projects/sync_repositories/history.json.jbuilder b/app/views/api/v1/projects/sync_repositories/history.json.jbuilder index 37d4e2392..01546b292 100644 --- a/app/views/api/v1/projects/sync_repositories/history.json.jbuilder +++ b/app/views/api/v1/projects/sync_repositories/history.json.jbuilder @@ -1,4 +1,4 @@ -json.total_count @reposync_branch_logs.count +json.total_count @total_count json.gitlink_branch_name @branch&.gitlink_branch_name json.external_type @branch&.sync_repository&.type json.external_branch_name @branch&.external_branch_name