From 9ed5b521d613edb51b160cca931ee680019e2896 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 07 三月 2023 22:26:13 +0800
Subject: [PATCH] fix 修复 用户密码暴露问题
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java | 135 +++++++++++++++++++-------------------------
1 files changed, 59 insertions(+), 76 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
index dd155ae..c0f68c3 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
@@ -5,20 +5,24 @@
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.constant.CacheNames;
-import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.mybatis.core.page.PageQuery;
-import com.ruoyi.common.core.service.DictService;
-import com.ruoyi.system.domain.SysDictData;
-import com.ruoyi.system.domain.SysDictType;
-import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.service.DictService;
+import com.ruoyi.common.core.utils.MapstructUtils;
+import com.ruoyi.common.core.utils.SpringUtils;
import com.ruoyi.common.core.utils.StreamUtils;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.mybatis.core.page.PageQuery;
+import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.redis.utils.CacheUtils;
-import com.ruoyi.common.core.utils.SpringUtils;
+import com.ruoyi.system.domain.SysDictData;
+import com.ruoyi.system.domain.SysDictType;
+import com.ruoyi.system.domain.bo.SysDictTypeBo;
+import com.ruoyi.system.domain.vo.SysDictDataVo;
+import com.ruoyi.system.domain.vo.SysDictTypeVo;
import com.ruoyi.system.mapper.SysDictDataMapper;
import com.ruoyi.system.mapper.SysDictTypeMapper;
import com.ruoyi.system.service.ISysDictTypeService;
@@ -28,7 +32,10 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -44,15 +51,9 @@
private final SysDictDataMapper dictDataMapper;
@Override
- public TableDataInfo<SysDictType> selectPageDictTypeList(SysDictType dictType, PageQuery pageQuery) {
- Map<String, Object> params = dictType.getParams();
- LambdaQueryWrapper<SysDictType> lqw = new LambdaQueryWrapper<SysDictType>()
- .like(StringUtils.isNotBlank(dictType.getDictName()), SysDictType::getDictName, dictType.getDictName())
- .eq(StringUtils.isNotBlank(dictType.getStatus()), SysDictType::getStatus, dictType.getStatus())
- .like(StringUtils.isNotBlank(dictType.getDictType()), SysDictType::getDictType, dictType.getDictType())
- .between(params.get("beginTime") != null && params.get("endTime") != null,
- SysDictType::getCreateTime, params.get("beginTime"), params.get("endTime"));
- Page<SysDictType> page = baseMapper.selectPage(pageQuery.build(), lqw);
+ public TableDataInfo<SysDictTypeVo> selectPageDictTypeList(SysDictTypeBo dictType, PageQuery pageQuery) {
+ LambdaQueryWrapper<SysDictType> lqw = buildQueryWrapper(dictType);
+ Page<SysDictTypeVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(page);
}
@@ -63,14 +64,20 @@
* @return 瀛楀吀绫诲瀷闆嗗悎淇℃伅
*/
@Override
- public List<SysDictType> selectDictTypeList(SysDictType dictType) {
- Map<String, Object> params = dictType.getParams();
- return baseMapper.selectList(new LambdaQueryWrapper<SysDictType>()
- .like(StringUtils.isNotBlank(dictType.getDictName()), SysDictType::getDictName, dictType.getDictName())
- .eq(StringUtils.isNotBlank(dictType.getStatus()), SysDictType::getStatus, dictType.getStatus())
- .like(StringUtils.isNotBlank(dictType.getDictType()), SysDictType::getDictType, dictType.getDictType())
- .between(params.get("beginTime") != null && params.get("endTime") != null,
- SysDictType::getCreateTime, params.get("beginTime"), params.get("endTime")));
+ public List<SysDictTypeVo> selectDictTypeList(SysDictTypeBo dictType) {
+ LambdaQueryWrapper<SysDictType> lqw = buildQueryWrapper(dictType);
+ return baseMapper.selectVoList(lqw);
+ }
+
+ private LambdaQueryWrapper<SysDictType> buildQueryWrapper(SysDictTypeBo bo) {
+ Map<String, Object> params = bo.getParams();
+ LambdaQueryWrapper<SysDictType> lqw = Wrappers.lambdaQuery();
+ lqw.like(StringUtils.isNotBlank(bo.getDictName()), SysDictType::getDictName, bo.getDictName());
+ lqw.like(StringUtils.isNotBlank(bo.getDictType()), SysDictType::getDictType, bo.getDictType());
+ lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysDictType::getStatus, bo.getStatus());
+ lqw.between(params.get("beginTime") != null && params.get("endTime") != null,
+ SysDictType::getCreateTime, params.get("beginTime"), params.get("endTime"));
+ return lqw;
}
/**
@@ -79,8 +86,8 @@
* @return 瀛楀吀绫诲瀷闆嗗悎淇℃伅
*/
@Override
- public List<SysDictType> selectDictTypeAll() {
- return baseMapper.selectList();
+ public List<SysDictTypeVo> selectDictTypeAll() {
+ return baseMapper.selectVoList();
}
/**
@@ -91,8 +98,8 @@
*/
@Cacheable(cacheNames = CacheNames.SYS_DICT, key = "#dictType")
@Override
- public List<SysDictData> selectDictDataByType(String dictType) {
- List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dictType);
+ public List<SysDictDataVo> selectDictDataByType(String dictType) {
+ List<SysDictDataVo> dictDatas = dictDataMapper.selectDictDataByType(dictType);
if (CollUtil.isNotEmpty(dictDatas)) {
return dictDatas;
}
@@ -106,8 +113,8 @@
* @return 瀛楀吀绫诲瀷
*/
@Override
- public SysDictType selectDictTypeById(Long dictId) {
- return baseMapper.selectById(dictId);
+ public SysDictTypeVo selectDictTypeById(Long dictId) {
+ return baseMapper.selectVoById(dictId);
}
/**
@@ -118,8 +125,8 @@
*/
@Cacheable(cacheNames = CacheNames.SYS_DICT, key = "#dictType")
@Override
- public SysDictType selectDictTypeByType(String dictType) {
- return baseMapper.selectById(new LambdaQueryWrapper<SysDictType>().eq(SysDictType::getDictType, dictType));
+ public SysDictTypeVo selectDictTypeByType(String dictType) {
+ return baseMapper.selectVoById(new LambdaQueryWrapper<SysDictType>().eq(SysDictType::getDictType, dictType));
}
/**
@@ -130,7 +137,7 @@
@Override
public void deleteDictTypeByIds(Long[] dictIds) {
for (Long dictId : dictIds) {
- SysDictType dictType = selectDictTypeById(dictId);
+ SysDictType dictType = baseMapper.selectById(dictId);
if (dictDataMapper.exists(new LambdaQueryWrapper<SysDictData>()
.eq(SysDictData::getDictType, dictType.getDictType()))) {
throw new ServiceException(String.format("%1$s宸插垎閰�,涓嶈兘鍒犻櫎", dictType.getDictName()));
@@ -141,45 +148,23 @@
}
/**
- * 鍔犺浇瀛楀吀缂撳瓨鏁版嵁
- */
- @Override
- public void loadingDictCache() {
- List<SysDictData> dictDataList = dictDataMapper.selectList(
- new LambdaQueryWrapper<SysDictData>().eq(SysDictData::getStatus, UserConstants.DICT_NORMAL));
- Map<String, List<SysDictData>> dictDataMap = StreamUtils.groupByKey(dictDataList, SysDictData::getDictType);
- dictDataMap.forEach((k,v) -> {
- List<SysDictData> dictList = StreamUtils.sorted(v, Comparator.comparing(SysDictData::getDictSort));
- CacheUtils.put(CacheNames.SYS_DICT, k, dictList);
- });
- }
-
- /**
- * 娓呯┖瀛楀吀缂撳瓨鏁版嵁
- */
- @Override
- public void clearDictCache() {
- CacheUtils.clear(CacheNames.SYS_DICT);
- }
-
- /**
* 閲嶇疆瀛楀吀缂撳瓨鏁版嵁
*/
@Override
public void resetDictCache() {
- clearDictCache();
- loadingDictCache();
+ CacheUtils.clear(CacheNames.SYS_DICT);
}
/**
* 鏂板淇濆瓨瀛楀吀绫诲瀷淇℃伅
*
- * @param dict 瀛楀吀绫诲瀷淇℃伅
+ * @param bo 瀛楀吀绫诲瀷淇℃伅
* @return 缁撴灉
*/
- @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#dict.dictType")
+ @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType")
@Override
- public List<SysDictData> insertDictType(SysDictType dict) {
+ public List<SysDictTypeVo> insertDictType(SysDictTypeBo bo) {
+ SysDictType dict = MapstructUtils.convert(bo, SysDictType.class);
int row = baseMapper.insert(dict);
if (row > 0) {
return new ArrayList<>();
@@ -190,13 +175,14 @@
/**
* 淇敼淇濆瓨瀛楀吀绫诲瀷淇℃伅
*
- * @param dict 瀛楀吀绫诲瀷淇℃伅
+ * @param bo 瀛楀吀绫诲瀷淇℃伅
* @return 缁撴灉
*/
- @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#dict.dictType")
+ @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType")
@Override
@Transactional(rollbackFor = Exception.class)
- public List<SysDictData> updateDictType(SysDictType dict) {
+ public List<SysDictDataVo> updateDictType(SysDictTypeBo bo) {
+ SysDictType dict = MapstructUtils.convert(bo, SysDictType.class);
SysDictType oldDict = baseMapper.selectById(dict.getDictId());
dictDataMapper.update(null, new LambdaUpdateWrapper<SysDictData>()
.set(SysDictData::getDictType, dict.getDictType())
@@ -212,18 +198,15 @@
/**
* 鏍￠獙瀛楀吀绫诲瀷绉版槸鍚﹀敮涓�
*
- * @param dict 瀛楀吀绫诲瀷
+ * @param dictType 瀛楀吀绫诲瀷
* @return 缁撴灉
*/
@Override
- public String checkDictTypeUnique(SysDictType dict) {
+ public boolean checkDictTypeUnique(SysDictTypeBo dictType) {
boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysDictType>()
- .eq(SysDictType::getDictType, dict.getDictType())
- .ne(ObjectUtil.isNotNull(dict.getDictId()), SysDictType::getDictId, dict.getDictId()));
- if (exist) {
- return UserConstants.NOT_UNIQUE;
- }
- return UserConstants.UNIQUE;
+ .eq(SysDictType::getDictType, dictType.getDictType())
+ .ne(ObjectUtil.isNotNull(dictType.getDictId()), SysDictType::getDictId, dictType.getDictId()));
+ return !exist;
}
/**
@@ -238,13 +221,13 @@
@Override
public String getDictLabel(String dictType, String dictValue, String separator) {
// 浼樺厛浠庢湰鍦扮紦瀛樿幏鍙�
- List<SysDictData> datas = (List<SysDictData>) SaHolder.getStorage().get(CacheConstants.SYS_DICT_KEY + dictType);
+ List<SysDictDataVo> datas = (List<SysDictDataVo>) SaHolder.getStorage().get(CacheConstants.SYS_DICT_KEY + dictType);
if (ObjectUtil.isNull(datas)) {
datas = SpringUtils.getAopProxy(this).selectDictDataByType(dictType);
SaHolder.getStorage().set(CacheConstants.SYS_DICT_KEY + dictType, datas);
}
- Map<String, String> map = StreamUtils.toMap(datas, SysDictData::getDictValue, SysDictData::getDictLabel);
+ Map<String, String> map = StreamUtils.toMap(datas, SysDictDataVo::getDictValue, SysDictDataVo::getDictLabel);
if (StringUtils.containsAny(dictValue, separator)) {
return Arrays.stream(dictValue.split(separator))
.map(v -> map.getOrDefault(v, StringUtils.EMPTY))
@@ -266,13 +249,13 @@
@Override
public String getDictValue(String dictType, String dictLabel, String separator) {
// 浼樺厛浠庢湰鍦扮紦瀛樿幏鍙�
- List<SysDictData> datas = (List<SysDictData>) SaHolder.getStorage().get(CacheConstants.SYS_DICT_KEY + dictType);
+ List<SysDictDataVo> datas = (List<SysDictDataVo>) SaHolder.getStorage().get(CacheConstants.SYS_DICT_KEY + dictType);
if (ObjectUtil.isNull(datas)) {
datas = SpringUtils.getAopProxy(this).selectDictDataByType(dictType);
SaHolder.getStorage().set(CacheConstants.SYS_DICT_KEY + dictType, datas);
}
- Map<String, String> map = StreamUtils.toMap(datas, SysDictData::getDictLabel, SysDictData::getDictValue);
+ Map<String, String> map = StreamUtils.toMap(datas, SysDictDataVo::getDictLabel, SysDictDataVo::getDictValue);
if (StringUtils.containsAny(dictLabel, separator)) {
return Arrays.stream(dictLabel.split(separator))
.map(l -> map.getOrDefault(l, StringUtils.EMPTY))
--
Gitblit v1.9.3