From 28882b556c8a37f054875d5aaa0f1ccf0bb1bdc0 Mon Sep 17 00:00:00 2001
From: samwaf <samwafgo@gmail.com>
Date: Thu, 31 Jul 2025 16:12:35 +0800
Subject: [PATCH] feat:host select remark

#412
---
 api/waf_host.go | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/api/waf_host.go b/api/waf_host.go
index 7d70cdd..e35df7c 100644
--- a/api/waf_host.go
+++ b/api/waf_host.go
@@ -118,21 +118,34 @@ func (w *WafHostAPi) GetAllListApi(c *gin.Context) {
 	wafHosts := wafHostService.GetAllHostApi()
 	allHostRep := make([]response2.AllHostRep, len(wafHosts)) // 创建数组
 	for i, _ := range wafHosts {
+		var hostDisplay string
+		var preHost string = fmt.Sprintf("%s:%d", wafHosts[i].Host, wafHosts[i].Port)
 
+		// 构建括号内的内容
+		var bracketContent []string
+
+		// 如果是SSL，添加SSL标识
 		if wafHosts[i].Ssl == 1 {
-			allHostRep[i] = response2.AllHostRep{
-				Host:    fmt.Sprintf("%s:%d(SSL)", wafHosts[i].Host, wafHosts[i].Port),
-				Code:    wafHosts[i].Code,
-				PreHost: fmt.Sprintf("%s:%d", wafHosts[i].Host, wafHosts[i].Port),
-			}
-		} else {
-			allHostRep[i] = response2.AllHostRep{
-				Host:    fmt.Sprintf("%s:%d", wafHosts[i].Host, wafHosts[i].Port),
-				Code:    wafHosts[i].Code,
-				PreHost: fmt.Sprintf("%s:%d", wafHosts[i].Host, wafHosts[i].Port),
-			}
+			bracketContent = append(bracketContent, "SSL")
 		}
 
+		// 如果有备注，添加备注
+		if wafHosts[i].REMARKS != "" {
+			bracketContent = append(bracketContent, wafHosts[i].REMARKS)
+		}
+
+		// 构建最终的Host显示字符串
+		if len(bracketContent) > 0 {
+			hostDisplay = fmt.Sprintf("%s:%d(%s)", wafHosts[i].Host, wafHosts[i].Port, strings.Join(bracketContent, ","))
+		} else {
+			hostDisplay = fmt.Sprintf("%s:%d", wafHosts[i].Host, wafHosts[i].Port)
+		}
+
+		allHostRep[i] = response2.AllHostRep{
+			Host:    hostDisplay,
+			Code:    wafHosts[i].Code,
+			PreHost: preHost,
+		}
 	}
 	response.OkWithDetailed(allHostRep, "获取成功", c)
 }