From 04ededaf50589923336dcce962db7b4283d772b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Tue, 14 Feb 2023 17:38:42 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E9=87=8D=E6=9E=84=20=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=88=9D=E5=A7=8B=E5=8C=96=E6=95=B0=E6=8D=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E6=87=92=E5=8A=A0=E8=BD=BD=20=E4=B8=8D=E6=8F=90?= =?UTF-8?q?=E4=BE=9B=E7=83=AD=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 2 - .../ruoyi/common/core/config/RuoYiConfig.java | 5 --- .../runner/SystemApplicationRunner.java | 19 +-------- .../system/service/ISysConfigService.java | 10 ----- .../system/service/ISysDictTypeService.java | 10 ----- .../service/impl/SysConfigServiceImpl.java | 29 +++---------- .../service/impl/SysDictTypeServiceImpl.java | 42 +++++-------------- 7 files changed, 17 insertions(+), 100 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index eb7888080..f18898cfa 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -10,8 +10,6 @@ ruoyi: demoEnabled: true # 获取ip地址开关 addressEnabled: true - # 缓存懒加载 - cacheLazy: false captcha: enable: true diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/RuoYiConfig.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/RuoYiConfig.java index 6185fbcbd..e772a16aa 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/RuoYiConfig.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/RuoYiConfig.java @@ -36,11 +36,6 @@ public class RuoYiConfig { */ private boolean demoEnabled; - /** - * 缓存懒加载 - */ - private boolean cacheLazy; - /** * 获取地址开关 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/runner/SystemApplicationRunner.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/runner/SystemApplicationRunner.java index d1ee13397..e44cf8784 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/runner/SystemApplicationRunner.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/runner/SystemApplicationRunner.java @@ -1,9 +1,5 @@ package com.ruoyi.system.runner; -import com.ruoyi.common.core.config.RuoYiConfig; -import com.ruoyi.common.tenant.helper.TenantHelper; -import com.ruoyi.system.service.ISysConfigService; -import com.ruoyi.system.service.ISysDictTypeService; import com.ruoyi.system.service.ISysOssConfigService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -21,25 +17,12 @@ import org.springframework.stereotype.Component; @Component public class SystemApplicationRunner implements ApplicationRunner { - private final RuoYiConfig ruoyiConfig; - private final ISysConfigService configService; - private final ISysDictTypeService dictTypeService; private final ISysOssConfigService ossConfigService; @Override public void run(ApplicationArguments args) throws Exception { - TenantHelper.enableIgnore(); -// ossConfigService.init(); + ossConfigService.init(); log.info("初始化OSS配置成功"); - if (ruoyiConfig.isCacheLazy()) { - TenantHelper.disableIgnore(); - return; - } - configService.loadingConfigCache(); - log.info("加载参数缓存数据成功"); - dictTypeService.loadingDictCache(); - log.info("加载字典缓存数据成功"); - TenantHelper.disableIgnore(); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java index a998500ad..af2ba2a4c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java @@ -71,16 +71,6 @@ public interface ISysConfigService { */ void deleteConfigByIds(Long[] configIds); - /** - * 加载参数缓存数据 - */ - void loadingConfigCache(); - - /** - * 清空参数缓存数据 - */ - void clearConfigCache(); - /** * 重置参数缓存数据 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java index 546e1bf00..e51c33e85 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java @@ -64,16 +64,6 @@ public interface ISysDictTypeService { */ void deleteDictTypeByIds(Long[] dictIds); - /** - * 加载字典缓存数据 - */ - void loadingDictCache(); - - /** - * 清空字典缓存数据 - */ - void clearDictCache(); - /** * 重置字典缓存数据 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java index 3104e1564..c70aa2291 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java @@ -9,13 +9,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.constant.CacheNames; import com.ruoyi.common.core.constant.UserConstants; +import com.ruoyi.common.core.exception.ServiceException; +import com.ruoyi.common.core.service.ConfigService; +import com.ruoyi.common.core.utils.SpringUtils; +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.core.service.ConfigService; -import com.ruoyi.common.core.exception.ServiceException; -import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.redis.utils.CacheUtils; -import com.ruoyi.common.core.utils.SpringUtils; import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.domain.bo.SysConfigBo; import com.ruoyi.system.domain.vo.SysConfigVo; @@ -175,31 +175,12 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService { baseMapper.deleteBatchIds(Arrays.asList(configIds)); } - /** - * 加载参数缓存数据 - */ - @Override - public void loadingConfigCache() { - List configsList = selectConfigList(new SysConfigBo()); - configsList.forEach(config -> - CacheUtils.put(CacheNames.SYS_CONFIG, config.getConfigKey(), config.getConfigValue())); - } - - /** - * 清空参数缓存数据 - */ - @Override - public void clearConfigCache() { - CacheUtils.clear(CacheNames.SYS_CONFIG); - } - /** * 重置参数缓存数据 */ @Override public void resetConfigCache() { - clearConfigCache(); - loadingConfigCache(); + CacheUtils.clear(CacheNames.SYS_CONFIG); } /** 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 aae31591d..8fb48f96d 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 @@ -11,16 +11,16 @@ 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.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; @@ -33,7 +33,10 @@ import org.springframework.cache.annotation.Cacheable; 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; /** @@ -145,35 +148,12 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService baseMapper.deleteBatchIds(Arrays.asList(dictIds)); } - /** - * 加载字典缓存数据 - */ - @Override - public void loadingDictCache() { - List dictDataList = dictDataMapper.selectVoList( - new LambdaQueryWrapper().eq(SysDictData::getStatus, UserConstants.DICT_NORMAL)); - Map> dictDataMap = StreamUtils.groupByKey(dictDataList, SysDictDataVo::getDictType); - dictDataMap.forEach((k,v) -> { - List dictList = StreamUtils.sorted(v, Comparator.comparing(SysDictDataVo::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); } /**