From dbdd2f89689a672a9e65b36882d4d01961457a51 Mon Sep 17 00:00:00 2001
From: xxqfamous <xxq250@qq.com>
Date: Tue, 30 May 2023 12:32:41 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/accounts_controller.rb                | 7 ++++---
 app/forms/register/remote_form.rb                     | 5 +++--
 app/services/admins/import_user_from_excel_service.rb | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 727f1f42b..1cb703e9c 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -8,7 +8,7 @@ class AccountsController < ApplicationController
     simple_update_params.merge!(username: params[:username]&.gsub(/\s+/, ""))
     simple_update_params.merge!(email: params[:email]&.gsub(/\s+/, ""))
     simple_update_params.merge!(platform: (params[:platform] || 'forge')&.gsub(/\s+/, ""))
-    simple_update_params.merge!(user: current_user)
+    simple_update_params.merge!(user_id: current_user.id)
     Register::RemoteForm.new(simple_update_params).validate!
 
     ActiveRecord::Base.transaction do 
@@ -28,7 +28,7 @@ class AccountsController < ApplicationController
 
   # 其他平台同步注册的用户
   def remote_register
-    remote_register_params.merge!(user: nil)
+    remote_register_params.merge!(user_id: nil)
     Register::RemoteForm.new(remote_register_params).validate!
     username = params[:username]&.gsub(/\s+/, "")
     tip_exception("无法使用以下关键词：#{username}，请重新命名") if ReversedKeyword.check_exists?(username)
@@ -180,7 +180,8 @@ class AccountsController < ApplicationController
       render_result(-6, e.message)
     rescue Exception => e
       Gitea::User::DeleteService.call(user.login) unless user.nil?
-      uid_logger_error(e.message)
+      Rails.logger.error("##:register error--#{user.try(:id)}")
+      logger_error(e)
       tip_exception(-1, e.message)
     end
   end
diff --git a/app/forms/register/remote_form.rb b/app/forms/register/remote_form.rb
index dabaacdb9..c3eda4358 100644
--- a/app/forms/register/remote_form.rb
+++ b/app/forms/register/remote_form.rb
@@ -1,13 +1,14 @@
 module Register
   class RemoteForm < Register::BaseForm
     # login 登陆方式，支持邮箱、登陆、手机号等
-    attr_accessor :username, :email, :password, :platform, :user
+    attr_accessor :username, :email, :password, :platform, :user_id
 
     validates :username, :email, :password, presence: true
     validate :check!
     
     def check!
-      Rails.logger.info "Register::RemoteForm params: username: #{username}; email: #{email}; password: #{password}; platform: #{platform}"
+      user = User.find_by(id: user_id)
+      Rails.logger.info "Register::RemoteForm params: id: #{user&.id};  username: #{username}; email: #{email}; password: #{password}; platform: #{platform}"
       check_login(username, user)
       check_mail(email,user)
       check_password(password)
diff --git a/app/services/admins/import_user_from_excel_service.rb b/app/services/admins/import_user_from_excel_service.rb
index ab8e793ce..b1ade1de2 100644
--- a/app/services/admins/import_user_from_excel_service.rb
+++ b/app/services/admins/import_user_from_excel_service.rb
@@ -45,7 +45,7 @@ class Admins::ImportUserFromExcelService < ApplicationService
       password = data.password
       nickname = data.nickname&.gsub(/\s+/, "")
       raise Error, "无法使用以下关键词：#{username}，请重新命名" if ReversedKeyword.check_exists?(data.login)
-      Register::RemoteForm.new({username: username, email: email, password: password, platform: 'forge', user: nil}).validate!
+      Register::RemoteForm.new({username: username, email: email, password: password, platform: 'forge', user_id: nil}).validate!
       user = User.new(admin: false, login: username, mail: email, nickname: nickname, platform: 'forge' , type: "User")
       user.password = password
       user.activate