Merge remote-tracking branch 'upstream/master'

jetlinks · May 30, 2024 · 3a6824f · 3a6824f
2 parents 63ed9d7 + 3d72223
commit 3a6824f
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 15 deletions.
diff --git a/...nts/common-component/src/main/java/org/jetlinks/community/config/SimpleConfigManager.java b/...nts/common-component/src/main/java/org/jetlinks/community/config/SimpleConfigManager.java
@@ -3,6 +3,8 @@
 import lombok.AllArgsConstructor;
 import org.apache.commons.collections4.MapUtils;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveRepository;
+import org.hswebframework.web.cache.ReactiveCache;
+import org.hswebframework.web.cache.ReactiveCacheManager;
 import org.jetlinks.community.ValueObject;
 import org.jetlinks.community.config.entity.ConfigEntity;
 import reactor.core.publisher.Flux;
@@ -18,6 +20,13 @@ public class SimpleConfigManager implements ConfigManager, ConfigScopeManager {
 
     private final ReactiveRepository<ConfigEntity, String> repository;
 
+    private final ReactiveCache<Map<String, Object>> cache;
+
+    public SimpleConfigManager(ReactiveRepository<ConfigEntity, String> repository, ReactiveCacheManager cacheManager) {
+        this.repository = repository;
+        this.cache = cacheManager.getCache("system-config");
+    }
+
     @Override
     public void addScope(ConfigScope scope,
                          List<ConfigPropertyDef> properties) {
@@ -55,20 +64,27 @@ public Mono<ValueObject> getProperties(String scope) {
                     .filter(def -> null != def.getDefaultValue())
                     .collectMap(ConfigPropertyDef::getKey, ConfigPropertyDef::getDefaultValue),
                 //数据库配置的值
-                repository
-                    .createQuery()
-                    .where(ConfigEntity::getScope, scope)
-                    .fetch()
-                    .filter(val -> MapUtils.isNotEmpty(val.getProperties()))
-                    .<Map<String, Object>>reduce(new LinkedHashMap<>(), (l, r) -> {
-                        l.putAll(r.getProperties());
-                        return l;
-                    }),
+                cache
+                    .getMono(scope, () -> getPropertiesNow(scope)),
                 (defaults, values) -> {
-                    defaults.forEach(values::putIfAbsent);
-                    return values;
+                    Map<String, Object> properties = new HashMap<>(values);
+                    defaults.forEach(properties::putIfAbsent);
+                    return properties;
                 }
-            ).map(ValueObject::of);
+            )
+            .map(ValueObject::of);
+    }
+
+    private Mono<Map<String, Object>> getPropertiesNow(String scope) {
+        return repository
+            .createQuery()
+            .where(ConfigEntity::getScope, scope)
+            .fetch()
+            .filter(val -> MapUtils.isNotEmpty(val.getProperties()))
+            .reduce(new LinkedHashMap<>(), (l, r) -> {
+                l.putAll(r.getProperties());
+                return l;
+            });
     }
 
     @Override
@@ -77,7 +93,9 @@ public Mono<Void> setProperties(String scope, Map<String, Object> values) {
         entity.setProperties(values);
         entity.setScope(scope);
         entity.getId();
-        return repository.save(entity).then();
+        return repository
+            .save(entity)
+            .then(cache.evict(scope));
     }
 
 }
diff --git a/...mon-component/src/main/java/org/jetlinks/community/configuration/CommonConfiguration.java b/...mon-component/src/main/java/org/jetlinks/community/configuration/CommonConfiguration.java
@@ -7,6 +7,7 @@
 import org.apache.commons.beanutils.Converter;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveRepository;
 import org.hswebframework.web.api.crud.entity.EntityFactory;
+import org.hswebframework.web.cache.ReactiveCacheManager;
 import org.jetlinks.community.Interval;
 import org.jetlinks.community.JvmErrorException;
 import org.jetlinks.community.config.ConfigManager;
@@ -159,9 +160,10 @@ public Jackson2ObjectMapperBuilderCustomizer jackson2ObjectMapperBuilderCustomiz
 
     @Bean
     public ConfigManager configManager(ObjectProvider<ConfigScopeCustomizer> configScopeCustomizers,
-                                       ReactiveRepository<ConfigEntity, String> repository) {
+                                       ReactiveRepository<ConfigEntity, String> repository,
+                                       ReactiveCacheManager cacheManager) {
 
-        SimpleConfigManager configManager = new SimpleConfigManager(repository);
+        SimpleConfigManager configManager = new SimpleConfigManager(repository,cacheManager);
         for (ConfigScopeCustomizer customizer : configScopeCustomizers) {
             customizer.custom(configManager);
         }