liuchang/sys_manager_ebtp_project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.jlcucc.com:52302/coscoshipping/sys_manager_ebtp_project

Browse Source 
 Conflicts:
	src/main/java/com/chinaunicom/mall/ebtp/login/service/impl/BaseUserServiceImpl.java
This commit is contained in:
houjishuang
2025-06-19 11:45:29 +08:00
parent 615a8b60ec a44f07962d
commit fa1a3898a4
1 changed files with 73 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/chinaunicom/mall/ebtp/login/service/impl/BaseUserServiceImpl.java
View File

@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.chinaunicom.mall.ebtp.cloud.security.starter.entity.AuthorityEntity; import com.chinaunicom.mall.ebtp.cloud.security.starter.entity.AuthorityEntity;
import com.chinaunicom.mall.ebtp.cloud.security.starter.entity.SecurityEntity; import com.chinaunicom.mall.ebtp.cloud.security.starter.entity.SecurityEntity;
import com.chinaunicom.mall.ebtp.cloud.userinfo.starter.service.UserInfoService;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService;
import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
@ -43,10 +44,12 @@ import java.util.UUID;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.chinaunicom.mall.ebtp.cloud.security.starter.common.Constants.REDIS_USER_KEY;
/** /**
* 对数据表 base_user 操作的 serviceImpl * 对数据表 base_user 操作的 serviceImpl
* @author yss
* *
* @author yss
*/ */
@Slf4j @Slf4j
@Service @Service
@ -66,10 +69,17 @@ public class BaseUserServiceImpl extends BaseServiceImpl<BaseUserMapper, SysUser
@Resource @Resource
private BaseUserTokenService baseUserTokenService; private BaseUserTokenService baseUserTokenService;
@Autowired
private UserInfoService userInfoService;
@Autowired(required = false) @Autowired(required = false)
@Qualifier("cacheRedisTemplate") @Qualifier("cacheRedisTemplate")
private RedisTemplate<String, Object> redisTemplate; private RedisTemplate<String, Object> redisTemplate;
@Autowired(required = false)
@Qualifier("userinfoRedisTemplate")
private RedisTemplate<String, Object> userinfoRedisTemplate;
@Override @Override
public BaseSelf idcardLogin(String account, String password) { public BaseSelf idcardLogin(String account, String password) {
@ -94,7 +104,19 @@ public class BaseUserServiceImpl extends BaseServiceImpl<BaseUserMapper, SysUser
throw new RuntimeException("用户名或密码错误!"); throw new RuntimeException("用户名或密码错误!");
} }
return userLogin(user);
BaseSelf baseSelf = userLogin(user);
String token = baseSelf.getToken();
//缓存用户信息
BaseCacheUser baseCacheUser = new BaseCacheUser();
BeanUtils.copyProperties(user, baseCacheUser);
//存入缓存redis
userinfoRedisTemplate.opsForValue().set(REDIS_USER_KEY + token,
baseCacheUser, Long.parseLong(valid_time_limit), TimeUnit.HOURS);
userInfoService.getUserInfo(token);
return baseSelf;
} catch (BadPaddingException e) { } catch (BadPaddingException e) {
log.error("RSA解密异常", e); log.error("RSA解密异常", e);
CommonExceptionEnum.FRAME_EXCEPTION_COMMON_DATA_OTHER_ERROR.customValidName("用户名或密码错误", true); CommonExceptionEnum.FRAME_EXCEPTION_COMMON_DATA_OTHER_ERROR.customValidName("用户名或密码错误", true);
@ -231,6 +253,7 @@ public class BaseUserServiceImpl extends BaseServiceImpl<BaseUserMapper, SysUser
/** /**
* 本地token换取用户信息 * 本地token换取用户信息
*
* @param token * @param token
* @return * @return
*/ */