Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-12-14 15:45:06 +08:00
commit 0dc280f9a5
2 changed files with 3 additions and 3 deletions

View File

@ -668,7 +668,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
} }
@Override @Override
@Cacheable(value = resourceSelectTotalKey, key = "'totle'") @Cacheable(value = resourceSelectTotalKey, key = "#{'totol'}")
public Object selectTotal() { public Object selectTotal() {
HashMap<String, Object> resultMap = new HashMap<>(); HashMap<String, Object> resultMap = new HashMap<>();
List<Map> re = resourceDao.selectTypeCount(null); List<Map> re = resourceDao.selectTypeCount(null);

View File

@ -116,7 +116,7 @@
eternal="false" eternal="false"
timeToIdleSeconds="15" timeToIdleSeconds="15"
timeToLiveSeconds="60" timeToLiveSeconds="60"
overflowToDisk="true" overflowToDisk="false"
diskPersistent="true" diskPersistent="false"
memoryStoreEvictionPolicy="LRU"/> memoryStoreEvictionPolicy="LRU"/>
</ehcache> </ehcache>