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-15 21:15:40 +08:00
parent 650029fed8
commit b26059bf48
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/controllers/sync_forge_controller.rb
View File

@ -80,23 +80,23 @@ class SyncForgeController < ApplicationController
else 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 ActiveRecord::Base.transaction do
# interactor = Gitea::RegisterInteractor.call({username: username, email: new_user.mail, password: password}) interactor = Gitea::RegisterInteractor.call({username: username, email: new_user.mail, password: password})
# if interactor.success? if interactor.success?
# gitea_user = interactor.result gitea_user = interactor.result
# result = Gitea::User::GenerateTokenService.new(username, password).call result = Gitea::User::GenerateTokenService.new(username, password).call
# new_user.gitea_token = result['sha1'] new_user.gitea_token = result['sha1']
# new_user.gitea_uid = gitea_user['id'] new_user.gitea_uid = gitea_user['id']
# if new_user.save! 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? 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 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
# else 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}")
# 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
end end
end end
# normal_status(1, "completed_sync") # normal_status(1, "completed_sync")

4
app/jobs/sync_projects_job.rb
View File

@ -15,11 +15,11 @@ class SyncProjectsJob < ApplicationJob
http.use_ssl = true http.use_ssl = true
response = http.send_request('GET', uri.path, sync_params.to_json, {'Content-Type' => 'application/json'}) 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' if response.code == '200'
target_jsons = eval(response.body) target_jsons = eval(response.body)
if sync_params[:type] == "Project" 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]) update_new_project(target_jsons[:targets_params][0], sync_params[:new_project_id])
else else
SyncLog.sync_log("========== #{sync_params[:type]}============") SyncLog.sync_log("========== #{sync_params[:type]}============")