换成单集群模式

EdgeAPI/internal/rpc/services/httpdns/service_httpdns_sandbox.go

@@ -83,12 +83,23 @@ func (this *HTTPDNSSandboxService) TestHTTPDNSResolve(ctx context.Context, req *
 			RequestId: "rid-" + rands.HexString(12),
 		}, nil
 	}
-	if req.ClusterId > 0 && req.ClusterId != int64(app.PrimaryClusterId) && req.ClusterId != int64(app.BackupClusterId) {
-		return &pb.TestHTTPDNSResolveResponse{
-			Code:      "APP_CLUSTER_MISMATCH",
-			Message:   "当前应用未绑定到该集群 (主集群: " + strconv.FormatInt(int64(app.PrimaryClusterId), 10) + ", 备用集群: " + strconv.FormatInt(int64(app.BackupClusterId), 10) + ")",
-			RequestId: "rid-" + rands.HexString(12),
-		}, nil
+	// 检查集群是否绑定
+	appClusterIds := models.SharedHTTPDNSAppDAO.ReadAppClusterIds(app)
+	if req.ClusterId > 0 {
+		var found bool
+		for _, cid := range appClusterIds {
+			if cid == req.ClusterId {
+				found = true
+				break
+			}
+		}
+		if !found {
+			return &pb.TestHTTPDNSResolveResponse{
+				Code:      "APP_CLUSTER_MISMATCH",
+				Message:   "当前应用未绑定到该集群",
+				RequestId: "rid-" + rands.HexString(12),
+			}, nil
+		}
 	}
 
 	qtype := strings.ToUpper(strings.TrimSpace(req.Qtype))
@@ -98,8 +109,8 @@ func (this *HTTPDNSSandboxService) TestHTTPDNSResolve(ctx context.Context, req *
 
 	// 获取集群服务域名
 	clusterId := req.ClusterId
-	if clusterId <= 0 {
-		clusterId = int64(app.PrimaryClusterId)
+	if clusterId <= 0 && len(appClusterIds) > 0 {
+		clusterId = appClusterIds[0]
 	}
 	cluster, err := models.SharedHTTPDNSClusterDAO.FindEnabledCluster(this.NullTx(), clusterId)
 	if err != nil {
@@ -128,6 +139,25 @@ func (this *HTTPDNSSandboxService) TestHTTPDNSResolve(ctx context.Context, req *
 		return nil, err
 	}
 
+	port := "443"
+	if len(cluster.TLSPolicy) > 0 {
+		var tlsConfig map[string]interface{}
+		if err := json.Unmarshal(cluster.TLSPolicy, &tlsConfig); err == nil {
+			if listenRaw, ok := tlsConfig["listen"]; ok && listenRaw != nil {
+				if data, err := json.Marshal(listenRaw); err == nil {
+					var listenAddresses []map[string]interface{}
+					if err := json.Unmarshal(data, &listenAddresses); err == nil {
+						if len(listenAddresses) > 0 {
+							if portRange, ok := listenAddresses[0]["portRange"].(string); ok && len(portRange) > 0 {
+								port = portRange
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
 	query := url.Values{}
 	query.Set("appId", req.AppId)
 	query.Set("dn", req.Domain)
@@ -167,7 +197,7 @@ func (this *HTTPDNSSandboxService) TestHTTPDNSResolve(ctx context.Context, req *
 		query.Set("sign", sign)
 	}
 
-	resolveURL := "https://" + serviceDomain + "/resolve?" + query.Encode()
+	resolveURL := "https://" + serviceDomain + ":" + port + "/resolve?" + query.Encode()
 
 	httpClient := &http.Client{
 		Timeout: 5 * time.Second,