From 9fce30a05288db6580667a377e356edd7a6185bf Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 17 Jul 2020 15:58:43 +0800 Subject: [PATCH 1/6] change --- app/tasks/check_mirror_rake.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/tasks/check_mirror_rake.rb b/app/tasks/check_mirror_rake.rb index d8d23198c..2afe8e101 100644 --- a/app/tasks/check_mirror_rake.rb +++ b/app/tasks/check_mirror_rake.rb @@ -8,7 +8,7 @@ class CheckMirrorRake all_projects = Project.select(:id,:identifier,:user_id, :gpid, :forked_count,:is_public).includes(:owner, :repository) all_projects.each do |project| SyncLog.sync_log("=====check_project_id:#{project.id}======") - if project&.owner&.login.present? && + if project&.owner&.login.present? response = Gitea::Repository::Branches::ListService.new(project.owner, project.identifier).call else response = "224444" From 1617bdc58f2d48608d1b39eba7da565c80b44fd4 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 17 Jul 2020 16:15:57 +0800 Subject: [PATCH 2/6] Fix bugs --- app/tasks/check_gitea_user.rb | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/app/tasks/check_gitea_user.rb b/app/tasks/check_gitea_user.rb index 41e3cbd41..53c49ee16 100644 --- a/app/tasks/check_gitea_user.rb +++ b/app/tasks/check_gitea_user.rb @@ -8,25 +8,27 @@ class CheckGiteaUser if all_users.present? new_password = "12345678" all_users.each do |user| - SyncLog.sync_log("=====check_user_login_is:#{user.login}======") - ActiveRecord::Base.transaction do - interactor = Gitea::RegisterInteractor.call({username: user.login, email: user&.mail.present? ? user.mail : "#{user.login}@example.com", password: new_password}) - if interactor.success? - gitea_user = interactor.result - result = Gitea::User::GenerateTokenService.new(user.login, new_password).call - user.gitea_token = result['sha1'] - user.gitea_uid = gitea_user['id'] - if user.save! - SyncLog.sync_log("=================create_gitea_user_success_login==#{user.login}") + begin + SyncLog.sync_log("=====check_user_login_is:#{user.login}======") + ActiveRecord::Base.transaction do + interactor = Gitea::RegisterInteractor.call({username: user.login, email: user&.mail.present? ? user.mail : "#{user.login}@example.com", password: new_password}) + if interactor.success? + gitea_user = interactor.result + result = Gitea::User::GenerateTokenService.new(user.login, new_password).call + user.gitea_token = result['sha1'] + user.gitea_uid = gitea_user['id'] + if user.save! + SyncLog.sync_log("=================create_gitea_user_success_login==#{user.login}") + else + SyncLog.sync_log("=================create_gitea_user_success_login==#{user.login}") + end else - SyncLog.sync_log("=================create_gitea_user_success_login==#{user.login}") + SyncLog.sync_log("=============sync_to_user_failed,user_login====#{user.login}") end - else - SyncLog.sync_log("=============sync_to_user_failed,user_login====#{user.login}") end + rescue => exception + SyncLog.sync_log("=================create_gitea_user_has_erros=#{user.login}===#{exception}") end - rescue Exception => e - SyncLog.sync_log("=================create_gitea_user_has_erros=#{user.login}===#{e}") end end SyncLog.sync_log("=====end_to_check_gitea_user=====") From 8fe9f5a649211429ed1dc21f423ada8a293f866b Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 17 Jul 2020 16:18:30 +0800 Subject: [PATCH 3/6] Add login --- app/tasks/check_gitea_user.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/tasks/check_gitea_user.rb b/app/tasks/check_gitea_user.rb index 53c49ee16..135bac35b 100644 --- a/app/tasks/check_gitea_user.rb +++ b/app/tasks/check_gitea_user.rb @@ -4,7 +4,7 @@ class CheckGiteaUser def call SyncLog.sync_log("=====begin to check gitea_user======") - all_users = User.select(:id, :gitea_token, :gitea_uid, :mail, :type).where(type: "User", gitea_token: [nil, ""], gitea_uid: [nil, ""]) + all_users = User.select(:id, :gitea_token, :gitea_uid, :mail, :type,:login).where(type: "User", gitea_token: [nil, ""], gitea_uid: [nil, ""]) if all_users.present? new_password = "12345678" all_users.each do |user| From ed02967a40083b7268c9c90a3d979e81a373d4a2 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 17 Jul 2020 16:57:53 +0800 Subject: [PATCH 4/6] Change Gitea User Mail Regex --- app/tasks/check_gitea_user.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/tasks/check_gitea_user.rb b/app/tasks/check_gitea_user.rb index 135bac35b..eb2888672 100644 --- a/app/tasks/check_gitea_user.rb +++ b/app/tasks/check_gitea_user.rb @@ -4,14 +4,19 @@ class CheckGiteaUser def call SyncLog.sync_log("=====begin to check gitea_user======") - all_users = User.select(:id, :gitea_token, :gitea_uid, :mail, :type,:login).where(type: "User", gitea_token: [nil, ""], gitea_uid: [nil, ""]) + all_users = User.select(:id, :gitea_token, :gitea_uid, :mail, :type,:login,:platform).where(type: "User", gitea_token: [nil, ""], gitea_uid: [nil, ""]) if all_users.present? new_password = "12345678" all_users.each do |user| begin SyncLog.sync_log("=====check_user_login_is:#{user.login}======") + EMAIL_REGEX = /^[a-zA-Z0-9_\-.]+@[a-zA-Z0-9_\-.]+(\.[a-zA-Z0-9_-]+)+$/ + user_mail = user&.mail.present? ? user.mail : "#{user.login}@example.com" + unless user_mail.match(EMAIL_REGEX).present? + user_mail = "#{user.login}@example.com" + end ActiveRecord::Base.transaction do - interactor = Gitea::RegisterInteractor.call({username: user.login, email: user&.mail.present? ? user.mail : "#{user.login}@example.com", password: new_password}) + interactor = Gitea::RegisterInteractor.call({username: user.login, email: user_mail, password: new_password}) if interactor.success? gitea_user = interactor.result result = Gitea::User::GenerateTokenService.new(user.login, new_password).call From 375e1fee8337217a1a54e3aafe1e1a2b699e7077 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 17 Jul 2020 17:04:10 +0800 Subject: [PATCH 5/6] Remove Email Regex --- app/tasks/check_gitea_user.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/tasks/check_gitea_user.rb b/app/tasks/check_gitea_user.rb index eb2888672..5a9e7296a 100644 --- a/app/tasks/check_gitea_user.rb +++ b/app/tasks/check_gitea_user.rb @@ -7,14 +7,15 @@ class CheckGiteaUser all_users = User.select(:id, :gitea_token, :gitea_uid, :mail, :type,:login,:platform).where(type: "User", gitea_token: [nil, ""], gitea_uid: [nil, ""]) if all_users.present? new_password = "12345678" + # EMAIL_REGEX = /^[a-zA-Z0-9_\-.]+@[a-zA-Z0-9_\-.]+(\.[a-zA-Z0-9_-]+)+$/i all_users.each do |user| begin SyncLog.sync_log("=====check_user_login_is:#{user.login}======") - EMAIL_REGEX = /^[a-zA-Z0-9_\-.]+@[a-zA-Z0-9_\-.]+(\.[a-zA-Z0-9_-]+)+$/ + user_mail = user&.mail.present? ? user.mail : "#{user.login}@example.com" - unless user_mail.match(EMAIL_REGEX).present? - user_mail = "#{user.login}@example.com" - end + # unless user_mail.match(EMAIL_REGEX).present? + # user_mail = "#{user.login}@example.com" + # end ActiveRecord::Base.transaction do interactor = Gitea::RegisterInteractor.call({username: user.login, email: user_mail, password: new_password}) if interactor.success? From 3a0e729ef3499e51684634232ced446218a914ae Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 17 Jul 2020 17:54:41 +0800 Subject: [PATCH 6/6] Change User Select --- app/tasks/check_gitea_user.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/tasks/check_gitea_user.rb b/app/tasks/check_gitea_user.rb index 5a9e7296a..74ab61ff1 100644 --- a/app/tasks/check_gitea_user.rb +++ b/app/tasks/check_gitea_user.rb @@ -4,7 +4,7 @@ class CheckGiteaUser def call SyncLog.sync_log("=====begin to check gitea_user======") - all_users = User.select(:id, :gitea_token, :gitea_uid, :mail, :type,:login,:platform).where(type: "User", gitea_token: [nil, ""], gitea_uid: [nil, ""]) + all_users = User.where(type: "User", gitea_token: [nil, ""], gitea_uid: [nil, ""]) if all_users.present? new_password = "12345678" # EMAIL_REGEX = /^[a-zA-Z0-9_\-.]+@[a-zA-Z0-9_\-.]+(\.[a-zA-Z0-9_-]+)+$/i