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

Merge branch 'dev_trustie' into dev_devops

This commit is contained in:
sylor_huang@126.com 2020-07-15 18:33:36 +08:00
parent a7f80a5dde 626e40cb24
commit f2df2e84cc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/sync_forge_controller.rb
View File

@ -195,7 +195,7 @@ class SyncForgeController < ApplicationController
SyncLog.sync_log("***2--01. forge_issue_ids-#{forge_issue_ids.size.to_i}--------------") 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 if forge_issue_ids.size.to_i <= old_issues_params[:count].to_i
diff_issue_ids = old_issues_params[:ids] - forge_issue_ids diff_issue_ids = old_issues_params[:ids] - forge_issue_ids
SyncLog.sync_log("***2--02. diff_issue_ids-#{diff_issue_ids}--------------")
if diff_issue_ids.size == 0 #issue数量一样，判断评论是否有增减 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) 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 diff_journal_ids = old_issues_params[:journals][:ids] - forge_journal_ids
@ -216,7 +216,7 @@ class SyncForgeController < ApplicationController
} }
end end
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---------------") SyncLog.sync_log("***2. end_to_syncissues---------------")
rescue Exception => e rescue Exception => e