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 22:07:10 +08:00
parent eedaba9bed 2e7d0abcbf
commit d09e0fd5fa
2 changed files with 50 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
app/controllers/sync_forge_controller.rb
View File

@ -1,5 +1,5 @@
class SyncForgeController < ApplicationController class SyncForgeController < ApplicationController
before_action :check_token # before_action :check_token
def create def create
ActiveRecord::Base.transaction do ActiveRecord::Base.transaction do
@ -46,48 +46,57 @@ class SyncForgeController < ApplicationController
if User.exists?(login: u[:user_params][:login]) if User.exists?(login: u[:user_params][:login])
SyncLog.sync_log("=================sync_to_user_been_exists====#{u[:user_params][:login]}") SyncLog.sync_log("=================sync_to_user_been_exists====#{u[:user_params][:login]}")
else else
# new_user = User.new(u[:user_params])
if u[:user_params][:mail].blank? if u[:user_params][:mail].blank?
u_mail = "#{u[:user_params][:login]}@example.com" u_mail = "#{u[:user_params][:login]}@example.com"
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].merge(user_id: new_user.id)) if u[: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")
rescue Exception => e rescue Exception => e
normal_status(-1, e.message) SyncLog.sync_log("=================sync_user_failed====#{e}")
end end
private private
def check_sync_project(project,sync_params) def check_sync_project(project,sync_params)
begin begin
gitea_main = "https://ucloudtest.trustie.net/" gitea_main = "https://www.trustie.net/"
if request.subdomain === 'forgeplus' if request.subdomain === 'testforgeplus'
gitea_main = "https://trustie.net" gitea_main = "https://ucloudtest.trustie.net/"
end end
SyncLog.sync_log("----begin_to_check_sync_project----project_id:#{project.id}---------------") 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_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_issues(project, sync_params[:issues],project.id, gitea_main)
@ -111,11 +120,10 @@ class SyncForgeController < ApplicationController
new_project_id: project.id new_project_id: project.id
} }
gitea_main = "https://ucloudtest.trustie.net/" gitea_main = "https://www.trustie.net/"
if request.subdomain === 'forgeplus' if request.subdomain === 'testforgeplus'
gitea_main = "https://trustie.net" gitea_main = "https://ucloudtest.trustie.net/"
end end
SyncProjectsJob.perform_later(sync_projects_params, gitea_main) SyncProjectsJob.perform_later(sync_projects_params, gitea_main)
SyncLog.sync_log("***8. end_to_sync_new_project---------------") SyncLog.sync_log("***8. end_to_sync_new_project---------------")
end end
@ -244,12 +252,12 @@ class SyncForgeController < ApplicationController
end end
end end
def check_token # def check_token
sync_params = params[:sync_params] # sync_params = params[:sync_params]
unless sync_params[:token] && sync_params[:token] == get_token # unless sync_params[:token] && sync_params[:token] == get_token
render json: {message: "token_errors"} # render json: {message: "token_errors"}
end # end
end # end
def get_token def get_token
"34c82f51e0b699d9d16d70fd6497c9b1e4821d6ea3e872558a6537a091076b8e" "34c82f51e0b699d9d16d70fd6497c9b1e4821d6ea3e872558a6537a091076b8e"
@ -257,11 +265,11 @@ class SyncForgeController < ApplicationController
def get_sudomain def get_sudomain
SyncLog.sync_log("=================request.subdomain:#{request.subdomain}========") SyncLog.sync_log("=================request.subdomain:#{request.subdomain}========")
gitea_main = "testgitea.trustie.net" gitea_main = "gitea.trustie.net"
if request.subdomain === 'testforgeplus' if request.subdomain === 'testforgeplus'
gitea_main = "testgitea2.trustie.net" gitea_main = "testgitea2.trustie.net"
elsif request.subdomain === 'forge' # elsif request.subdomain === 'forgeplus'
gitea_main = "gitea.trustie.net" # gitea_main = "gitea.trustie.net"
end end
return gitea_main return gitea_main
end end

12
app/jobs/sync_projects_job.rb
View File

@ -20,16 +20,16 @@ class SyncProjectsJob < ApplicationJob
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_project_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
create_target(target_jsons[:targets_params], sync_params[:type].to_s) create_target(target_jsons[:targets_params], sync_params[:type].to_s)
end end
else else
SyncLog.sync_log("==========sync_project_to_forge_failed #{sync_params[:type]}============") SyncLog.sync_project_log("==========sync_project_to_forge_failed #{sync_params[:type]}============")
end end
rescue => e rescue => e
SyncLog.sync_log("==========sync_project_to_forge_failed #{sync_params[:type]}============errors:#{e}") SyncLog.sync_project_log("==========sync_project_to_forge_failed #{sync_params[:type]}============errors:#{e}")
end end
end end
@ -47,10 +47,10 @@ class SyncProjectsJob < ApplicationJob
end end
def create_target(target_jsons, target_type) def create_target(target_jsons, target_type)
SyncLog.sync_log("***【#{target_type}】. begin_to_create_target---------------") SyncLog.sync_project_log("***【#{target_type}】. begin_to_create_target---------------")
return SyncLog.sync_log("*** no target_jsons") if target_jsons.blank? return SyncLog.sync_log("*** no target_jsons") if target_jsons.blank?
target_jsons.each_with_index do |re,index| target_jsons.each_with_index do |re,index|
SyncLog.sync_log("***user_login:#{re[:user_login]}----target_type:#{target_type}-----#{index+1}") SyncLog.sync_project_log("***user_login:#{re[:user_login]}----target_type:#{target_type}-----#{index+1}")
if re[:target_params].present? if re[:target_params].present?
SyncLog.sync_log("***user_login:#{re[:user_login]}----target_type:#{target_type}") SyncLog.sync_log("***user_login:#{re[:user_login]}----target_type:#{target_type}")
u_id = User.select(:id, :login).where(login: re[:user_login]).pluck(:id).first u_id = User.select(:id, :login).where(login: re[:user_login]).pluck(:id).first
@ -82,7 +82,7 @@ class SyncProjectsJob < ApplicationJob
end end
end end
end end
SyncLog.sync_log("***111222. end_to_create_target---------------") SyncLog.sync_project_log("***111222. end_to_create_target---------------")
end end
def create_journals(target_jsons, target_type,issue_id) def create_journals(target_jsons, target_type,issue_id)