From 08e4b54b5b0d25d2d11655558a639d868e83ebf9 Mon Sep 17 00:00:00 2001
From: yangfuhai <fuhai999@gmail.com>
Date: Mon, 17 Dec 2018 19:12:13 +0800
Subject: [PATCH] add createdPropExt() method

---
 .../server/undertow/UndertowConfig.java       | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/jfinal/server/undertow/UndertowConfig.java b/src/main/java/com/jfinal/server/undertow/UndertowConfig.java
index b0583b5..a7c3f46 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
-- 
Gitee