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

change bugs

This commit is contained in:
sylor_huang@126.com 2020-07-14 20:44:12 +08:00
parent 5037f731aa
commit e803a5ef1d
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/controllers/sync_forge_controller.rb
View File

@ -53,27 +53,33 @@ class SyncForgeController < ApplicationController
else else
u_mail = u[:user_params][:mail] u_mail = u[:user_params][:mail]
end end
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"
ActiveRecord::Base.transaction do if new_user.save!
interactor = Gitea::RegisterInteractor.call({username: username, email: new_user.mail, password: password}) SyncLog.sync_log("=================sync_to_user_success==#{new_user.login}")
if interactor.success? else
gitea_user = interactor.result SyncLog.sync_log("=================sync_to_user_failed,user_login==#{new_user.login}")
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_project_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
# 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_project_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
end end
# normal_status(1, "completed_sync") # normal_status(1, "completed_sync")