lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AppConfig

Browse Source
This commit is contained in:
redkale
2024-08-15 12:06:07 +08:00
parent 8c0b9a0f6a
commit c520910d5c
1 changed files with 46 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
src/main/java/org/redkale/boot/AppConfig.java
View File

@@ -420,50 +420,46 @@ class AppConfig {
confDir = f.getParentFile().getCanonicalPath(); confDir = f.getParentFile().getCanonicalPath();
} else { } else {
f = new File(confDir, "application.yml"); f = new File(confDir, "application.yml");
if (!f.isFile() || !f.canRead()) {
f = new File(confDir, "application.yaml");
}
if (f.isFile() && f.canRead()) { if (f.isFile() && f.canRead()) {
appConfFile = f.toURI(); appConfFile = f.toURI();
confDir = f.getParentFile().getCanonicalPath(); confDir = f.getParentFile().getCanonicalPath();
yaml = true; yaml = true;
} else { } else {
f = new File(confDir, "application.yaml"); f = new File(confDir, "application.properties");
if (f.isFile() && f.canRead()) { if (f.isFile() && f.canRead()) {
appConfFile = f.toURI(); appConfFile = f.toURI();
confDir = f.getParentFile().getCanonicalPath(); confDir = f.getParentFile().getCanonicalPath();
yaml = true;
} else { } else {
f = new File(confDir, "application.properties"); // 不能传confDir
if (f.isFile() && f.canRead()) { appConfFile = RedkaleClassLoader.getConfResourceAsURI(null, "application.xml");
appConfFile = f.toURI(); try {
confDir = f.getParentFile().getCanonicalPath(); appConfFile.toURL().openStream().close();
} else { } catch (IOException e) { // 没有application.xml就尝试读application.yml
// 不能传confDir appConfFile = RedkaleClassLoader.getConfResourceAsURI(null, "application.yml");
appConfFile = RedkaleClassLoader.getConfResourceAsURI(null, "application.xml");
try { try {
appConfFile.toURL().openStream().close(); appConfFile.toURL().openStream().close();
} catch (IOException e) { // 没有application.xml就尝试读application.yml yaml = true;
appConfFile = RedkaleClassLoader.getConfResourceAsURI(null, "application.yml"); } catch (IOException e2) { // 没有application.yml就尝试读application.yaml
appConfFile = RedkaleClassLoader.getConfResourceAsURI(null, "application.yaml");
try { try {
appConfFile.toURL().openStream().close(); appConfFile.toURL().openStream().close();
yaml = true; yaml = true;
} catch (IOException e2) { // 没有application.yml就尝试读application.yaml } catch (IOException e3) { // 没有application.yaml就尝试读application.properties
appConfFile = RedkaleClassLoader.getConfResourceAsURI(null, "application.yaml"); appConfFile =
try { RedkaleClassLoader.getConfResourceAsURI(null, "application.properties");
appConfFile.toURL().openStream().close();
yaml = true;
} catch (IOException e3) { // 没有application.yaml就尝试读application.properties
appConfFile =
RedkaleClassLoader.getConfResourceAsURI(null, "application.properties");
}
} }
} }
confDir = appConfFile
.toString()
.replace("/application.xml", "")
.replace("/application.yml", "")
.replace("/application.yaml", "")
.replace("/application.properties", "");
fromCache = true;
} }
confDir = appConfFile
.toString()
.replace("/application.xml", "")
.replace("/application.yml", "")
.replace("/application.yaml", "")
.replace("/application.properties", "");
fromCache = true;
} }
} }
} }
@@ -474,50 +470,46 @@ class AppConfig {
confDir = f.getParentFile().getCanonicalPath(); confDir = f.getParentFile().getCanonicalPath();
} else { } else {
f = new File(new File(home, confDir), "application.yml"); f = new File(new File(home, confDir), "application.yml");
if (!f.isFile() || !f.canRead()) {
f = new File(confDir, "application.yaml");
}
if (f.isFile() && f.canRead()) { if (f.isFile() && f.canRead()) {
appConfFile = f.toURI(); appConfFile = f.toURI();
confDir = f.getParentFile().getCanonicalPath(); confDir = f.getParentFile().getCanonicalPath();
yaml = true; yaml = true;
} else { } else {
f = new File(new File(home, confDir), "application.yaml"); f = new File(new File(home, confDir), "application.properties");
if (f.isFile() && f.canRead()) { if (f.isFile() && f.canRead()) {
appConfFile = f.toURI(); appConfFile = f.toURI();
confDir = f.getParentFile().getCanonicalPath(); confDir = f.getParentFile().getCanonicalPath();
yaml = true;
} else { } else {
f = new File(new File(home, confDir), "application.properties"); // 不能传confDir
if (f.isFile() && f.canRead()) { appConfFile = RedkaleClassLoader.getConfResourceAsURI(null, "application.xml");
appConfFile = f.toURI(); try {
confDir = f.getParentFile().getCanonicalPath(); appConfFile.toURL().openStream().close();
} else { } catch (IOException e) { // 没有application.xml就尝试读application.yaml
// 不能传confDir appConfFile = RedkaleClassLoader.getConfResourceAsURI(null, "application.yml");
appConfFile = RedkaleClassLoader.getConfResourceAsURI(null, "application.xml");
try { try {
appConfFile.toURL().openStream().close(); appConfFile.toURL().openStream().close();
} catch (IOException e) { // 没有application.xml就尝试读application.yaml yaml = true;
appConfFile = RedkaleClassLoader.getConfResourceAsURI(null, "application.yml"); } catch (IOException e2) { // 没有application.yml就尝试读application.yaml
appConfFile = RedkaleClassLoader.getConfResourceAsURI(null, "application.yaml");
try { try {
appConfFile.toURL().openStream().close(); appConfFile.toURL().openStream().close();
yaml = true; yaml = true;
} catch (IOException e2) { // 没有application.yml就尝试读application.yaml } catch (IOException e3) { // 没有application.yaml就尝试读application.properties
appConfFile = RedkaleClassLoader.getConfResourceAsURI(null, "application.yaml"); appConfFile =
try { RedkaleClassLoader.getConfResourceAsURI(null, "application.properties");
appConfFile.toURL().openStream().close();
yaml = true;
} catch (IOException e3) { // 没有application.yaml就尝试读application.properties
appConfFile =
RedkaleClassLoader.getConfResourceAsURI(null, "application.properties");
}
} }
} }
confDir = appConfFile
.toString()
.replace("/application.xml", "")
.replace("/application.yml", "")
.replace("/application.yaml", "")
.replace("/application.properties", "");
fromCache = true;
} }
confDir = appConfFile
.toString()
.replace("/application.xml", "")
.replace("/application.yml", "")
.replace("/application.yaml", "")
.replace("/application.properties", "");
fromCache = true;
} }
} }
} }