From c88ba4a4d3e781ef4cb074701254c82943f0550c Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 15 Apr 2020 10:42:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/accounts_controller.rb | 14 +++++++++++--- config/routes.rb | 1 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index 17eed90c6..fcc95089d 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -72,6 +72,17 @@ class AccountsController < ApplicationController tip_exception(-1, e.message) end + # 其他平台同步登录 + def remote_login + @user = User.try_to_login(params[:login], params[:password]) + if @user + successful_authentication(@user) + render_ok({user: {id: @user.id, token: @user.gitea_token}}) + else + render_error("用户不存在") + end + end + # 用户注册 @@ -162,9 +173,6 @@ class AccountsController < ApplicationController end successful_authentication(@user) - login_control.clear # 重置每日密码错误次数 - Rails.logger.info("#########_______User_current_id________#############{User.current.try(:id)}") - Rails.logger.info("#########_______current_user_id________#############{current_user.try(:id)}") # session[:user_id] = @user.id end diff --git a/config/routes.rb b/config/routes.rb index 4efeadbcc..42b8f85e1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -123,6 +123,7 @@ Rails.application.routes.draw do get :valid_email_and_phone post :remote_register post :remote_update + post :remote_login end end