1

Author: cym1102

Dockerfile

@@ -5,7 +5,32 @@ ENV LANG=zh_CN.UTF-8 \
 # RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories \
 RUN    apk add --update --no-cache \
        nginx \
-       nginx-mod-* \
+	   nginx-mod-stream \
+	   nginx-mod-stream-geoip \
+	   nginx-mod-stream-geoip2 \
+	   nginx-mod-stream-js \
+	   nginx-mod-stream-keyval \
+	   nginx-mod-http-headers-more \
+	   nginx-mod-http-js \
+	   nginx-mod-http-keyval \
+	   nginx-mod-http-lua \
+	   nginx-mod-http-lua-upstream \
+	   nginx-mod-http-brotli \
+	   nginx-mod-rtmp \
+	   nginx-mod-mail \
+	   nginx-mod-http-geoip \
+	   nginx-mod-http-geoip2 \
+	   nginx-mod-http-zip \
+	   nginx-mod-http-zstd \
+	   nginx-mod-http-perl \
+	   nginx-mod-http-upload \
+	   nginx-mod-http-upload-progress \
+	   nginx-mod-http-upstream-fair \
+	   nginx-mod-http-upstream-jdomain \
+	   nginx-mod-http-echo \
+	   nginx-mod-http-cache-purge \
+	   nginx-mod-dynamic-upstream \
+	   nginx-mod-dynamic-healthcheck \
        openjdk8-jre \
        net-tools \
        curl \

README.md

@@ -111,9 +111,9 @@ Path : JDK安装目录\bin
 
 ```
 Linux: mkdir /home/nginxWebUI/ 
-       wget -O /home/nginxWebUI/nginxWebUI.jar https://gitee.com/cym1102/nginxWebUI/releases/download/4.2.9/nginxWebUI-4.2.9.jar
+       wget -O /home/nginxWebUI/nginxWebUI.jar https://gitee.com/cym1102/nginxWebUI/releases/download/4.3.0/nginxWebUI-4.3.0.jar
 
-Windows: 直接使用浏览器下载 https://gitee.com/cym1102/nginxWebUI/releases/download/4.2.9/nginxWebUI-4.2.9.jar 到 D:/home/nginxWebUI/nginxWebUI.jar
+Windows: 直接使用浏览器下载 https://gitee.com/cym1102/nginxWebUI/releases/download/4.3.0/nginxWebUI-4.3.0.jar 到 D:/home/nginxWebUI/nginxWebUI.jar
 ```
 
 有新版本只需要修改路径中的版本即可

README_EN.md

@@ -107,9 +107,9 @@ reboot
 
 ```
 Linux: mkdir /home/nginxWebUI/   
-       wget -O /home/nginxWebUI/nginxWebUI.jar https://gitee.com/cym1102/nginxWebUI/releases/download/4.2.9/nginxWebUI-4.2.9.jar
+       wget -O /home/nginxWebUI/nginxWebUI.jar https://gitee.com/cym1102/nginxWebUI/releases/download/4.3.0/nginxWebUI-4.3.0.jar
 
-Windows: Download directly from your browser https://gitee.com/cym1102/nginxWebUI/releases/download/4.2.9/nginxWebUI-4.2.9.jar into D:/home/nginxWebUI/
+Windows: Download directly from your browser https://gitee.com/cym1102/nginxWebUI/releases/download/4.3.0/nginxWebUI-4.3.0.jar into D:/home/nginxWebUI/
 ```
 
 With a new version, you just need to change the version in the path

pom.xml

@@ -11,7 +11,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.cym</groupId>
 	<artifactId>nginxWebUI</artifactId>
-	<version>4.2.9</version>
+	<version>4.3.0</version>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/com/cym/model/Stream.java

