floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-03 03:40:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

FIX merge dev_trustie conflict

Browse Source
This commit is contained in:
Jasder
2020-07-15 17:16:41 +08:00
parent b9abd6a152 0a2423e912
commit 8f96341679
3 changed files with 47 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/controllers/sync_forge_controller.rb
View File

@@ -1,11 +1,11 @@
class SyncForgeController < ApplicationController
# before_action :check_token
def create
def create
ActiveRecord::Base.transaction do
params.permit!
sync_params = params[:sync_params]
project_user = User.where(login: sync_params[:owner_login])&.first
project_user = User.where(login: sync_params[:owner_login])&.first
#以前已同步的项目,那么肯定存在仓库
user_projects = Project.where(user_id: project_user.id)
@@ -24,12 +24,12 @@ 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 ||
# 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========")
project_params = {
repository_name: sync_params[:identifier],
user_id: project_user.id,
@@ -44,16 +44,16 @@ class SyncForgeController < ApplicationController
new_project_score = ProjectScore.create(score_params)
SyncLog.sync_log("=================new_project_score:#{new_project_score.try(:id)}========")
end
SyncRepositoryJob.perform_later(sync_params[:owner_login], sync_params[:identifier], sync_params[:repository], get_sudomain) if sync_params[:repository].present?
check_new_project(project, sync_params)
else
SyncLog.sync_project_log("=============new_project_create_failed, trustie_project_id==:#{params[:sync_params][:id]}")
SyncLog.sync_log("=============new_project_create_failed, trustie_project_id==:#{params[:sync_params][:id]}")
end
end
end
rescue Exception => e
SyncLog.sync_project_log("=============sync_has_errors:==#{e.message}, project_id==:#{params[:sync_params][:id]}")
SyncLog.sync_log("=============sync_has_errors:==#{e.message}, project_id==:#{params[:sync_params][:id]}")
end
def sync_users
@@ -96,7 +96,7 @@ class SyncForgeController < ApplicationController
# SyncLog.sync_log("=================sync_to_user_failed,user_login==#{new_user.login}")
# end
# else
# SyncLog.sync_project_log("=============sync_to_user_failed,user_login====#{new_user.login}")
# SyncLog.sync_log("=============sync_to_user_failed,user_login====#{new_user.login}")
# SyncLog.sync_log("=================sync_to_user_failed,user_login====#{new_user.login}")
# end
# end
@@ -107,7 +107,7 @@ class SyncForgeController < ApplicationController
SyncLog.sync_log("=================sync_user_failed====#{e}")
end
private
private
def check_sync_project(project,sync_params)
begin
@@ -117,8 +117,8 @@ class SyncForgeController < ApplicationController
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
change_project_issues(project, sync_params[:issues],project.id, gitea_main)
change_project_score(project, sync_params[:project_score], sync_params[:repository]) if sync_params[:repository].present? #更新project_score
change_project_issues(project, sync_params[:issues],project.id, gitea_main)
change_project_members(project, sync_params[:members],gitea_main)
change_project_versions(project, sync_params[:project_versions],gitea_main)
change_project_watchers(project, sync_params[:project_watchers],gitea_main)
@@ -126,7 +126,7 @@ class SyncForgeController < ApplicationController
rescue => e
SyncLog.sync_log("=========check_sync_project_errors:#{e}===================")
end
end
def check_new_project(project,sync_params)
@@ -159,7 +159,7 @@ class SyncForgeController < ApplicationController
parent_id: project.id
}
SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
SyncLog.sync_log("***6. end_to_sync_parises---------------")
end
end
@@ -181,7 +181,7 @@ class SyncForgeController < ApplicationController
end
end
pre_project_score.save! if change_num > 0 #如果 project_score有变化则更新
else
else
ProjectScore.create!(project_scores.merge(project_id: project.id))
end
SyncLog.sync_log("***1. end_to_sync_project_score---------------")
@@ -217,7 +217,7 @@ class SyncForgeController < ApplicationController
}
end
end
SyncProjectsJob.perform_later(sync_projects_params, gitea_main) if sync_projects_params.present?
SyncLog.sync_log("***2. end_to_syncissues---------------")
rescue Exception => e
@@ -238,7 +238,7 @@ class SyncForgeController < ApplicationController
parent_id: project.id
}
SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
end
end
SyncLog.sync_log("***5. begin_to_sync_watchers---------------")
@@ -258,7 +258,7 @@ class SyncForgeController < ApplicationController
}
SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
end
SyncLog.sync_log("***4. end_to_sync_versions---------------")
end
end
@@ -277,12 +277,12 @@ class SyncForgeController < ApplicationController
}
SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
end
SyncLog.sync_log("***3. end_to_sync_members---------------")
end
end
# def check_token
# def check_token
# sync_params = params[:sync_params]
# unless sync_params[:token] && sync_params[:token] == get_token
# render json: {message: "token_errors"}
@@ -304,4 +304,4 @@ class SyncForgeController < ApplicationController
return gitea_main
end
end
end