From fb54d575612f0927c2e17c63ea449d4095d03f80 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 15 Jul 2020 21:29:59 +0800 Subject: [PATCH 1/3] change --- app/controllers/sync_forge_controller.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/sync_forge_controller.rb b/app/controllers/sync_forge_controller.rb index 0c20fd671..8b5eaf70e 100644 --- a/app/controllers/sync_forge_controller.rb +++ b/app/controllers/sync_forge_controller.rb @@ -75,11 +75,11 @@ class SyncForgeController < ApplicationController username = new_user.login password = "12345678" - if new_user.save! - SyncLog.sync_log("=================sync_to_user_success==#{new_user.login}") - else - SyncLog.sync_log("=================sync_to_user_failed,user_login==#{new_user.login}") - end + # if new_user.save! + # SyncLog.sync_log("=================sync_to_user_success==#{new_user.login}") + # else + # SyncLog.sync_log("=================sync_to_user_failed,user_login==#{new_user.login}") + # end ActiveRecord::Base.transaction do interactor = Gitea::RegisterInteractor.call({username: username, email: new_user.mail, password: password}) if interactor.success? From 289f4495b6aa9f6d37f7e61d6af7efc6266226d0 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 15 Jul 2020 22:01:12 +0800 Subject: [PATCH 2/3] chang issues --- app/controllers/sync_forge_controller.rb | 34 ++++++++++++++++++------ 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/app/controllers/sync_forge_controller.rb b/app/controllers/sync_forge_controller.rb index 8b5eaf70e..d7e07d0ad 100644 --- a/app/controllers/sync_forge_controller.rb +++ b/app/controllers/sync_forge_controller.rb @@ -206,18 +206,36 @@ class SyncForgeController < ApplicationController token: get_token, parent_id: project_id } + SyncLog.sync_log("***2--02. sync_projects_params-#{sync_projects_params}--------------") + SyncProjectsJob.perform_later(sync_projects_params, gitea_main) end else - sync_projects_params = { - type: "Issue", - ids: diff_issue_ids, - token: get_token, - parent_id: project_id - } + if diff_issue_ids.size > 200 + new_diff_ids = diff_issue_ids.in_groups_of(200).map{|k| k.reject(&:blank?)} + new_diff_ids.each_with_index do |diff, index| + sync_projects_params = { + type: "Issue", + ids: diff, + token: get_token, + parent_id: project_id + } + SyncLog.sync_log("***2--030#{idnex+1}. sync_projects_params_groups-#{sync_projects_params}--------------") + SyncProjectsJob.perform_later(sync_projects_params, gitea_main) + end + else + sync_projects_params = { + type: "Issue", + ids: diff_issue_ids, + token: get_token, + parent_id: project_id + } + end + SyncLog.sync_log("***2--03. sync_projects_params_groups-#{sync_projects_params}--------------") + SyncProjectsJob.perform_later(sync_projects_params, gitea_main) end end - SyncLog.sync_log("***2--02. sync_projects_params-#{sync_projects_params}--------------") - SyncProjectsJob.perform_later(sync_projects_params, gitea_main) if sync_projects_params.present? + + # SyncProjectsJob.perform_later(sync_projects_params, gitea_main) if sync_projects_params.present? SyncLog.sync_log("***2. end_to_syncissues---------------") rescue Exception => e SyncLog.sync_log("=========change_project_issues_errors:#{e}===================") From b077d0c361d24dd5f4eb7809836d4600b55192c8 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 15 Jul 2020 22:38:58 +0800 Subject: [PATCH 3/3] change --- app/controllers/sync_forge_controller.rb | 50 ++++++++++++++---------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/app/controllers/sync_forge_controller.rb b/app/controllers/sync_forge_controller.rb index d7e07d0ad..c68b512e2 100644 --- a/app/controllers/sync_forge_controller.rb +++ b/app/controllers/sync_forge_controller.rb @@ -210,28 +210,38 @@ class SyncForgeController < ApplicationController SyncProjectsJob.perform_later(sync_projects_params, gitea_main) end else - if diff_issue_ids.size > 200 - new_diff_ids = diff_issue_ids.in_groups_of(200).map{|k| k.reject(&:blank?)} - new_diff_ids.each_with_index do |diff, index| - sync_projects_params = { - type: "Issue", - ids: diff, - token: get_token, - parent_id: project_id - } - SyncLog.sync_log("***2--030#{idnex+1}. sync_projects_params_groups-#{sync_projects_params}--------------") - SyncProjectsJob.perform_later(sync_projects_params, gitea_main) - end - else - sync_projects_params = { - type: "Issue", - ids: diff_issue_ids, - token: get_token, - parent_id: project_id - } - end + # if diff_issue_ids.size > 200 + # new_diff_ids = diff_issue_ids.in_groups_of(200).map{|k| k.reject(&:blank?)} + # new_diff_ids.each_with_index do |diff, index| + # sync_projects_params = { + # type: "Issue", + # ids: diff, + # token: get_token, + # parent_id: project_id + # } + # SyncLog.sync_log("***2--030#{idnex+1}. sync_projects_params_groups-#{sync_projects_params}--------------") + # SyncProjectsJob.perform_later(sync_projects_params, gitea_main) + # end + # else + # sync_projects_params = { + # type: "Issue", + # ids: diff_issue_ids, + # token: get_token, + # parent_id: project_id + # } + # SyncLog.sync_log("***2--03. sync_projects_params_groups-#{sync_projects_params}--------------") + # SyncProjectsJob.perform_later(sync_projects_params, gitea_main) + # end + + sync_projects_params = { + type: "Issue", + ids: diff_issue_ids, + token: get_token, + parent_id: project_id + } SyncLog.sync_log("***2--03. sync_projects_params_groups-#{sync_projects_params}--------------") SyncProjectsJob.perform_later(sync_projects_params, gitea_main) + end end