From b6448d127db75c2292dff4bc220e9f3c8b800aab Mon Sep 17 00:00:00 2001 From: xxqfamous Date: Tue, 30 May 2023 14:05:11 +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=E6=A0=A1=E9=AA=8C=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 | 6 ++---- app/services/admins/import_user_from_excel_service.rb | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index 1cb703e9c..8e395b833 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -4,12 +4,11 @@ class AccountsController < ApplicationController #skip_before_action :check_account, :only => [:logout] - def simple_update + def simple_update 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_id: current_user.id) - Register::RemoteForm.new(simple_update_params).validate! + Register::RemoteForm.new(simple_update_params.merge(user_id: current_user.id)).validate! ActiveRecord::Base.transaction do result = auto_update(current_user, simple_update_params) @@ -28,7 +27,6 @@ class AccountsController < ApplicationController # 其他平台同步注册的用户 def remote_register - 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) diff --git a/app/services/admins/import_user_from_excel_service.rb b/app/services/admins/import_user_from_excel_service.rb index b1ade1de2..709551c23 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_id: nil}).validate! + Register::RemoteForm.new({username: username, email: email, password: password, platform: 'forge'}).validate! user = User.new(admin: false, login: username, mail: email, nickname: nickname, platform: 'forge' , type: "User") user.password = password user.activate