Merge branch 'master' into docker_package
This commit is contained in:
commit
0dc280f9a5
|
@ -668,7 +668,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
|||
}
|
||||
|
||||
@Override
|
||||
@Cacheable(value = resourceSelectTotalKey, key = "'totle'")
|
||||
@Cacheable(value = resourceSelectTotalKey, key = "#{'totol'}")
|
||||
public Object selectTotal() {
|
||||
HashMap<String, Object> resultMap = new HashMap<>();
|
||||
List<Map> re = resourceDao.selectTypeCount(null);
|
||||
|
|
|
@ -116,7 +116,7 @@
|
|||
eternal="false"
|
||||
timeToIdleSeconds="15"
|
||||
timeToLiveSeconds="60"
|
||||
overflowToDisk="true"
|
||||
diskPersistent="true"
|
||||
overflowToDisk="false"
|
||||
diskPersistent="false"
|
||||
memoryStoreEvictionPolicy="LRU"/>
|
||||
</ehcache>
|
Loading…
Reference in New Issue