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

modify: 根据Clash筛选返回配置中的节点类型

Browse Source
This commit is contained in:
nitezs
2023-09-16 21:46:59 +08:00
parent 3318f5f2db
commit 918521682c
8 changed files with 58 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/controller/clash.go
View File

@ -5,6 +5,7 @@ import (
"gopkg.in/yaml.v3"
"net/http"
"sub2clash/config"
"sub2clash/model"
"sub2clash/validator"
)
@ -15,7 +16,7 @@ func SubmodHandler(c *gin.Context) {
c.String(http.StatusBadRequest, err.Error())
return
}
sub, err := BuildSub(query, config.Default.ClashTemplate)
sub, err := BuildSub(model.Clash, query, config.Default.ClashTemplate)
if err != nil {
c.String(http.StatusInternalServerError, err.Error())
return

6
api/controller/default.go
View File

@ -14,7 +14,7 @@ import (
"sub2clash/validator"
)
func BuildSub(query validator.SubQuery, template string) (
func BuildSub(clashType model.ClashType, query validator.SubQuery, template string) (
*model.Subscription, error,
) {
// 定义变量
@ -67,11 +67,11 @@ func BuildSub(query validator.SubQuery, template string) (
} else {
proxyList = sub.Proxies
}
utils.AddProxy(sub, query.AutoTest, query.Lazy, query.Sort, proxyList...)
utils.AddProxy(sub, query.AutoTest, query.Lazy, query.Sort, clashType, proxyList...)
}
// 处理自定义代理
utils.AddProxy(
sub, query.AutoTest, query.Lazy, query.Sort,
sub, query.AutoTest, query.Lazy, query.Sort, clashType,
utils.ParseProxy(query.Proxies...)...,
)
MergeSubAndTemplate(temp, sub)

3
api/controller/meta.go
View File

@ -6,6 +6,7 @@ import (
"gopkg.in/yaml.v3"
"net/http"
"sub2clash/config"
"sub2clash/model"
"sub2clash/validator"
)
@ -16,7 +17,7 @@ func SubHandler(c *gin.Context) {
c.String(http.StatusBadRequest, err.Error())
return
}
sub, err := BuildSub(query, config.Default.MetaTemplate)
sub, err := BuildSub(model.ClashMeta, query, config.Default.MetaTemplate)
if err != nil {
c.String(http.StatusInternalServerError, err.Error())
return