Merge pull request #178 from diaodeng/diaodeng

http端口监听支持范围，default值改成default_server

Author: cym1102

src/main/java/com/cym/service/ConfService.java

@@ -414,6 +414,69 @@ public NgxBlock buildBlockUpstream(Upstream upstream) {
 		return ngxBlockServer;
 	}
 
+	public static List<Integer> processPort(String listenString){
+		List<Integer> numbers = new ArrayList<>();
+
+		// 使用逗号分割字符串
+		String[] partsByComma = listenString.split(",");
+
+		for (String part : partsByComma) {
+			String[] range = part.split("-");
+			if (range.length == 2) {
+				// 处理为范围的情况
+				int start = Integer.parseInt(range[0]);
+				int end = Integer.parseInt(range[1]);
+
+				if (start <= end) {
+					for (int i = start; i <= end; i++) {
+						numbers.add(i);
+					}
+				} else {
+					for (int i = start; i >= end; i--) {
+						numbers.add(i);
+					}
+				}
+			} else {
+				// 处理单个数字的情况
+				int num = Integer.parseInt(part);
+				numbers.add(num);
+			}
+		}
+		return numbers;
+	}
+
+	public static Boolean processListenPort(Server server, NgxBlock ngxBlockServer, Boolean isIpv6) {
+		if (isIpv6 && server.getIpv6() != 1){
+			return false;
+		}
+		List<Integer> ports = processPort(server.getListen());
+
+		String listenKey = isIpv6 ? "listen [::]:" : "listen ";
+
+		String value = "";
+		for (Integer port : ports) {
+			NgxParam ngxParam = new NgxParam();
+			value = listenKey + port;
+			if (server.getDef() == 1) {
+				value += " default_server";
+			}
+			if (server.getProxyProtocol() == 1) {
+				value += " proxy_protocol";
+			}
+
+			if (server.getSsl() == 1) {
+				value += " ssl";
+				if (server.getHttp2() == 1) { // http2旧版写法
+					value += " http2";
+				}
+			}
+			ngxParam.addValue(value);
+			ngxBlockServer.addEntry(ngxParam);
+		}
+		return true;
+
+	}
+
 	public NgxBlock bulidBlockServer(Server server, ConfExt confExt) {
 		NgxParam ngxParam = null;
 
@@ -438,44 +501,10 @@ public NgxBlock bulidBlockServer(Server server, ConfExt confExt) {
 			}
 
 			// 监听端口
-			ngxParam = new NgxParam();
-			String value = "listen " + server.getListen();
-			if (server.getDef() == 1) {
-				value += " default";
-			}
-			if (server.getProxyProtocol() == 1) {
-				value += " proxy_protocol";
-			}
-
-			if (server.getSsl() == 1) {
-				value += " ssl";
-				if (server.getHttp2() == 1) { // http2旧版写法
-					value += " http2";
-				}
-			}
-			ngxParam.addValue(value);
-			ngxBlockServer.addEntry(ngxParam);
-
+			processListenPort(server, ngxBlockServer, false);
 			// 监控ipv6
-			if (server.getIpv6() == 1) {
-				ngxParam = new NgxParam();
-				value = "listen [::]:" + replaceIp(server.getListen());
-				if (server.getDef() == 1) {
-					value += " default";
-				}
-				if (server.getProxyProtocol() == 1) {
-					value += " proxy_protocol";
-				}
+			processListenPort(server, ngxBlockServer, true);
 
-				if (server.getSsl() == 1) {
-					value += " ssl";
-					if (server.getHttp2() == 1) { // http2旧版写法
-						value += " http2";
-					}
-				}
-				ngxParam.addValue(value);
-				ngxBlockServer.addEntry(ngxParam);
-			}
 
 			if (server.getSsl() == 1 && server.getHttp2() == 2) { // http2新版写法
 				ngxParam = new NgxParam();
@@ -718,7 +747,7 @@ public NgxBlock bulidBlockServer(Server server, ConfExt confExt) {
 
 	/**
 	 * 配置ssl
-	 * 
+	 *
 	 * @param server
 	 * @param ngxBlockServer
 	 */
@@ -776,7 +805,7 @@ private void setServerSsl(Server server, NgxBlock ngxBlockServer) {
 
 	/**
 	 * 替换掉listen中的ip
-	 * 
+	 *
 	 * @param listen
 	 * @return
 	 */
@@ -791,7 +820,7 @@ private String replaceIp(String listen) {
 
 	/**
 	 * include防止重复
-	 * 
+	 *
 	 * @param ngxBlockHttp
 	 * @param ngxParam
 	 * @return