From 451e06dcaa94c8e593969ea9472149f030614449 Mon Sep 17 00:00:00 2001 From: Alec Zhou Date: Tue, 30 Apr 2019 15:19:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=88=9B=E5=BB=BAopeni?= =?UTF-8?q?=E5=85=B3=E8=81=94=E7=94=A8=E6=88=B7=E6=97=B6=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E6=8E=88=E6=9D=83=EF=BC=8C=E5=B9=B6=E4=B8=94=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BA=86=E7=94=9F=E6=88=90=E7=94=A8=E6=88=B7=E5=90=8D=E7=9A=84?= =?UTF-8?q?=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/oauth_controller.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb index 16f83291..4dd2e6fd 100644 --- a/app/controllers/oauth_controller.rb +++ b/app/controllers/oauth_controller.rb @@ -188,14 +188,13 @@ class OauthController < ApplicationController break if existing_user.present? user = User.new(lastname: name, mail: email, mail_notification: email) - user.login = custom_openi_login(login) + user.login = generate_login('m') user.password = DEFAULT_PASSWORD + user.certification = 1 user.save! UserExtensions.create!(user_id: user.id, school_id: School.first.id, identity: 4, gender: 0) - UserDayCertification.create!(user_id: user.id, status: 1) - openi = Openi.create!(user_id: user.id, openi_user_id: openi_user_id, avatar_url: avatar_url, login: login, name: name, email: email) end end @@ -214,9 +213,10 @@ class OauthController < ApplicationController ####--End-- 获取Openi的授权码，access_token，以及用户信息。为在openi登录的用户创建相关的educoder用户 #### private - # 为了保证新创建的用户用户名不与系统中已存在的用户冲突，加上 _openi 后缀 - def custom_openi_login(login) - login + '_openi' + # 为新创建的用户随机生成以m为前缀的用户名，m表示该用户是用邮箱注册 + def generate_login(login_pre) + us = UsersService.new + us.generate_user_login(login_pre) end def require_login