修复端口分流规则自动添加未能关联ip分组的bug，本次修改更新了一下config.yml的默认内容，请注意更新您的配置文件。[[#30]](#…

…30)

README.md

@@ -47,6 +47,7 @@ ikuai需要分配3个网口（分别绑定到wan1 wan2 lan1），openwrt需要2
   - `before` : 先删除旧规则再更新新规则，如果更新失败会丢失规则 
 
 ## 更新日志
+- 2024-10-04 修复端口分流规则自动添加未能关联ip分组的bug，本次修改更新了一下config.yml的默认内容，请注意更新您的配置文件。[[#30]](https://github.com/joyanhui/ikuai-bypass/issues/30) 
 - 2024-10-04 修复清理模式的删除规则问题 [[#27#issuecomment-2388114699]](https://github.com/joyanhui/ikuai-bypass/issues/27#issuecomment-2388114699)
 - 2024-10-04 ip分组第一行的备注问题 [[#22]](https://github.com/joyanhui/ikuai-bypass/issues/22)
 - 2024-10-04 修复 卡`ip分组== 正在查询  备注为: IKUAI_BYPASS_ 的ip分组规则` 的bug  [[#24]](https://github.com/joyanhui/ikuai-bypass/issues/24) [[#27]](https://github.com/joyanhui/ikuai-bypass/issues/27)

api/ip_group.go

@@ -3,7 +3,6 @@ package api
 import (
 	"errors"
 	"log"
-	"regexp"
 	"strconv"
 	"strings"
 )
@@ -199,8 +198,10 @@ func (i *IKuai) GetAllIKuaiBypassIpGroupNamesByName(name string) (names []string
 	data, err = i.ShowIpGroupByName(name)
 
 	for _, d := range data {
-		match, _ := regexp.MatchString(name+`_\d+`, d.GroupName)
-		if d.Comment == COMMENT_IKUAI_BYPASS && match {
+		//match, _ := regexp.MatchString(name+`_\d+`, d.GroupName)
+		//log.Println(d.GroupName)
+		match := strings.Contains(d.GroupName, name)
+		if (d.Comment == COMMENT_IKUAI_BYPASS || strings.Contains(d.Comment, COMMENT_IKUAI_BYPASS)) && match {
 			names = append(names, d.GroupName)
 		}
 	}

api/stream_ipport.go

@@ -26,7 +26,7 @@ type StreamIpPortData struct {
 	Type      int    `json:"type"`
 }
 
-func (i *IKuai) AddStreamIpPort(forwardType string, iface string, dstAddr string, srcAddr string, nexthop string) error {
+func (i *IKuai) AddStreamIpPort(forwardType string, iface string, dstAddr string, srcAddr string, nexthop string, tag string) error {
 
 	param := struct {
 		Interface string `json:"interface"`
@@ -53,7 +53,7 @@ func (i *IKuai) AddStreamIpPort(forwardType string, iface string, dstAddr string
 		Type:      forwardType,
 		Nexthop:   nexthop,
 		IfaceBand: 0,
-		Comment:   COMMENT_IKUAI_BYPASS,
+		Comment:   COMMENT_IKUAI_BYPASS + "_" + tag,
 	}
 	req := CallReq{
 		FuncName: FUNC_NAME_STREAM_IPPORT,

helperFunc.go

@@ -174,8 +174,7 @@ func updateStreamIpPort(iKuai *api.IKuai, forwardType string, iface string, next
 		}
 		ipGroupList = append(ipGroupList, data...)
 	}
-
-	err = iKuai.AddStreamIpPort(forwardType, iface, strings.Join(ipGroupList, ","), srcAddr, nexthop)
+	err = iKuai.AddStreamIpPort(forwardType, iface, strings.Join(ipGroupList, ","), srcAddr, nexthop, ipGroup)
 	if err != nil {
 		log.Println("ip端口分流==  添加失败，可能是列表太多了，添加太快,爱快没响应。", conf.AddErrRetryWait, "秒后重试", err)
 		time.Sleep(conf.AddErrRetryWait)

runModeUpdateIpgroup.go

@@ -10,7 +10,7 @@ func updateIpgroup() {
 		log.Println("登录爱快失败：", err)
 		return
 	}
-	log.Println("Tips: 在添加之前会强制删除所有备注包含 IKUAI_BYPASS 字符的ip分组和端口分流，不受delOldRule参数影响 2024-10-04 by joyanhui")
+	log.Println("Tips: 在添加之前会强制删除所有备注包含 IKUAI_BYPASS 字符的ip分组和端口分流，不受delOldRule参数影响,后续版本会尝试完善 2024-10-04 by joyanhui")
 
 	err = iKuai.DelIKuaiBypassIpGroup("cleanAll")
 	if err != nil {