不同地区提取合并自动配置

web/services/channel.go

@@ -308,6 +308,16 @@ func (s *channelService) CreateChannel(
 		// 更新套餐使用记录
 		step = time.Now()
 
+		toUpdate := models.ResourcePss{
+			Used:      resource.Used + int32(count),
+			DailyLast: now,
+		}
+		last := resource.DailyLast
+		if now.Year() != last.Year() || now.Month() != last.Month() || now.Day() != last.Day() {
+			toUpdate.DailyUsed = int32(count)
+		} else {
+			toUpdate.DailyUsed = resource.DailyUsed + int32(count)
+		}
 		_, err = q.ResourcePss.
 			Where(q.ResourcePss.ResourceID.Eq(resourceId)).
 			Select(
@@ -315,11 +325,7 @@ func (s *channelService) CreateChannel(
 				q.ResourcePss.DailyUsed,
 				q.ResourcePss.DailyLast,
 			).
-			Updates(models.ResourcePss{
-				Used:      resource.Used + int32(count),
-				DailyUsed: resource.DailyUsed + int32(count),
-				DailyLast: now,
-			})
+			Updates(toUpdate)
 		if err != nil {
 			return err
 		}
@@ -468,15 +474,33 @@ func assignEdge(count int, filter NodeFilterConfig) (*AssignEdgeResult, error) {
 			step = time.Now()
 
 			slog.Debug("新增新节点", "proxy", info.proxy.Name, "used", info.used, "count", info.count)
+
+			rConfigs := rProxyConfigs[info.proxy.Name]
+
+			var newConfig = remote.AutoConfig{
+				Province: filter.Prov,
+				City:     filter.City,
+				Isp:      filter.Isp,
+				Count:    int(math.Ceil(float64(info.used) * 11 / 10)),
+			}
+			var newConfigs []remote.AutoConfig
+			var update = false
+			for _, rConfig := range rConfigs {
+				if rConfig.Isp == filter.Isp && rConfig.City == filter.City && rConfig.Province == filter.Prov {
+					newConfigs = append(newConfigs, newConfig)
+					update = true
+				} else {
+					newConfigs = append(newConfigs, rConfig)
+				}
+			}
+			if !update {
+				newConfigs = append(newConfigs, newConfig)
+			}
+
 			err := remote.Cloud.CloudConnect(remote.CloudConnectReq{
-				Uuid: info.proxy.Name,
-				Edge: nil,
-				AutoConfig: []remote.AutoConfig{{
-					Province: filter.Prov,
-					City:     filter.City,
-					Isp:      filter.Isp,
-					Count:    int(math.Ceil(float64(info.used) * 11 / 10)),
-				}},
+				Uuid:       info.proxy.Name,
+				Edge:       nil,
+				AutoConfig: newConfigs,
 			})
 			if err != nil {
 				return nil, err