optimizer: 更新域名映射接口返回值和前端页面显示

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/PortMappingListRes.java

@@ -21,10 +21,10 @@
  */
 package org.dromara.neutrinoproxy.server.controller.res.proxy;
 
-import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
 import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
 import org.dromara.neutrinoproxy.server.constant.OnlineStatusEnum;
-import lombok.Data;
+import org.dromara.neutrinoproxy.server.service.bo.FullDomainNameBO;
 
 import java.util.Date;
 import java.util.List;
@@ -45,18 +45,10 @@ public class PortMappingListRes {
 	 * 协议
 	 */
 	private String protocal;
-	/**
-	 * 子域名集合
-	 */
-	private List<String> subdomains;
     /**
-     * 域名集合
+     * 完整域名映射
      */
-    private List<String> domains;
-	/**
-	 * 域名id集合
-	 */
-	private List<Integer> domainIds;
+    private List<FullDomainNameBO> fullDomainMappings;
 	/**
 	 * license名称
 	 */

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/DomainService.java

@@ -1,7 +1,5 @@
 package org.dromara.neutrinoproxy.server.service;
 
-import cn.hutool.cache.Cache;
-import cn.hutool.cache.CacheUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.text.StrPool;
 import cn.hutool.core.util.StrUtil;
@@ -26,7 +24,6 @@ import org.dromara.neutrinoproxy.server.dal.DomainPortMappingMapper;
 import org.dromara.neutrinoproxy.server.dal.PortMappingMapper;
 import org.dromara.neutrinoproxy.server.dal.UserMapper;
 import org.dromara.neutrinoproxy.server.dal.entity.DomainNameDO;
-import org.dromara.neutrinoproxy.server.dal.entity.DomainPortMappingDO;
 import org.dromara.neutrinoproxy.server.dal.entity.PortMappingDO;
 import org.dromara.neutrinoproxy.server.dal.entity.UserDO;
 import org.dromara.neutrinoproxy.server.proxy.enhance.SslContextManager;

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/PortMappingService.java

@@ -132,16 +132,8 @@ public class PortMappingService implements LifecycleBean {
                 return;
             }
             item.setUserName(user.getName());
-            List<FullDomainNameBO> bos = fullDomainNameBOMap.get(item.getId());
-            // TODO 后续重构域名映射返回值结构
-            if (CollectionUtil.isNotEmpty(bos)) {
-                List<String> subdomains = bos.stream().map(FullDomainNameBO::getSubdomain).collect(Collectors.toList());
-                List<String> domains = bos.stream().map(FullDomainNameBO::getDomain).collect(Collectors.toList());
-                List<Integer> domainIds = bos.stream().map(FullDomainNameBO::getDomainNameId).collect(Collectors.toList());
-                item.setSubdomains(subdomains);
-                item.setDomains(domains);
-                item.setDomainIds(domainIds);
-            }
+            //域名映射
+            item.setFullDomainMappings(fullDomainNameBOMap.get(item.getId()));
             if (NetworkProtocolEnum.HTTP.getDesc().equals(item.getProtocal())) {
                 item.setProtocal("HTTP(S)");
             }

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/bo/FullDomainNameBO.java

@@ -20,16 +20,14 @@ public class FullDomainNameBO {
      * 子域名
      */
     private String subdomain;
-    /**
-     * 域名
-     */
-    private String domain;
-
     /**
      * 域名id
      */
     private Integer domainNameId;
-
+    /**
+     * 域名
+     */
+    private String domain;
     /**
      * 强制使用HTTPS(1、是 2、否)
      * {@link HttpsStatusEnum}