From 8a37ae2d4b1ceeeed6baa8b4f8fe8d66bda8b0d1 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Mon, 3 Apr 2023 11:08:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../neutrinoproxy/server/service/LicenseService.java      | 3 ++-
 .../neutrinoproxy/server/service/PortMappingService.java  | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/LicenseService.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/LicenseService.java
index f1b3830f..e818c6db 100644
--- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/LicenseService.java
+++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/LicenseService.java
@@ -29,6 +29,7 @@ import org.jetbrains.annotations.Nullable;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Inject;
 import org.noear.solon.core.Lifecycle;
+import org.noear.solon.core.bean.LifecycleBean;
 
 import java.util.*;
 import java.util.function.Function;
@@ -40,7 +41,7 @@ import java.util.stream.Collectors;
  * @date: 2022/8/6
  */
 @Component
-public class LicenseService implements Lifecycle {
+public class LicenseService implements LifecycleBean {
 	@Inject
 	private MapperFacade mapperFacade;
 	@Db
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 443466af..7e89c5b5 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
@@ -36,6 +36,7 @@ import org.dromara.neutrinoproxy.server.util.ProxyUtil;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Inject;
 import org.noear.solon.core.Lifecycle;
+import org.noear.solon.core.bean.LifecycleBean;
 
 import java.util.*;
 import java.util.function.Function;
@@ -47,7 +48,7 @@ import java.util.stream.Collectors;
  * @date: 2022/8/8
  */
 @Component
-public class PortMappingService implements Lifecycle {
+public class PortMappingService implements LifecycleBean {
 	@Inject
 	private MapperFacade mapperFacade;
 	@Db
@@ -174,6 +175,11 @@ public class PortMappingService implements Lifecycle {
 		portMappingMapper.updateById(portMappingDO);
 		// 更新VisitorChannel
 		visitorChannelService.updateVisitorChannelByPortMapping(oldPortMappingDO, portMappingDO);
+		// 删除老的域名映射
+		if (NetworkProtocolEnum.HTTP.getDesc().equals(oldPortMappingDO.getProtocal()) &&
+			StrUtil.isNotBlank(oldPortMappingDO.getSubdomain())) {
+			ProxyUtil.removeSubdomainToServerPort(oldPortMappingDO.getSubdomain());
+		}
 		// 更新域名映射
 		if (NetworkProtocolEnum.HTTP.getDesc().equals(portMappingDO.getProtocal()) &&
 				StrUtil.isNotBlank(proxyConfig.getServer().getDomainName()) &&