记录用户节点状态/WAF策略增加ServerId

pkg/rpc/dao/http_web_dao.go

@@ -58,9 +58,10 @@ func (this *HTTPWebDAO) FindWebConfigWithId(ctx context.Context, webId int64) (*
 }
 
 // 初始化防火墙设置
-func (this *HTTPWebDAO) InitEmptyHTTPFirewallPolicy(ctx context.Context, webId int64, isOn bool) (int64, error) {
+func (this *HTTPWebDAO) InitEmptyHTTPFirewallPolicy(ctx context.Context, serverId int64, webId int64, isOn bool) (int64, error) {
 	// 创建FirewallPolicy
 	firewallPolicyIdResp, err := this.RPC().HTTPFirewallPolicyRPC().CreateEmptyHTTPFirewallPolicy(ctx, &pb.CreateEmptyHTTPFirewallPolicyRequest{
+		ServerId:    serverId,
 		IsOn:        true,
 		Name:        "用户自定义",
 		Description: "",

pkg/rpc/dao/ip_list_dao.go

@@ -56,7 +56,7 @@ func (this *IPListDAO) CreateIPListForServerId(ctx context.Context, serverId int
 	}
 	if webConfig.FirewallPolicy == nil || webConfig.FirewallPolicy.Id == 0 {
 		isOn := webConfig.FirewallRef != nil && webConfig.FirewallRef.IsOn
-		_, err = SharedHTTPWebDAO.InitEmptyHTTPFirewallPolicy(ctx, webConfig.Id, isOn)
+		_, err = SharedHTTPWebDAO.InitEmptyHTTPFirewallPolicy(ctx, serverId, webConfig.Id, isOn)
 		if err != nil {
 			return 0, errors.Wrap(err)
 		}