forked from Gitlink/forgeplus
change bugs
This commit is contained in:
parent
650029fed8
commit
b26059bf48
|
@ -80,23 +80,23 @@ class SyncForgeController < ApplicationController
|
|||
else
|
||||
SyncLog.sync_log("=================sync_to_user_failed,user_login==#{new_user.login}")
|
||||
end
|
||||
# ActiveRecord::Base.transaction do
|
||||
# interactor = Gitea::RegisterInteractor.call({username: username, email: new_user.mail, password: password})
|
||||
# if interactor.success?
|
||||
# gitea_user = interactor.result
|
||||
# result = Gitea::User::GenerateTokenService.new(username, password).call
|
||||
# new_user.gitea_token = result['sha1']
|
||||
# new_user.gitea_uid = gitea_user['id']
|
||||
# if new_user.save!
|
||||
# UserExtension.create!(u[:user_extensions][:user_extensions].merge(user_id: new_user.id)) if u[:user_extensions].present? && u[:user_extensions][:user_extensions].present?
|
||||
# else
|
||||
# SyncLog.sync_log("=================sync_to_user_failed,user_login==#{new_user.login}")
|
||||
# end
|
||||
# else
|
||||
# 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
|
||||
ActiveRecord::Base.transaction do
|
||||
interactor = Gitea::RegisterInteractor.call({username: username, email: new_user.mail, password: password})
|
||||
if interactor.success?
|
||||
gitea_user = interactor.result
|
||||
result = Gitea::User::GenerateTokenService.new(username, password).call
|
||||
new_user.gitea_token = result['sha1']
|
||||
new_user.gitea_uid = gitea_user['id']
|
||||
if new_user.save!
|
||||
UserExtension.create!(u[:user_extensions][:user_extensions].merge(user_id: new_user.id)) if u[:user_extensions].present? && u[:user_extensions][:user_extensions].present?
|
||||
else
|
||||
SyncLog.sync_log("=================sync_to_user_failed,user_login==#{new_user.login}")
|
||||
end
|
||||
else
|
||||
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
|
||||
# normal_status(1, "completed_sync")
|
||||
|
|
|
@ -15,11 +15,11 @@ class SyncProjectsJob < ApplicationJob
|
|||
http.use_ssl = true
|
||||
response = http.send_request('GET', uri.path, sync_params.to_json, {'Content-Type' => 'application/json'})
|
||||
|
||||
SyncLog.sync_log("==========response_status::#{response.code}============")
|
||||
SyncLog.sync_log("=======#{sync_params[:parent_id].present? ? sync_params[:parent_id] : sync_params[:new_project_id]}===response_status::#{response.code}============")
|
||||
if response.code == '200'
|
||||
target_jsons = eval(response.body)
|
||||
if sync_params[:type] == "Project"
|
||||
SyncLog.sync_log("==========target_jsons: #{target_jsons}============")
|
||||
# SyncLog.sync_log("==========target_jsons: #{target_jsons}============")
|
||||
update_new_project(target_jsons[:targets_params][0], sync_params[:new_project_id])
|
||||
else
|
||||
SyncLog.sync_log("========== #{sync_params[:type]}============")
|
||||
|
|
Loading…
Reference in New Issue