@@ -22,8 +22,6 @@ public class Stream extends BaseModel {
 	String value;
 	@JsonIgnore
 	Long seq;
-	
-	
 
 	public String getName() {
 		return name;

src/main/java/com/cym/model/UpstreamServer.java

@@ -60,6 +60,23 @@ public class UpstreamServer extends BaseModel {
 	Integer monitorStatus;
 
 
+	/**
+	 * 是否启用 1:启用(默认) 0:禁用
+	 */
+	@InitValue("1")
+	Integer enable;
+	
+	
+
+
+	public Integer getEnable() {
+		return enable;
+	}
+
+	public void setEnable(Integer enable) {
+		this.enable = enable;
+	}
+	
 	public String getParam() {
 		return param;
 	}

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

@@ -144,9 +144,11 @@ public synchronized ConfExt buildConf(Boolean decompose, Boolean check) {
 
 				List<UpstreamServer> upstreamServers = upstreamService.getUpstreamServers(upstream.getId());
 				for (UpstreamServer upstreamServer : upstreamServers) {
-					ngxParam = new NgxParam();
-					ngxParam.addValue("server " + buildNodeStr(upstreamServer));
-					ngxBlockServer.addEntry(ngxParam);
+					if (upstreamServer.getEnable()  == 1) {
+						ngxParam = new NgxParam();
+						ngxParam.addValue("server " + buildNodeStr(upstreamServer));
+						ngxBlockServer.addEntry(ngxParam);
+					}
 				}
 
 				// 自定义参数
@@ -400,9 +402,11 @@ public NgxBlock buildBlockUpstream(Upstream upstream) {
 
 		List<UpstreamServer> upstreamServers = upstreamService.getUpstreamServers(upstream.getId());
 		for (UpstreamServer upstreamServer : upstreamServers) {
-			ngxParam = new NgxParam();
-			ngxParam.addValue("server " + buildNodeStr(upstreamServer));
-			ngxBlockServer.addEntry(ngxParam);
+			if (upstreamServer.getEnable() == 1) {
+				ngxParam = new NgxParam();
+				ngxParam.addValue("server " + buildNodeStr(upstreamServer));
+				ngxBlockServer.addEntry(ngxParam);
+			}
 		}
 
 		// 自定义参数
@@ -456,7 +460,7 @@ public void httpListenPort(Server server, NgxBlock ngxBlockServer, Boolean isIpv
 		} else {
 			ports = processPort(server.getListen());
 		}
-		
+
 		String listenKey = null;
 		if (isIpv6) {
 			listenKey = "listen [::]:";
@@ -488,8 +492,7 @@ public void httpListenPort(Server server, NgxBlock ngxBlockServer, Boolean isIpv
 		}
 
 	}
-	
-	
+
 	public void tcpListenPort(Server server, NgxBlock ngxBlockServer, Boolean isIpv6) {
 		String host = null;
 		List<Integer> ports = null;
@@ -501,7 +504,7 @@ public void tcpListenPort(Server server, NgxBlock ngxBlockServer, Boolean isIpv6
 		} else {
 			ports = processPort(server.getListen());
 		}
-		
+
 		String listenKey = null;
 		if (isIpv6) {
 			listenKey = "listen [::]:";
@@ -510,7 +513,7 @@ public void tcpListenPort(Server server, NgxBlock ngxBlockServer, Boolean isIpv6
 		} else {
 			listenKey = "listen ";
 		}
-		
+
 		String value = "";
 		for (Integer port : ports) {
 			NgxParam ngxParam = new NgxParam();
@@ -738,13 +741,11 @@ public NgxBlock bulidBlockServer(Server server, ConfExt confExt) {
 		} else {
 			ngxBlockServer.addValue("server");
 
-			
 			// 监听端口
 			tcpListenPort(server, ngxBlockServer, false);
 			if (server.getIpv6() == 1) {
 				tcpListenPort(server, ngxBlockServer, true);
 			}
-						
 
 			// 指向负载均衡
 			Upstream upstream = sqlHelper.findById(server.getProxyUpstreamId(), Upstream.class);

src/main/resources/WEB-INF/view/adminPage/server/index.html

@@ -295,7 +295,7 @@
 
 							<div class="layui-form-item" style="padding-left: 20px;">
 								<input type="checkbox" name="def" id="def" title="default_server" lay-skin="primary">
-								<input type="checkbox" name="proxyProtocol" id="proxy_protocol" title="proxy protocol" lay-skin="primary">
+								<input type="checkbox" name="proxyProtocol" id="proxyProtocol" title="proxy protocol" lay-skin="primary">
 								<input type="checkbox" name="ipv6" id="ipv6" title="${serverStr.ipv6}" lay-skin="primary" >
 							</div>
 

src/main/resources/WEB-INF/view/adminPage/upstream/index.html

@@ -229,6 +229,7 @@
 					<table class="layui-table" lay-size="sm">
 						<thead>
 							<tr>
+								<th>${serverStr.status}</th>
 								<th>ip <span class="red">*</span></th>
 								<th>${upstreamStr.port} <span class="red">*</span></th>
 								<th>${upstreamStr.weight}</th>

src/main/resources/static/js/adminPage/upstream/index.js

@@ -65,7 +65,7 @@ function showWindow(title) {
 	layer.open({
 		type: 1,
 		title: title,
-		area: ['1000px', '600px'], // 宽高
+		area: ['1200px', '600px'], // 宽高
 		content: $('#windowDiv')
 	});
 }
@@ -107,6 +107,7 @@ function addOver() {
 	$(".itemList").children().each(function() {
 
 		var upstreamServer = {};
+		upstreamServer.enable = $(this).find("input[name='enable']").prop("checked") ? 1 : 0;
 		upstreamServer.server = $(this).find("input[name='server']").val();
 		upstreamServer.port = $(this).find("input[name='port']").val();
 		upstreamServer.weight = $(this).find("input[name='weight']").val();
@@ -185,7 +186,14 @@ function edit(id,clone) {
 				for (let i = 0; i < list.length; i++) {
 					var upstreamServer = list[i];
 					var uuid = guid();
+					
+					var checked = upstreamServer.enable?"checked":"";
 					html += `<tr id='${uuid}'>
+									<td>
+										<div class="layui-inline" >
+											<input type="checkbox" name="enable" value="${upstreamServer.id}" lay-skin="switch" ${checked}> 
+										</div>
+									</td>
 									<td><input type="text" name="server" class="layui-input" value="${upstreamServer.server}"></td>
 									<td><input type="number" name="port" class="layui-input" value="${upstreamServer.port}"></td>
 									<td><input type="number" name="weight" class="layui-input" value="${upstreamServer.weight}"></td>
@@ -284,6 +292,11 @@ function delMany() {
 function addItem() {
 	var uuid = guid();
 	var html = `<tr id='${uuid}'>
+						<td>
+							<div class="layui-inline" >
+								<input type="checkbox" name="enable" value="${uuid}" lay-skin="switch" checked> 
+							</div>
+						</td>
 						<td><input type="text" name="server" class="layui-input"></td>
 						<td><input type="number" name="port" class="layui-input"></td>
 						<td><input type="number" name="weight" class="layui-input"></td>