From b43ab281dfcb2db5beff2ebd39e407ef688682ea Mon Sep 17 00:00:00 2001 From: chenjing Date: Thu, 30 Sep 2021 08:58:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9C=A8=E5=85=B0=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E7=9A=84=E9=82=AE=E7=AE=B1=E5=9C=B0=E5=9D=80=E5=88=A4?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/oauth/mulanoss_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/oauth/mulanoss_controller.rb b/app/controllers/oauth/mulanoss_controller.rb index af6c8f06..54e85b41 100644 --- a/app/controllers/oauth/mulanoss_controller.rb +++ b/app/controllers/oauth/mulanoss_controller.rb @@ -7,7 +7,6 @@ class Oauth::MulanossController < Oauth::BaseController begin code = params['code'].to_s.strip tip_exception("code不能为空") if code.blank? - new_user = false result = MulanossOauth::Service.access_token(code) result = MulanossOauth::Service.user_info(result[:access_token]) @@ -17,9 +16,10 @@ class Oauth::MulanossController < Oauth::BaseController successful_authentication(open_user.user) else if current_user.blank? || !current_user.logged? - new_user = true login = User.generate_login('ML') - reg_result = autologin_register(login, "#{login}@forge.com" , "M#{login}2021#", 'mulan', true) + email_regexp = "^([a-z0-9A-Z]+[-|_|\\.]?)+[a-z0-9A-Z]@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\\.)+[a-zA-Z]{2,}$" + mail = result["email"].to_s.match(email_regexp).present? ? result["email"].to_s : "#{login}@forge.com" + reg_result = autologin_register(login, mail , "M#{login}2021#", 'mulan', true) open_user = OpenUsers::Mulan.create!(user_id: reg_result[:user][:id], uid: result['id'], extra: result) successful_authentication(open_user.user) else