主分支代码

EdgeAPI/internal/db/models/node_dao.go

@@ -1168,6 +1168,16 @@ func (this *NodeDAO) ComposeNodeConfig(tx *dbs.Tx, nodeId int64, dataMap *shared
 		if config.GlobalServerConfig == nil {
 			config.GlobalServerConfig = nodeCluster.DecodeGlobalServerConfig()
 		}
+		// 注入公用访问日志策略的写入目标（供节点决定是否写文件、是否上报 API）
+		if config.GlobalServerConfig != nil && clusterIndex == 0 {
+			publicPolicyId, _ := SharedHTTPAccessLogPolicyDAO.FindCurrentPublicPolicyId(tx)
+			if publicPolicyId > 0 {
+				publicPolicy, _ := SharedHTTPAccessLogPolicyDAO.FindEnabledHTTPAccessLogPolicy(tx, publicPolicyId)
+				if publicPolicy != nil {
+					config.GlobalServerConfig.HTTPAccessLog.WriteTargets = serverconfigs.ParseWriteTargetsFromPolicy(publicPolicy.WriteTargets, publicPolicy.Type, publicPolicy.DisableDefaultDB)
+				}
+			}
+		}
 
 		// 最大线程数、TCP连接数
 		if clusterIndex == 0 {
@@ -1972,6 +1982,25 @@ func (this *NodeDAO) FindEnabledNodesWithIds(tx *dbs.Tx, nodeIds []int64) (resul
 	return
 }
 
+// FindEnabledBasicNodesWithIds 根据一组ID查找节点基本信息（id, name, clusterId），用于批量填充日志列表的 Node/Cluster
+func (this *NodeDAO) FindEnabledBasicNodesWithIds(tx *dbs.Tx, nodeIds []int64) (result []*Node, err error) {
+	if len(nodeIds) == 0 {
+		return nil, nil
+	}
+	idStrings := []string{}
+	for _, nodeId := range nodeIds {
+		idStrings = append(idStrings, numberutils.FormatInt64(nodeId))
+	}
+	_, err = this.Query(tx).
+		State(NodeStateEnabled).
+		Where("id IN ("+strings.Join(idStrings, ", ")+")").
+		Result("id", "name", "clusterId").
+		Slice(&result).
+		Reuse(false).
+		FindAll()
+	return
+}
+
 // DeleteNodeFromCluster 从集群中删除节点
 func (this *NodeDAO) DeleteNodeFromCluster(tx *dbs.Tx, nodeId int64, clusterId int64) error {
 	one, err := this.Query(tx).