diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index 8e395b833..59823861f 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -162,7 +162,7 @@ class AccountsController < ApplicationController render_ok end else - tip_exception(-1, interactor.error) + tip_exception(-1, interactor.result[:message]) end rescue Register::BaseForm::EmailError => e render_result(-2, e.message) @@ -177,10 +177,13 @@ class AccountsController < ApplicationController rescue Register::BaseForm::VerifiCodeError => e render_result(-6, e.message) rescue Exception => e - Gitea::User::DeleteService.call(user.login) unless user.nil? - Rails.logger.error("##:register error--#{user.try(:id)}") + if user.present? && !e.message.to_s.include?("user already exists") + # Gitea::User::DeleteService.call(user.login) + # user.destroy + end + Rails.logger.error("##:register error--#{user.try(:id)},message:#{e.message}") logger_error(e) - tip_exception(-1, e.message) + tip_exception(-1, "注册失败") end end