WAF记录ServerId

internal/db/models/http_firewall_policy_dao.go

@@ -91,9 +91,10 @@ func (this *HTTPFirewallPolicyDAO) FindAllEnabledFirewallPolicies(tx *dbs.Tx) (r
 }
 
 // 创建策略
-func (this *HTTPFirewallPolicyDAO) CreateFirewallPolicy(tx *dbs.Tx, userId int64, isOn bool, name string, description string, inboundJSON []byte, outboundJSON []byte) (int64, error) {
+func (this *HTTPFirewallPolicyDAO) CreateFirewallPolicy(tx *dbs.Tx, userId int64, serverId int64, isOn bool, name string, description string, inboundJSON []byte, outboundJSON []byte) (int64, error) {
 	op := NewHTTPFirewallPolicyOperator()
 	op.UserId = userId
+	op.ServerId = serverId
 	op.State = HTTPFirewallPolicyStateEnabled
 	op.IsOn = isOn
 	op.Name = name
@@ -177,6 +178,7 @@ func (this *HTTPFirewallPolicyDAO) CountAllEnabledFirewallPolicies(tx *dbs.Tx) (
 	return this.Query(tx).
 		State(HTTPFirewallPolicyStateEnabled).
 		Attr("userId", 0).
+		Attr("serverId", 0).
 		Count()
 }
 
@@ -185,6 +187,7 @@ func (this *HTTPFirewallPolicyDAO) ListEnabledFirewallPolicies(tx *dbs.Tx, offse
 	_, err = this.Query(tx).
 		State(HTTPFirewallPolicyStateEnabled).
 		Attr("userId", 0).
+		Attr("serverId", 0).
 		Offset(offset).
 		Limit(size).
 		DescPk().
@@ -324,6 +327,15 @@ func (this *HTTPFirewallPolicyDAO) FindEnabledFirewallPolicyIdWithRuleGroupId(tx
 		FindInt64Col(0)
 }
 
+// 设置某个策略所属的服务ID
+func (this *HTTPFirewallPolicyDAO) UpdateFirewallPolicyServerId(tx *dbs.Tx, policyId int64, serverId int64) error {
+	_, err :=  this.Query(tx).
+		Pk(policyId).
+		Set("serverId", serverId).
+		Update()
+	return err
+}
+
 // 通知更新
 func (this *HTTPFirewallPolicyDAO) NotifyUpdate(tx *dbs.Tx, policyId int64) error {
 	webIds, err := SharedHTTPWebDAO.FindAllWebIdsWithHTTPFirewallPolicyId(tx, policyId)

internal/db/models/http_firewall_policy_model.go

@@ -6,6 +6,7 @@ type HTTPFirewallPolicy struct {
 	TemplateId   uint32 `field:"templateId"`   // 模版ID
 	AdminId      uint32 `field:"adminId"`      // 管理员ID
 	UserId       uint32 `field:"userId"`       // 用户ID
+	ServerId     uint32 `field:"serverId"`     // 服务ID
 	State        uint8  `field:"state"`        // 状态
 	CreatedAt    uint64 `field:"createdAt"`    // 创建时间
 	IsOn         uint8  `field:"isOn"`         // 是否启用
@@ -21,6 +22,7 @@ type HTTPFirewallPolicyOperator struct {
 	TemplateId   interface{} // 模版ID
 	AdminId      interface{} // 管理员ID
 	UserId       interface{} // 用户ID
+	ServerId     interface{} // 服务ID
 	State        interface{} // 状态
 	CreatedAt    interface{} // 创建时间
 	IsOn         interface{} // 是否启用