From 1eaea5c81c46bee8b0f29f06fcb19836dea2cd93 Mon Sep 17 00:00:00 2001
From: liyang <liyang1987jay@163.com>
Date: 星期四, 14 十月 2021 21:26:03 +0800
Subject: [PATCH] 修改oss配置删除时删除缓存bug
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java
index e802525..c71c65d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java
@@ -5,6 +5,7 @@
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.google.common.collect.Lists;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.ruoyi.common.core.page.PagePlus;
@@ -31,7 +32,7 @@
import java.util.List;
/**
- * 浜戝瓨鍌ㄩ厤缃甋ervice涓氬姟灞傚鐞�
+ * 瀵硅薄瀛樺偍閰嶇疆Service涓氬姟灞傚鐞�
*
* @author Lion Li
* @author 瀛よ垷鐑熼洦
@@ -88,7 +89,12 @@
public Boolean updateByBo(SysOssConfigBo bo) {
SysOssConfig config = BeanUtil.toBean(bo, SysOssConfig.class);
validEntityBeforeSave(config);
- return setConfigCache(updateById(config), config);
+ LambdaUpdateWrapper<SysOssConfig> luw = new LambdaUpdateWrapper<>();
+ luw.set(StringUtils.isBlank(config.getPrefix()), SysOssConfig::getPrefix, "");
+ luw.set(StringUtils.isBlank(config.getRegion()), SysOssConfig::getRegion, "");
+ luw.set(StringUtils.isBlank(config.getExt1()), SysOssConfig::getExt1, "");
+ luw.eq(SysOssConfig::getOssConfigId, config.getOssConfigId());
+ return setConfigCache(update(config, luw), config);
}
/**
@@ -108,14 +114,18 @@
throw new ServiceException("绯荤粺鍐呯疆, 涓嶅彲鍒犻櫎!");
}
}
+ List<SysOssConfig> list = Lists.newArrayList();
+ for (Long configId : ids) {
+ SysOssConfig config = getById(configId);
+ list.add(config);
+ }
boolean flag = removeByIds(ids);
- if (flag) {
- for (Long configId : ids) {
- SysOssConfig config = getById(configId);
- RedisUtils.deleteObject(getCacheKey(config.getConfigKey()));
- }
- }
- return flag;
+ if (flag) {
+ list.stream().forEach(sysOssConfig -> {
+ RedisUtils.deleteObject(getCacheKey(sysOssConfig.getConfigKey()));
+ });
+ }
+ return flag;
}
/**
--
Gitblit v1.9.3