From 0b2f2b189c99e1e08ff68d6f90bf8c4943bf8089 Mon Sep 17 00:00:00 2001 From: Redkale Date: Thu, 24 Nov 2022 20:01:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96PropertiesAgent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/redkale/boot/PropertiesAgent.java | 10 ++++++++++ src/main/java/org/redkale/util/ResourceFactory.java | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/redkale/boot/PropertiesAgent.java b/src/main/java/org/redkale/boot/PropertiesAgent.java index 2be09f36f..7f6cc3d06 100644 --- a/src/main/java/org/redkale/boot/PropertiesAgent.java +++ b/src/main/java/org/redkale/boot/PropertiesAgent.java @@ -17,10 +17,20 @@ import org.redkale.util.*; */ public abstract class PropertiesAgent { + public static final String PROP_KEY_URL = "url"; + + public static final String PROP_KEY_NAMESPACE = "namespace"; + + public static final String PROP_NAMESPACE_APPLICATION = "application"; + public void compile(AnyValue conf) { } public abstract void init(ResourceFactory factory, Properties appProperties, AnyValue conf); public abstract void destroy(AnyValue conf); + + protected String getKeyResourceName(String key) { + return key.startsWith("property.") ? key : ("property." + key); + } } diff --git a/src/main/java/org/redkale/util/ResourceFactory.java b/src/main/java/org/redkale/util/ResourceFactory.java index 66d0cd1d9..56b8850f7 100644 --- a/src/main/java/org/redkale/util/ResourceFactory.java +++ b/src/main/java/org/redkale/util/ResourceFactory.java @@ -875,13 +875,13 @@ public final class ResourceFactory { if (element.listener != null) { try { oldVal = element.field.get(dest); - } catch (Exception e) { + } catch (Throwable e) { e.printStackTrace(); } } try { element.field.set(dest, newVal); - } catch (Exception e) { + } catch (Throwable e) { e.printStackTrace(); } if (element.listener != null) { @@ -894,7 +894,7 @@ public final class ResourceFactory { wrappers.add(new ResourceChangeWrapper(dest, element.listener, new ResourceChangeEvent(name, newVal, oldVal))); } } - } catch (Exception e) { + } catch (Throwable e) { logger.log(Level.SEVERE, dest + " resource change listener error", e); } }