BUGFIX:谷歌快捷登录
This commit is contained in:
@@ -2217,20 +2217,28 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
|
|||||||
accountExtendInsert.setHeadImgUrl(pictureUrl);
|
accountExtendInsert.setHeadImgUrl(pictureUrl);
|
||||||
accountExtendInsert.setName(name);
|
accountExtendInsert.setName(name);
|
||||||
|
|
||||||
|
QueryWrapper<Account> accountQueryWrapper = new QueryWrapper<>();
|
||||||
|
accountQueryWrapper.lambda().eq(Account::getUserEmail, email); // 根据邮箱查询用户
|
||||||
|
List<Account> accounts = accountMapper.selectList(accountQueryWrapper);
|
||||||
|
|
||||||
// 用户不存在,创建新用户(自动注册)
|
// 用户不存在,创建新用户(自动注册)
|
||||||
Account newUser = new Account();
|
Account newUser = new Account();
|
||||||
newUser.setUserEmail(email);
|
if (CollectionUtil.isNotEmpty(accounts)) {
|
||||||
newUser.setUserName(name);
|
newUser = CopyUtil.copyObject(accounts.get(0), Account.class);
|
||||||
newUser.setUserPassword("Third-000000");
|
}else {
|
||||||
newUser.setLanguage(Language.ENGLISH.name());
|
newUser.setUserEmail(email);
|
||||||
newUser.setValidStartTime(System.currentTimeMillis());
|
newUser.setUserName(name);
|
||||||
newUser.setValidEndTime(toDayEnd(Instant.now().plus(5, ChronoUnit.DAYS).toEpochMilli()));
|
newUser.setUserPassword("Third-000000");
|
||||||
newUser.setCreateDate(new Date());
|
newUser.setLanguage(Language.ENGLISH.name());
|
||||||
newUser.setIsTrial(1);
|
newUser.setValidStartTime(System.currentTimeMillis());
|
||||||
newUser.setIsBeginner(1);
|
newUser.setValidEndTime(toDayEnd(Instant.now().plus(5, ChronoUnit.DAYS).toEpochMilli()));
|
||||||
newUser.setCredits(BigDecimal.valueOf(100));
|
newUser.setCreateDate(new Date());
|
||||||
newUser.setSystemUser(3);
|
newUser.setIsTrial(1);
|
||||||
accountMapper.insert(newUser);
|
newUser.setIsBeginner(1);
|
||||||
|
newUser.setCredits(BigDecimal.valueOf(100));
|
||||||
|
newUser.setSystemUser(3);
|
||||||
|
accountMapper.insert(newUser);
|
||||||
|
}
|
||||||
|
|
||||||
accountExtendInsert.setAccountId(newUser.getId());
|
accountExtendInsert.setAccountId(newUser.getId());
|
||||||
accountExtendMapper.insert(accountExtendInsert);
|
accountExtendMapper.insert(accountExtendInsert);
|
||||||
|
|||||||
Reference in New Issue
Block a user