|
|
|
@ -24,8 +24,10 @@ class Oauth::CreateOrFindWechatAccountService < ApplicationService
|
|
|
|
|
new_user = true
|
|
|
|
|
# 新用户
|
|
|
|
|
login = User.generate_login('w')
|
|
|
|
|
result['nickname'] = result['nickname'].gsub(/\uD83C[\uDF00-\uDFFF]|\uD83D[\uDC00-\uDE4F]/, ' ')
|
|
|
|
|
## result['nickname'] = result['nickname'].gsub(/\uD83C[\uDF00-\uDFFF]|\uD83D[\uDC00-\uDE4F]/, ' ')
|
|
|
|
|
#@user = User.new(login: login, nickname: result['nickname'], type: 'User', status: User::STATUS_ACTIVE)
|
|
|
|
|
@user = User.new(login: login, nickname: result['nickname'], type: 'User', status: User::STATUS_ACTIVE)
|
|
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
ActiveRecord::Base.transaction do
|
|
|
|
|