Nigel
/
forgeplus
forked from Gitlink/forgeplus
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Change

This commit is contained in:
sylor_huang@126.com 2020-07-15 18:02:43 +08:00
parent df0fcdb5ce
commit bc82451fcc
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/sync_forge_controller.rb
View File

@ -48,12 +48,12 @@ class SyncForgeController < ApplicationController
SyncRepositoryJob.perform_later(sync_params[:owner_login], sync_params[:identifier], sync_params[:repository], get_sudomain) if sync_params[:repository].present? 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) check_new_project(project, sync_params)
else else
SyncLog.sync_log("=============new_project_create_failed, trustie_project_id==:#{params[:sync_params][:id]}") SyncLog.sync_project_log("=============new_project_create_failed, trustie_project_id==:#{params[:sync_params][:id]}")
end end
end end
end end
rescue Exception => e rescue Exception => e
SyncLog.sync_log("=============sync_has_errors:==#{e.message}, project_id==:#{params[:sync_params][:id]}") SyncLog.sync_project_log("=============sync_has_errors:==#{e.message}, project_id==:#{params[:sync_params][:id]}")
end end
def sync_users def sync_users
@ -76,7 +76,6 @@ class SyncForgeController < ApplicationController
new_user = User.new(u[:user_params].merge(mail: u_mail)) new_user = User.new(u[:user_params].merge(mail: u_mail))
username = new_user.login username = new_user.login
password = "12345678" password = "12345678"
if new_user.save! if new_user.save!
SyncLog.sync_log("=================sync_to_user_success==#{new_user.login}") SyncLog.sync_log("=================sync_to_user_success==#{new_user.login}")
@ -96,7 +95,7 @@ class SyncForgeController < ApplicationController
# 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
# else # else
# SyncLog.sync_log("=============sync_to_user_failed,user_login====#{new_user.login}") # 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
# end # end

1
app/jobs/sync_projects_job.rb
View File

@ -112,7 +112,6 @@ class SyncProjectsJob < ApplicationJob
rescue => e rescue => e
SyncLog.sync_log("=========***【#{target_type}】creat_had_erros:#{e}===================") SyncLog.sync_log("=========***【#{target_type}】creat_had_erros:#{e}===================")
end end
end end
def create_journals(target_jsons, target_type,issue_id) def create_journals(target_jsons, target_type,issue_id)