From aa131b07056fedb527f8e60f7bf29870024ae7b2 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Tue, 6 Jun 2023 10:11:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3http=E5=9F=9F=E5=90=8D?=
 =?UTF-8?q?=E6=98=A0=E5=B0=84=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/constant/NetworkProtocolEnum.java              | 5 +++++
 .../server/controller/PortMappingController.java          | 2 ++
 .../neutrinoproxy/server/service/PortMappingService.java  | 8 ++++----
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/NetworkProtocolEnum.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/NetworkProtocolEnum.java
index 7a053552..9c1fb245 100644
--- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/NetworkProtocolEnum.java
+++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/NetworkProtocolEnum.java
@@ -33,4 +33,9 @@ public enum NetworkProtocolEnum {
         }
         return map.get(desc);
     }
+
+    public static Boolean isHttp(String desc) {
+        NetworkProtocolEnum networkProtocolEnum = of(desc);
+        return NetworkProtocolEnum.HTTP == networkProtocolEnum;
+    }
 }
diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/PortMappingController.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/PortMappingController.java
index 773b264e..5a52640c 100644
--- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/PortMappingController.java
+++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/PortMappingController.java
@@ -51,6 +51,7 @@ public class PortMappingController {
             // 目前仅HTTP支持绑定域名
 			req.setSubdomain(null);
         }
+		req.setProtocal(networkProtocolEnum.getDesc());
 
 		return portMappingService.create(req);
 	}
@@ -74,6 +75,7 @@ public class PortMappingController {
 			// 目前仅HTTP支持绑定域名
 			req.setSubdomain(null);
 		}
+		req.setProtocal(networkProtocolEnum.getDesc());
 
 		return portMappingService.update(req);
 	}
diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/PortMappingService.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/PortMappingService.java
index ee085e26..aa8004f7 100644
--- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/PortMappingService.java
+++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/PortMappingService.java
@@ -149,7 +149,7 @@ public class PortMappingService implements LifecycleBean {
         // 更新VisitorChannel
         visitorChannelService.addVisitorChannelByPortMapping(portMappingDO);
         // 更新域名映射
-        if (NetworkProtocolEnum.HTTP.getDesc().equals(portMappingDO.getProtocal()) &&
+        if (NetworkProtocolEnum.isHttp(portMappingDO.getProtocal()) &&
                 StrUtil.isNotBlank(proxyConfig.getServer().getDomainName()) &&
                 StrUtil.isNotBlank(portMappingDO.getSubdomain())) {
             ProxyUtil.setSubdomainToServerPort(portMappingDO.getSubdomain(), portMappingDO.getServerPort());
@@ -188,12 +188,12 @@ public class PortMappingService implements LifecycleBean {
         // 更新VisitorChannel
         visitorChannelService.updateVisitorChannelByPortMapping(oldPortMappingDO, portMappingDO);
         // 删除老的域名映射
-        if (NetworkProtocolEnum.HTTP.getDesc().equals(oldPortMappingDO.getProtocal()) &&
+        if (NetworkProtocolEnum.isHttp(oldPortMappingDO.getProtocal()) &&
                 StrUtil.isNotBlank(oldPortMappingDO.getSubdomain())) {
             ProxyUtil.removeSubdomainToServerPort(oldPortMappingDO.getSubdomain());
         }
         // 更新域名映射
-        if (NetworkProtocolEnum.HTTP.getDesc().equals(portMappingDO.getProtocal()) &&
+        if (NetworkProtocolEnum.isHttp(portMappingDO.getProtocal()) &&
                 StrUtil.isNotBlank(proxyConfig.getServer().getDomainName()) &&
                 StrUtil.isNotBlank(portMappingDO.getSubdomain())) {
             ProxyUtil.setSubdomainToServerPort(portMappingDO.getSubdomain(), portMappingDO.getServerPort());
@@ -268,7 +268,7 @@ public class PortMappingService implements LifecycleBean {
         // 更新VisitorChannel
         visitorChannelService.removeVisitorChannelByPortMapping(portMappingDO);
         // 更新域名映射
-        if (NetworkProtocolEnum.HTTP.getDesc().equals(portMappingDO.getProtocal()) &&
+        if (NetworkProtocolEnum.isHttp(portMappingDO.getProtocal()) &&
                 StrUtil.isNotBlank(portMappingDO.getSubdomain())) {
             ProxyUtil.removeSubdomainToServerPort(portMappingDO.getSubdomain());
         }