diff --git a/src/main/java/com/jfinal/server/undertow/UndertowConfig.java b/src/main/java/com/jfinal/server/undertow/UndertowConfig.java index b0583b59d37504f5a80a2c932adac4e7aa83a0d1..a7c3f464e0692b242f994f9d4db2a5dc58ef91a6 100644 --- a/src/main/java/com/jfinal/server/undertow/UndertowConfig.java +++ b/src/main/java/com/jfinal/server/undertow/UndertowConfig.java @@ -16,20 +16,21 @@ package com.jfinal.server.undertow; -import java.util.zip.Deflater; import com.jfinal.server.undertow.hotswap.ClassLoaderKit; import com.jfinal.server.undertow.hotswap.HotSwapResolver; import com.jfinal.server.undertow.ssl.SslConfig; import io.undertow.Undertow; import io.undertow.server.handlers.resource.ResourceManager; +import java.util.zip.Deflater; + /** * UndertowConfig */ public class UndertowConfig { static final String UNDERTOW_CONFIG = "undertow.txt"; - static final String UNDERTOW_CONFIG_PRO = "undertow-pro.txt"; +// static final String UNDERTOW_CONFIG_PRO = "undertow-pro.txt"; static final String DEV_MODE = "undertow.devMode"; static final String PORT = "undertow.port"; @@ -102,9 +103,7 @@ public class UndertowConfig { public UndertowConfig(String jfinalConfigClass) { this.jfinalConfig = jfinalConfigClass; - p = new PropExt() - .appendIfExists(UNDERTOW_CONFIG) - .appendIfExists(UNDERTOW_CONFIG_PRO); + p = createPropExt(UNDERTOW_CONFIG); if (p.notEmpty()) { init(); @@ -128,14 +127,22 @@ public class UndertowConfig { this.jfinalConfig = jfinalConfigClass; undertowConfig = undertowConfig.trim(); - p = new PropExt() - .append(undertowConfig) // 指定的配置文件不存在时抛出异常 - .appendIfExists(buildUndertowConfigPro(undertowConfig)); // 尝试加载指定配置文件的 product 配置 + p = createPropExt(undertowConfig); if (p.notEmpty()) { init(); } } + + + protected PropExt createPropExt(String undertowConfig){ + + p = UNDERTOW_CONFIG.equals(undertowConfig) + ? new PropExt().appendIfExists(undertowConfig) + : new PropExt().append(undertowConfig); // 指定的配置文件不存在时抛出异常 + + return p.appendIfExists(buildUndertowConfigPro(undertowConfig)); // 尝试加载指定配置文件的 product 配置 + } /** * 假定用户创建 UndertowServer 时指定 undertow 的配置文件为 abc.txt