diff --git a/app/controllers/sync_forge_controller.rb b/app/controllers/sync_forge_controller.rb index c76d1b79f..e1fa8f16b 100644 --- a/app/controllers/sync_forge_controller.rb +++ b/app/controllers/sync_forge_controller.rb @@ -21,7 +21,7 @@ class SyncForgeController < ApplicationController project = Projects::CreateService.new(project_user, project_params).call if project.present? ProjectScore.create!( sync_params[:project_score].merge(project_id: project.id)) if sync_params[:project_score] - SyncRepositoryJob.perform_later(project.repository, sync_params[:repository_params]) if sync_params[:repository_params] + SyncRepositoryJob.perform_later(project.repository, sync_params[:repository]) if sync_params[:repository] check_new_project(project, sync_params) end end @@ -69,8 +69,8 @@ class SyncForgeController < ApplicationController private def check_sync_project(project,sync_params) - if sync_params[:repository_params].present? #仓库存在 - change_project_score(project, sync_params[:project_score], sync_params[:repository_params]) #更新project_score + if sync_params[:repository].present? #仓库存在 + change_project_score(project, sync_params[:project_score], sync_params[:repository]) #更新project_score end change_project_issues(project, sync_params[:issues],project.id) change_project_members(project, sync_params[:members]) diff --git a/app/jobs/sync_projects_job.rb b/app/jobs/sync_projects_job.rb index fb23a44d1..41ac92f65 100644 --- a/app/jobs/sync_projects_job.rb +++ b/app/jobs/sync_projects_job.rb @@ -7,9 +7,9 @@ class SyncProjectsJob < ApplicationJob def perform(sync_params) SyncLog.sync_log.info("==========begin to sync #{sync_params[:type]} to forge============") begin - gitea_main = "https://trustie.net" - if request.subdomain === 'testforgeplus' - gitea_main = "https://ucloudtest.trustie.net/" + gitea_main = "https://ucloudtest.trustie.net/" + if request.subdomain === 'forgeplus' + gitea_main = "https://trustie.net" end url = "#{gitea_main}/sync_forges" #trustie上的相关路由 @@ -28,11 +28,11 @@ class SyncProjectsJob < ApplicationJob create_target(eval(target_jsons), sync_params[:type].to_s) end else - SyncLog.sync_log.info("==========bsync_user_to_forge_failed #{sync_params[:type]}============") + SyncLog.sync_log.info("==========sync_project_to_forge_failed #{sync_params[:type]}============") end end rescue => e - SyncLog.sync_log.info("==========bsync_user_to_forge_failed #{sync_params[:type]}============errors:#{e}") + SyncLog.sync_log.info("==========sync_project_to_forge_failed #{sync_params[:type]}============errors:#{e}") end end diff --git a/app/jobs/sync_repository_job.rb b/app/jobs/sync_repository_job.rb index 915df3831..7cc05df0e 100644 --- a/app/jobs/sync_repository_job.rb +++ b/app/jobs/sync_repository_job.rb @@ -5,7 +5,7 @@ class SyncRepositoryJob < ApplicationJob def perform(repository, repository_params) #创建临时文件夹 clone 并强推代码 - SyncLog.sync_log("=================begin to sync repository=====================") + SyncLog.sync_log("=================begin to sync request trustie repository=====================") path = "#{Rails.root}/public/cache_repository" unless File.directory?(path) FileUtils.mkdir_p(path)