Chore: Merge branch 'ogn-dev' into with-tun

2022-03-16 20:16:30 +08:00
parent 3a9bbf6c73 fb7d340233
commit 346d817dba
74 changed files with 675 additions and 281 deletions
--- a/adapter/parser.go
+++ b/adapter/parser.go
@ -8,7 +8,7 @@ import (
 	C "github.com/Dreamacro/clash/constant"
 )

-func ParseProxy(mapping map[string]interface{}) (C.Proxy, error) {
+func ParseProxy(mapping map[string]any) (C.Proxy, error) {
 	decoder := structure.NewDecoder(structure.Option{TagName: "proxy", WeaklyTypedInput: true})
 	proxyType, existType := mapping["type"].(string)
 	if !existType {