From 96b457d6793ec375bd0d5235f3e35dc59183f848 Mon Sep 17 00:00:00 2001 From: wyx2685 Date: Wed, 21 Feb 2024 13:02:13 +0900 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3singbox=E5=86=85=E6=A0=B8hy2?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/sing/user.go | 8 +++++--- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/core/sing/user.go b/core/sing/user.go index 26133c4..f388e96 100644 --- a/core/sing/user.go +++ b/core/sing/user.go @@ -63,20 +63,22 @@ func (b *Sing) AddUsers(p *core.AddUsersParams) (added int, err error) { us := make([]option.HysteriaUser, len(p.Users)) for i := range p.Users { us[i] = option.HysteriaUser{ - Name: string(p.Users[i].Id), + Name: p.Users[i].Uuid, AuthString: p.Users[i].Uuid, } } err = b.inbounds[p.Tag].(*inbound.Hysteria).AddUsers(us) case "hysteria2": us := make([]option.Hysteria2User, len(p.Users)) + id := make([]int, len(p.Users)) for i := range p.Users { us[i] = option.Hysteria2User{ - Name: string(p.Users[i].Id), + Name: p.Users[i].Uuid, Password: p.Users[i].Uuid, } + id[i] = p.Users[i].Id } - err = b.inbounds[p.Tag].(*inbound.Hysteria2).AddUsers(us) + err = b.inbounds[p.Tag].(*inbound.Hysteria2).AddUsers(us, id) } if err != nil { return 0, err diff --git a/go.mod b/go.mod index e9ef9fc..f4f05a4 100644 --- a/go.mod +++ b/go.mod @@ -231,4 +231,4 @@ require ( ) //github.com/apernet/hysteria/core v1.3.5-0.20240201034858-bb99579bb92c => /root/hysteria/core -replace github.com/sagernet/sing-box v1.9.0 => github.com/wyx2685/sing-box_mod v0.0.3 +replace github.com/sagernet/sing-box v1.9.0 => github.com/wyx2685/sing-box_mod v0.0.4 diff --git a/go.sum b/go.sum index 2c7d474..42f8f54 100644 --- a/go.sum +++ b/go.sum @@ -800,8 +800,8 @@ github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1Y github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM= github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs= github.com/vultr/govultr/v2 v2.17.2/go.mod h1:ZFOKGWmgjytfyjeyAdhQlSWwTjh2ig+X49cAp50dzXI= -github.com/wyx2685/sing-box_mod v0.0.3 h1:UYLZZzoAzdai+ehsc2kSQJq9p9WQ5wVaZWuZtPddLOQ= -github.com/wyx2685/sing-box_mod v0.0.3/go.mod h1:Q5C14BKQoRzkJ+JPGuMdffHZEoOrlU1zsiBkTtfPoA0= +github.com/wyx2685/sing-box_mod v0.0.4 h1:fEZnkrtUwqJS/6M3drSdv9RXyRvhnuD2UV6rK5U6rLA= +github.com/wyx2685/sing-box_mod v0.0.4/go.mod h1:Q5C14BKQoRzkJ+JPGuMdffHZEoOrlU1zsiBkTtfPoA0= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=