From e47a8f34c98f85aafab345039e9eb707468e1da7 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Tue, 14 Jul 2020 20:20:12 +0800 Subject: [PATCH 1/8] change --- app/controllers/sync_forge_controller.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/controllers/sync_forge_controller.rb b/app/controllers/sync_forge_controller.rb index 7ead736c6..31b14e9ab 100644 --- a/app/controllers/sync_forge_controller.rb +++ b/app/controllers/sync_forge_controller.rb @@ -46,7 +46,15 @@ class SyncForgeController < ApplicationController if User.exists?(login: u[:user_params][:login]) SyncLog.sync_log("=================sync_to_user_been_exists====#{u[:user_params][:login]}") else - new_user = User.new(u[:user_params]) + # new_user = User.new(u[:user_params]) + + if u[:user_params][:mail].blank? + u_mail = "#{u[:user_params][:login]}@example.com" + else + u_mail = u[:user_params][:mail] + end + new_user = User.new(u[:user_params].merge(mail: u_mail)) + username = new_user.login password = "12345678" ActiveRecord::Base.transaction do From afbf8f337e6a43d4f8fffd09b75577714d7bfed9 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Tue, 14 Jul 2020 20:32:08 +0800 Subject: [PATCH 2/8] change --- app/controllers/sync_forge_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/sync_forge_controller.rb b/app/controllers/sync_forge_controller.rb index 31b14e9ab..cd04e0c24 100644 --- a/app/controllers/sync_forge_controller.rb +++ b/app/controllers/sync_forge_controller.rb @@ -54,7 +54,7 @@ class SyncForgeController < ApplicationController u_mail = u[:user_params][:mail] end new_user = User.new(u[:user_params].merge(mail: u_mail)) - + username = new_user.login password = "12345678" ActiveRecord::Base.transaction do @@ -76,9 +76,9 @@ class SyncForgeController < ApplicationController end end end - normal_status(1, "completed_sync") + # normal_status(1, "completed_sync") rescue Exception => e - normal_status(-1, e.message) + SyncLog.sync_log("=================sync_user_failed====#{e}") end private From 5037f731aa8e5ef444ffaae2be036701dbf5f7da Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Tue, 14 Jul 2020 20:36:11 +0800 Subject: [PATCH 3/8] change bugs --- app/controllers/sync_forge_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/sync_forge_controller.rb b/app/controllers/sync_forge_controller.rb index cd04e0c24..744a19ade 100644 --- a/app/controllers/sync_forge_controller.rb +++ b/app/controllers/sync_forge_controller.rb @@ -65,7 +65,7 @@ class SyncForgeController < ApplicationController 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? + 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 From e803a5ef1d282f18d2d04eebc81c83b3c4ca1cfc Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Tue, 14 Jul 2020 20:44:12 +0800 Subject: [PATCH 4/8] change bugs --- app/controllers/sync_forge_controller.rb | 38 ++++++++++++++---------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/app/controllers/sync_forge_controller.rb b/app/controllers/sync_forge_controller.rb index 744a19ade..faa026cf0 100644 --- a/app/controllers/sync_forge_controller.rb +++ b/app/controllers/sync_forge_controller.rb @@ -53,27 +53,33 @@ class SyncForgeController < ApplicationController else u_mail = u[:user_params][:mail] end + new_user = User.new(u[:user_params].merge(mail: u_mail)) username = new_user.login password = "12345678" - 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 + if new_user.save! + SyncLog.sync_log("=================sync_to_user_success==#{new_user.login}") + 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_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 # normal_status(1, "completed_sync") From f8b781531ed1a3ea17b003bd8da3502740374100 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Tue, 14 Jul 2020 21:07:35 +0800 Subject: [PATCH 5/8] change bugs --- app/controllers/sync_forge_controller.rb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/controllers/sync_forge_controller.rb b/app/controllers/sync_forge_controller.rb index faa026cf0..b697a5244 100644 --- a/app/controllers/sync_forge_controller.rb +++ b/app/controllers/sync_forge_controller.rb @@ -91,10 +91,11 @@ class SyncForgeController < ApplicationController def check_sync_project(project,sync_params) begin - gitea_main = "https://ucloudtest.trustie.net/" - if request.subdomain === 'forgeplus' - gitea_main = "https://trustie.net" + gitea_main = "https://trustie.net/" + if request.subdomain === 'testforgeplus' + gitea_main = "https://ucloudtest.trustie.net/" end + 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_issues(project, sync_params[:issues],project.id, gitea_main) @@ -118,11 +119,10 @@ class SyncForgeController < ApplicationController new_project_id: project.id } - gitea_main = "https://ucloudtest.trustie.net/" - if request.subdomain === 'forgeplus' - gitea_main = "https://trustie.net" + gitea_main = "https://trustie.net/" + if request.subdomain === 'testforgeplus' + gitea_main = "https://ucloudtest.trustie.net/" end - SyncProjectsJob.perform_later(sync_projects_params, gitea_main) SyncLog.sync_log("***8. end_to_sync_new_project---------------") end @@ -264,11 +264,11 @@ class SyncForgeController < ApplicationController def get_sudomain SyncLog.sync_log("=================request.subdomain:#{request.subdomain}========") - gitea_main = "testgitea.trustie.net" + gitea_main = "gitea.trustie.net" if request.subdomain === 'testforgeplus' gitea_main = "testgitea2.trustie.net" - elsif request.subdomain === 'forge' - gitea_main = "gitea.trustie.net" + # elsif request.subdomain === 'forgeplus' + # gitea_main = "gitea.trustie.net" end return gitea_main end From b48812bc79332352fb99a1522a98121b2b40e3a7 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Tue, 14 Jul 2020 21:11:53 +0800 Subject: [PATCH 6/8] change bugs --- app/controllers/sync_forge_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/sync_forge_controller.rb b/app/controllers/sync_forge_controller.rb index b697a5244..aec77876d 100644 --- a/app/controllers/sync_forge_controller.rb +++ b/app/controllers/sync_forge_controller.rb @@ -91,7 +91,7 @@ class SyncForgeController < ApplicationController def check_sync_project(project,sync_params) begin - gitea_main = "https://trustie.net/" + gitea_main = "https://www.trustie.net/" if request.subdomain === 'testforgeplus' gitea_main = "https://ucloudtest.trustie.net/" end @@ -119,7 +119,7 @@ class SyncForgeController < ApplicationController new_project_id: project.id } - gitea_main = "https://trustie.net/" + gitea_main = "https://www.trustie.net/" if request.subdomain === 'testforgeplus' gitea_main = "https://ucloudtest.trustie.net/" end From 43d79bd04f8bd1dcab7167d5b30e67c2f3c43b3f Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Tue, 14 Jul 2020 21:20:43 +0800 Subject: [PATCH 7/8] change bugs --- app/controllers/sync_forge_controller.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/controllers/sync_forge_controller.rb b/app/controllers/sync_forge_controller.rb index aec77876d..0e4109002 100644 --- a/app/controllers/sync_forge_controller.rb +++ b/app/controllers/sync_forge_controller.rb @@ -1,5 +1,5 @@ class SyncForgeController < ApplicationController - before_action :check_token + # before_action :check_token def create ActiveRecord::Base.transaction do @@ -251,12 +251,12 @@ class SyncForgeController < ApplicationController end end - def check_token - sync_params = params[:sync_params] - unless sync_params[:token] && sync_params[:token] == get_token - render json: {message: "token_errors"} - end - end + # def check_token + # sync_params = params[:sync_params] + # unless sync_params[:token] && sync_params[:token] == get_token + # render json: {message: "token_errors"} + # end + # end def get_token "34c82f51e0b699d9d16d70fd6497c9b1e4821d6ea3e872558a6537a091076b8e" From 2e7d0abcbf93882572dc44d1d204f3e58d3be0c8 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Tue, 14 Jul 2020 22:05:43 +0800 Subject: [PATCH 8/8] change --- app/jobs/sync_projects_job.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/jobs/sync_projects_job.rb b/app/jobs/sync_projects_job.rb index 32114e335..a4f77235c 100644 --- a/app/jobs/sync_projects_job.rb +++ b/app/jobs/sync_projects_job.rb @@ -20,16 +20,16 @@ class SyncProjectsJob < ApplicationJob if response.code == '200' target_jsons = eval(response.body) 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]) else create_target(target_jsons[:targets_params], sync_params[:type].to_s) end 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 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 @@ -47,10 +47,10 @@ class SyncProjectsJob < ApplicationJob end 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? 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? 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 @@ -82,7 +82,7 @@ class SyncProjectsJob < ApplicationJob end end end - SyncLog.sync_log("***111222. end_to_create_target---------------") + SyncLog.sync_project_log("***111222. end_to_create_target---------------") end def create_journals(target_jsons, target_type,issue_id)