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 25b4677b..be5d23c9 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 @@ -2,6 +2,7 @@ package org.dromara.neutrinoproxy.server.constant; import lombok.AllArgsConstructor; import lombok.Getter; +import org.apache.commons.lang3.StringUtils; import java.util.Map; import java.util.function.Function; @@ -23,6 +24,12 @@ public enum NetworkProtocolEnum { private static final Map map = Stream.of(NetworkProtocolEnum.values()).collect(Collectors.toMap(NetworkProtocolEnum::getDesc, Function.identity())); public static NetworkProtocolEnum of(String desc) { + if (StringUtils.isBlank(desc)) { + return null; + } + if (desc.startsWith("HTTP")) { + return NetworkProtocolEnum.HTTP; + } return map.get(desc); } } 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 5867ece7..ee085e26 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 @@ -108,6 +108,9 @@ public class PortMappingService implements LifecycleBean { if (StrUtil.isNotBlank(proxyConfig.getServer().getDomainName()) && StrUtil.isNotBlank(item.getSubdomain())) { item.setDomain(item.getSubdomain() + "." + proxyConfig.getServer().getDomainName()); } + if (NetworkProtocolEnum.HTTP.getDesc().equals(item.getProtocal())) { + item.setProtocal("HTTP(S)"); + } }); //sorted [userId asc] [licenseId asc] [createTime asc] respList = respList.stream().sorted(Comparator.comparing(PortMappingListRes::getUserId)