From c080bf8d6462d01836b19c4d0f3c3a9ceb4e62e6 Mon Sep 17 00:00:00 2001
From: wxm <115806199+youfanx@users.noreply.github.com>
Date: Thu, 19 Oct 2023 15:07:52 +0800
Subject: [PATCH] up

---
 rxlib/src/main/java/org/rx/core/Constants.java         | 2 +-
 rxlib/src/main/java/org/rx/core/YamlConfiguration.java | 3 +--
 rxlib/src/test/java/org/rx/core/TestCore.java          | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/rxlib/src/main/java/org/rx/core/Constants.java b/rxlib/src/main/java/org/rx/core/Constants.java
index 8d622bea..ddff6d5d 100644
--- a/rxlib/src/main/java/org/rx/core/Constants.java
+++ b/rxlib/src/main/java/org/rx/core/Constants.java
@@ -15,7 +15,7 @@ enum MetricName {
     long TB = GB * 1024L;
     int SIZE_4K = KB * 4;
 
-    String DEFAULT_CONFIG_FILE = "rx.yml";
+    String[] DEFAULT_CONFIG_FILES = {"rx.yml", "application.yml", "bootstrap.yml"};
     int CPU_THREADS = Runtime.getRuntime().availableProcessors();
     String DEFAULT_TRACE_NAME = "rx-traceId";
 
diff --git a/rxlib/src/main/java/org/rx/core/YamlConfiguration.java b/rxlib/src/main/java/org/rx/core/YamlConfiguration.java
index 62b88883..99b1ea5b 100644
--- a/rxlib/src/main/java/org/rx/core/YamlConfiguration.java
+++ b/rxlib/src/main/java/org/rx/core/YamlConfiguration.java
@@ -35,8 +35,7 @@ public static class ChangedEventArgs extends EventArgs {
         final String filePath;
     }
 
-    static final String APP_CONFIG_FILE = "application.yml";
-    public static final YamlConfiguration RX_CONF = new YamlConfiguration(Constants.DEFAULT_CONFIG_FILE, APP_CONFIG_FILE);
+    public static final YamlConfiguration RX_CONF = new YamlConfiguration(Constants.DEFAULT_CONFIG_FILES);
 
     public static Map<String, Object> loadYaml(String... fileNames) {
         return loadYaml(Linq.from(fileNames).selectMany(p -> {
diff --git a/rxlib/src/test/java/org/rx/core/TestCore.java b/rxlib/src/test/java/org/rx/core/TestCore.java
index 955c4acc..68acb5a9 100644
--- a/rxlib/src/test/java/org/rx/core/TestCore.java
+++ b/rxlib/src/test/java/org/rx/core/TestCore.java
@@ -968,7 +968,7 @@ public void dynamicProxy() {
     @SneakyThrows
     @Test
     public void reflect() {
-        for (InputStream resource : Reflects.getResources(Constants.DEFAULT_CONFIG_FILE)) {
+        for (InputStream resource : Reflects.getResources(Constants.DEFAULT_CONFIG_FILES[0])) {
             System.out.println(resource);
             assert resource != null;
         }