nite/sub2clash
1
Fork 0
mirror of https://github.com/bestnite/sub2clash.git synced 2025-07-05 04:12:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Nite07
2024-04-17 21:52:03 +08:00
parent 7748407583
commit b687acb94c
12 changed files with 114 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
api/handler/default.go
View File

@ -118,7 +118,7 @@ func BuildSub(clashType model.ClashType, query validator.SubValidator, template
proxies := make(map[string]*model.Proxy)
newProxies := make([]model.Proxy, 0, len(proxyList))
for i := range proxyList {
key := proxyList[i].Server + ":" + strconv.Itoa(proxyList[i].Port) + ":" + proxyList[i].Type
key := proxyList[i].Server + strconv.Itoa(proxyList[i].Port) + proxyList[i].Type + proxyList[i].UUID + proxyList[i].Password
if _, exist := proxies[key]; !exist {
proxies[key] = &proxyList[i]
newProxies = append(newProxies, proxyList[i])
@ -266,12 +266,16 @@ func MergeSubAndTemplate(temp *model.Subscription, sub *model.Subscription, igcg
case "all":
newProxies = append(newProxies, proxyNames...)
case "countries":
newProxies = append(newProxies, countryGroupNames...)
if !igcg {
newProxies = append(newProxies, countryGroupNames...)
}
default:
if len(key) == 2 {
newProxies = append(
newProxies, countryGroupMap[utils.GetContryName(key)].Proxies...,
)
if !igcg {
if len(key) == 2 {
newProxies = append(
newProxies, countryGroupMap[utils.GetContryName(key)].Proxies...,
)
}
}
}
} else {