diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index 7e43abb5c..41e66a367 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -71,11 +71,11 @@ class AccountsController < ApplicationController Rails.logger.info("######_________user_param_login________#############{user_params["login"]}") if (user_params["mail"] && user_params["mail"] != user_mail) || (user_params["login"] && user_params["login"] != params[:old_user_login]) - sync_params.merge(email: user_params["mail"], username: user_params["login"]) + sync_params = sync_params.merge(email: user_params["mail"], username: user_params["login"]) end if sync_params.present? - update_gitea = Gitea::User::UpdateService.call(u.gitea_token, sync_params) + update_gitea = Gitea::User::UpdateService.call(u.gitea_token, params[:old_user_login], sync_params) Rails.logger.info("########________update_gitea__________###########__status:_#{update_gitea.status}") end end diff --git a/app/services/gitea/user/update_service.rb b/app/services/gitea/user/update_service.rb index c69fbbc34..3650d3902 100644 --- a/app/services/gitea/user/update_service.rb +++ b/app/services/gitea/user/update_service.rb @@ -1,6 +1,6 @@ class Gitea::User::UpdateService < Gitea::ClientService # attr_reader :admin_user, :params - attr_reader :token, :email, :username + attr_reader :token, :old_login, :params # 只有管理员才能修改用户信息 # params: # admin boolean @@ -18,9 +18,10 @@ class Gitea::User::UpdateService < Gitea::ClientService # source_id integer($int64) # website string - def initialize(token, params={}) + def initialize(token, old_login, params={}) @token = token @params = params + @old_login = old_login end def call @@ -30,7 +31,7 @@ class Gitea::User::UpdateService < Gitea::ClientService private def url - "/admin/users/#{username}" + "/admin/users/#{old_login}" end def data_params