主分支代码

EdgeAPI/internal/db/models/http_access_log_policy_dao.go

@@ -107,7 +107,7 @@ func (this *HTTPAccessLogPolicyDAO) FindAllEnabledAndOnPolicies(tx *dbs.Tx) (res
 }
 
 // CreatePolicy 创建策略
-func (this *HTTPAccessLogPolicyDAO) CreatePolicy(tx *dbs.Tx, name string, policyType string, optionsJSON []byte, condsJSON []byte, isPublic bool, firewallOnly bool, disableDefaultDB bool) (policyId int64, err error) {
+func (this *HTTPAccessLogPolicyDAO) CreatePolicy(tx *dbs.Tx, name string, policyType string, optionsJSON []byte, condsJSON []byte, isPublic bool, firewallOnly bool, disableDefaultDB bool, writeTargetsJSON []byte) (policyId int64, err error) {
 	var op = NewHTTPAccessLogPolicyOperator()
 	op.Name = name
 	op.Type = policyType
@@ -121,12 +121,15 @@ func (this *HTTPAccessLogPolicyDAO) CreatePolicy(tx *dbs.Tx, name string, policy
 	op.IsOn = true
 	op.FirewallOnly = firewallOnly
 	op.DisableDefaultDB = disableDefaultDB
+	if len(writeTargetsJSON) > 0 {
+		op.WriteTargets = writeTargetsJSON
+	}
 	op.State = HTTPAccessLogPolicyStateEnabled
 	return this.SaveInt64(tx, op)
 }
 
 // UpdatePolicy 修改策略
-func (this *HTTPAccessLogPolicyDAO) UpdatePolicy(tx *dbs.Tx, policyId int64, name string, optionsJSON []byte, condsJSON []byte, isPublic bool, firewallOnly bool, disableDefaultDB bool, isOn bool) error {
+func (this *HTTPAccessLogPolicyDAO) UpdatePolicy(tx *dbs.Tx, policyId int64, name string, policyType string, optionsJSON []byte, condsJSON []byte, isPublic bool, firewallOnly bool, disableDefaultDB bool, writeTargetsJSON []byte, isOn bool) error {
 	if policyId <= 0 {
 		return errors.New("invalid policyId")
 	}
@@ -144,6 +147,9 @@ func (this *HTTPAccessLogPolicyDAO) UpdatePolicy(tx *dbs.Tx, policyId int64, nam
 	var op = NewHTTPAccessLogPolicyOperator()
 	op.Id = policyId
 	op.Name = name
+	if policyType != "" {
+		op.Type = policyType
+	}
 	if len(optionsJSON) > 0 {
 		op.Options = optionsJSON
 	} else {
@@ -161,6 +167,9 @@ func (this *HTTPAccessLogPolicyDAO) UpdatePolicy(tx *dbs.Tx, policyId int64, nam
 	op.IsPublic = isPublic
 	op.FirewallOnly = firewallOnly
 	op.DisableDefaultDB = disableDefaultDB
+	if len(writeTargetsJSON) > 0 {
+		op.WriteTargets = writeTargetsJSON
+	}
 	op.IsOn = isOn
 	return this.Save(tx, op)
 }

EdgeAPI/internal/db/models/http_access_log_policy_model.go

@@ -18,6 +18,7 @@ const (
 	HTTPAccessLogPolicyField_FirewallOnly     dbs.FieldName = "firewallOnly"     // 是否只记录防火墙相关
 	HTTPAccessLogPolicyField_Version          dbs.FieldName = "version"          // 版本号
 	HTTPAccessLogPolicyField_DisableDefaultDB dbs.FieldName = "disableDefaultDB" // 是否停止默认数据库存储
+	HTTPAccessLogPolicyField_WriteTargets     dbs.FieldName = "writeTargets"     // 写入目标 JSON：file/mysql/clickhouse
 )
 
 // HTTPAccessLogPolicy 访问日志策略
@@ -37,6 +38,7 @@ type HTTPAccessLogPolicy struct {
 	FirewallOnly     uint8    `field:"firewallOnly"`     // 是否只记录防火墙相关
 	Version          uint32   `field:"version"`          // 版本号
 	DisableDefaultDB bool     `field:"disableDefaultDB"` // 是否停止默认数据库存储
+	WriteTargets     dbs.JSON `field:"writeTargets"`     // 写入目标 JSON：{"file":true,"mysql":true,"clickhouse":false}
 }
 
 type HTTPAccessLogPolicyOperator struct {
@@ -55,6 +57,7 @@ type HTTPAccessLogPolicyOperator struct {
 	FirewallOnly     any // 是否只记录防火墙相关
 	Version          any // 版本号
 	DisableDefaultDB any // 是否停止默认数据库存储
+	WriteTargets     any // 写入目标 JSON
 }
 
 func NewHTTPAccessLogPolicyOperator() *HTTPAccessLogPolicyOperator {

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).

EdgeAPI/internal/db/models/sys_setting_dao_plus.go

@@ -65,3 +65,26 @@ func (this *SysSettingDAO) ReadUserSenderConfig(tx *dbs.Tx) (*userconfigs.UserSe
 	}
 	return config, nil
 }
+
+// ReadClickHouseConfig 读取 ClickHouse 连接配置（后台页面配置，用于访问日志 logs_ingest 查询）
+func (this *SysSettingDAO) ReadClickHouseConfig(tx *dbs.Tx) (*systemconfigs.ClickHouseSetting, error) {
+	valueJSON, err := this.ReadSetting(tx, systemconfigs.SettingCodeClickHouseConfig)
+	if err != nil {
+		return nil, err
+	}
+	out := &systemconfigs.ClickHouseSetting{Port: 8123, Database: "default"}
+	if len(valueJSON) == 0 {
+		return out, nil
+	}
+	err = json.Unmarshal(valueJSON, out)
+	if err != nil {
+		return nil, err
+	}
+	if out.Port <= 0 {
+		out.Port = 8123
+	}
+	if out.Database == "" {
+		out.Database = "default"
+	}
+	return out, nil
+}