|
|
@ -1,5 +1,6 @@ |
|
|
package com.bx.implatform.service.impl; |
|
|
package com.bx.implatform.service.impl; |
|
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.date.DateUtil; |
|
|
import cn.hutool.core.util.ObjectUtil; |
|
|
import cn.hutool.core.util.ObjectUtil; |
|
|
import cn.hutool.core.util.StrUtil; |
|
|
import cn.hutool.core.util.StrUtil; |
|
|
import com.alibaba.fastjson.JSON; |
|
|
import com.alibaba.fastjson.JSON; |
|
|
@ -111,6 +112,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us |
|
|
guestUser.setUuid(guestUuid); |
|
|
guestUser.setUuid(guestUuid); |
|
|
guestUser.setLastLoginIp(dto.getIp()); |
|
|
guestUser.setLastLoginIp(dto.getIp()); |
|
|
guestUser.setSourceUrl(dto.getSourceUrl()); |
|
|
guestUser.setSourceUrl(dto.getSourceUrl()); |
|
|
|
|
|
guestUser.setLastLoginTime(DateUtil.date()); |
|
|
guestUser.setUniqueToken(dto.getUniqueToken()); |
|
|
guestUser.setUniqueToken(dto.getUniqueToken()); |
|
|
// 保存到数据库
|
|
|
// 保存到数据库
|
|
|
this.save(guestUser); |
|
|
this.save(guestUser); |
|
|
@ -151,10 +153,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us |
|
|
return vo; |
|
|
return vo; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* 根据 uniqueToken 查询【客服】 |
|
|
|
|
|
* 客服条件:is_customer = 2 且 unique_token = 传入的token |
|
|
|
|
|
*/ |
|
|
|
|
|
public Long getCustomerServiceIdByUniqueToken(String uniqueToken) { |
|
|
public Long getCustomerServiceIdByUniqueToken(String uniqueToken) { |
|
|
// 1. 构建查询条件
|
|
|
// 1. 构建查询条件
|
|
|
LambdaQueryWrapper<User> queryWrapper = Wrappers.lambdaQuery(); |
|
|
LambdaQueryWrapper<User> queryWrapper = Wrappers.lambdaQuery(); |
|
|
@ -230,6 +228,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us |
|
|
String newRefreshToken = JwtUtil.sign(userId, strJson, jwtProperties.getRefreshTokenExpireIn(), |
|
|
String newRefreshToken = JwtUtil.sign(userId, strJson, jwtProperties.getRefreshTokenExpireIn(), |
|
|
jwtProperties.getRefreshTokenSecret()); |
|
|
jwtProperties.getRefreshTokenSecret()); |
|
|
LoginVO vo = new LoginVO(); |
|
|
LoginVO vo = new LoginVO(); |
|
|
|
|
|
User guestUser = new User(); |
|
|
|
|
|
guestUser.setLastLoginTime(DateUtil.date()); |
|
|
vo.setAccessToken(accessToken); |
|
|
vo.setAccessToken(accessToken); |
|
|
vo.setAccessTokenExpiresIn(jwtProperties.getAccessTokenExpireIn()); |
|
|
vo.setAccessTokenExpiresIn(jwtProperties.getAccessTokenExpireIn()); |
|
|
vo.setRefreshToken(newRefreshToken); |
|
|
vo.setRefreshToken(newRefreshToken); |
|
|
|