From dea2009270d86682e06b1871382bec430eaa899a Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 15 Jul 2020 22:57:21 +0800 Subject: [PATCH 1/4] change --- app/controllers/sync_forge_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/sync_forge_controller.rb b/app/controllers/sync_forge_controller.rb index 373aa242..e5dbc211 100644 --- a/app/controllers/sync_forge_controller.rb +++ b/app/controllers/sync_forge_controller.rb @@ -219,7 +219,7 @@ class SyncForgeController < ApplicationController token: get_token, parent_id: project_id } - SyncLog.sync_log("***2--030#{len+1}. sync_projects_params_groups-#{sync_projects_params}--------------") + SyncLog.sync_log("***2--030#{len}. sync_projects_params_groups-#{sync_projects_params}--------------") SyncProjectsJob.perform_later(sync_projects_params, gitea_main) end # sync_projects_params = { From e450188d474c7bccb35e6bbe6b30f6519df36afb Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 15 Jul 2020 23:23:57 +0800 Subject: [PATCH 2/4] change --- app/controllers/sync_forge_controller.rb | 12 ++++++------ app/jobs/sync_projects_job.rb | 19 +++++++++++-------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/app/controllers/sync_forge_controller.rb b/app/controllers/sync_forge_controller.rb index e5dbc211..9d8dbff8 100644 --- a/app/controllers/sync_forge_controller.rb +++ b/app/controllers/sync_forge_controller.rb @@ -109,9 +109,9 @@ class SyncForgeController < ApplicationController def check_sync_project(project,sync_params) begin gitea_main = "https://www.trustie.net/" - # if request.subdomain === 'testforgeplus' - # gitea_main = "https://ucloudtest.trustie.net/" - # end + if request.subdomain === 'testforgeplus' + gitea_main = "https://ucloudtest.trustie.net/" + end SyncLog.sync_log("----begin_to_check_sync_project----project_id:#{project.id}---------------") change_project_score(project, sync_params[:project_score], sync_params[:repository]) if sync_params[:repository].present? #更新project_score @@ -137,9 +137,9 @@ class SyncForgeController < ApplicationController } gitea_main = "https://www.trustie.net/" - # if request.subdomain === 'testforgeplus' - # gitea_main = "https://ucloudtest.trustie.net/" - # end + if request.subdomain === 'testforgeplus' + gitea_main = "https://ucloudtest.trustie.net/" + end SyncProjectsJob.perform_later(sync_projects_params, gitea_main) SyncLog.sync_log("***8. end_to_sync_new_project---------------") end diff --git a/app/jobs/sync_projects_job.rb b/app/jobs/sync_projects_job.rb index 59ae9566..a8f4824b 100644 --- a/app/jobs/sync_projects_job.rb +++ b/app/jobs/sync_projects_job.rb @@ -47,10 +47,10 @@ class SyncProjectsJob < ApplicationJob end def create_target(target_jsons, target_type) - begin - SyncLog.sync_log("***【#{target_type}】. begin_to_create_target---------------") - return SyncLog.sync_log("*** no target_jsons") if target_jsons.blank? - target_jsons.each_with_index do |re,index| + SyncLog.sync_log("***【#{target_type}】. begin_to_create_target---------------") + return SyncLog.sync_log("*** no target_jsons") if target_jsons.blank? + target_jsons.each_with_index do |re,index| + begin SyncLog.sync_log("***user_login:#{re[:user_login]}----target_type:#{target_type}-----#{index+1}") if re[:target_params].present? SyncLog.sync_log("***user_login:#{re[:user_login]}----target_type:#{target_type}") @@ -85,7 +85,7 @@ class SyncProjectsJob < ApplicationJob new_target = target_type.constantize.new(re[:target_params].merge(user_id: u_id)) end end - + if !is_exists && new_target.save! SyncLog.sync_log("***【#{target_type}】. create_success---------------") if re[:journals].present? @@ -107,11 +107,14 @@ class SyncProjectsJob < ApplicationJob SyncLog.sync_log("***【#{target_type}】. create_failed---or has_exists---------------") end end + SyncLog.sync_log("***111222. end_to_create_target---------------") + rescue => e + SyncLog.sync_log("=========***【#{target_type}】creat_had_erros:#{e}===================") + next end - SyncLog.sync_log("***111222. end_to_create_target---------------") - rescue => e - SyncLog.sync_log("=========***【#{target_type}】creat_had_erros:#{e}===================") + end + end From 099c24c2d5c4dc31b82eb81da02333599fae9341 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 15 Jul 2020 23:26:08 +0800 Subject: [PATCH 3/4] change --- app/jobs/sync_projects_job.rb | 43 ++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/app/jobs/sync_projects_job.rb b/app/jobs/sync_projects_job.rb index a8f4824b..9e883ed3 100644 --- a/app/jobs/sync_projects_job.rb +++ b/app/jobs/sync_projects_job.rb @@ -122,28 +122,35 @@ class SyncProjectsJob < ApplicationJob SyncLog.sync_log("***【#{target_type}】. begin_to_create_target---------------") return SyncLog.sync_log("*** no target_jsons") if target_jsons.blank? target_jsons.each_with_index do |re,index| - SyncLog.sync_log("***user_login:#{re[:user_login]}----target_type:#{target_type}-----#{index+1}") - if re[:target_params].present? - u_id = User.select(:id, :login).where(login: re[:user_login]).pluck(:id).first - is_exists = Journal.exists?(user_id: u_id, journalized_id: re[:target_params][:journalized_id], created_on: re[:target_params][:created_on].to_s.to_time) - - if is_exists - SyncLog.sync_log("***00000. Journal:#{re[:target_params][:id]}-is exists--------------") - else - re[:target_params].delete(:id) - new_target = Journal.new(re[:target_params].merge(user_id: u_id)) - new_target.journalized_id = issue_id - if new_target.save! - if re[:journal_details].present? - re[:journal_details].each do |j| - JournalDetail.create!(j.merge(journal_id: new_target.id)) - end - end + begin + SyncLog.sync_log("***user_login:#{re[:user_login]}----target_type:#{target_type}-----#{index+1}") + if re[:target_params].present? + u_id = User.select(:id, :login).where(login: re[:user_login]).pluck(:id).first + is_exists = Journal.exists?(user_id: u_id, journalized_id: re[:target_params][:journalized_id], created_on: re[:target_params][:created_on].to_s.to_time) + + if is_exists + SyncLog.sync_log("***00000. Journal:#{re[:target_params][:id]}-is exists--------------") else - SyncLog.sync_log("***111222. journal_create failed---------------") + re[:target_params].delete(:id) + new_target = Journal.new(re[:target_params].merge(user_id: u_id)) + new_target.journalized_id = issue_id + if new_target.save! + if re[:journal_details].present? + re[:journal_details].each do |j| + JournalDetail.create!(j.merge(journal_id: new_target.id)) + end + end + else + SyncLog.sync_log("***111222. journal_create failed---------------") + + end end end + rescue => e + SyncLog.sync_log("***111222. journal_create failed---#{e}------------") + next end + end SyncLog.sync_log("***111222. end_to_create_journal---------------") end From de5beb3e122f6b4c281e139ef9e00272b124c31f Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 15 Jul 2020 23:27:20 +0800 Subject: [PATCH 4/4] chagne --- app/controllers/sync_forge_controller.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/sync_forge_controller.rb b/app/controllers/sync_forge_controller.rb index 9d8dbff8..e5dbc211 100644 --- a/app/controllers/sync_forge_controller.rb +++ b/app/controllers/sync_forge_controller.rb @@ -109,9 +109,9 @@ class SyncForgeController < ApplicationController def check_sync_project(project,sync_params) begin gitea_main = "https://www.trustie.net/" - if request.subdomain === 'testforgeplus' - gitea_main = "https://ucloudtest.trustie.net/" - end + # if request.subdomain === 'testforgeplus' + # gitea_main = "https://ucloudtest.trustie.net/" + # end SyncLog.sync_log("----begin_to_check_sync_project----project_id:#{project.id}---------------") change_project_score(project, sync_params[:project_score], sync_params[:repository]) if sync_params[:repository].present? #更新project_score @@ -137,9 +137,9 @@ class SyncForgeController < ApplicationController } gitea_main = "https://www.trustie.net/" - if request.subdomain === 'testforgeplus' - gitea_main = "https://ucloudtest.trustie.net/" - end + # if request.subdomain === 'testforgeplus' + # gitea_main = "https://ucloudtest.trustie.net/" + # end SyncProjectsJob.perform_later(sync_projects_params, gitea_main) SyncLog.sync_log("***8. end_to_sync_new_project---------------") end