diff --git a/app/controllers/sync_forge_controller.rb b/app/controllers/sync_forge_controller.rb index 939b72a13..203a486c4 100644 --- a/app/controllers/sync_forge_controller.rb +++ b/app/controllers/sync_forge_controller.rb @@ -7,7 +7,7 @@ class SyncForgeController < ApplicationController sync_params = params[:sync_params] project_user = User.where(login: sync_params[:owner_login])&.first #以前已同步的项目,那么肯定存在仓库 - + SyncLog.sync_log("=================begin_to_sync_forge: project_identifier: #{sync_params[:identifier]}========") user_projects = Project.where(user_id: project_user.id) if user_projects.where(id: sync_params[:id], identifier: sync_params[:identifier]).present? has_project = true @@ -24,8 +24,6 @@ class SyncForgeController < ApplicationController if has_project SyncLog.sync_log("=================begin_to_update_project========") - # project = user_projects.where(id: sync_params[:id]), identifier: sync_params[:identifier])&.first || - check_sync_project(project, sync_params) else #新建项目 SyncLog.sync_log("=================begin_to_create_new_project========") @@ -111,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 @@ -139,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 @@ -194,8 +192,10 @@ class SyncForgeController < ApplicationController begin forge_issue_ids = project&.issues&.select(:id)&.pluck(:id) sync_projects_params = {} + SyncLog.sync_log("***2--01. forge_issue_ids-#{forge_issue_ids.size.to_i}--------------") if forge_issue_ids.size.to_i <= old_issues_params[:count].to_i diff_issue_ids = old_issues_params[:ids] - forge_issue_ids + if diff_issue_ids.size == 0 #issue数量一样,判断评论是否有增减 forge_journal_ids = Journal.select([:id, :journalized_id, :journalized_type]).where(journalized_id: forge_issue_ids).pluck(:id) diff_journal_ids = old_issues_params[:journals][:ids] - forge_journal_ids @@ -216,7 +216,7 @@ class SyncForgeController < ApplicationController } 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? SyncLog.sync_log("***2. end_to_syncissues---------------") rescue Exception => e