GuanM/XrayR
1
0
Fork 0
mirror of https://github.com/XrayR-project/XrayR.git synced 2025-06-08 13:29:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: typo

Browse Source
This commit is contained in:
Senis John 2022-12-27 16:10:51 +08:00
parent 8ddf257aa4
commit 451b5a1fd4
No known key found for this signature in database
GPG Key ID: 845E9E4727C3E1A4
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/newV2board/model.go
View File

@ -1,5 +1,9 @@
package newV2board package newV2board
import (
"encoding/json"
)
type serverConfig struct { type serverConfig struct {
ServerPort int `json:"server_port"` ServerPort int `json:"server_port"`
BaseConfig struct { BaseConfig struct {
@ -20,11 +24,9 @@ type serverConfig struct {
// v2ray // v2ray
Network string `json:"network"` Network string `json:"network"`
NetworkSettings struct { NetworkSettings struct {
Path string `json:"path"` Path string `json:"path"`
Headers struct { Headers *json.RawMessage `json:"headers"`
Host string `json:"Host"` ServiceName string `json:"serviceName"`
} `json:"headers"`
ServiceName string `json:"serviceName"`
} `json:"networkSettings"` } `json:"networkSettings"`
Tls int `json:"tls"` Tls int `json:"tls"`

19
api/newV2board/v2board.go
View File

@ -371,22 +371,23 @@ func (c *APIClient) parseV2rayNodeResponse(s *serverConfig) (*api.NodeInfo, erro
TLSType = "xtls" TLSType = "xtls"
} }
if s.NetworkSettings.Headers != nil {
if httpHeader, err := s.NetworkSettings.Headers.MarshalJSON(); err != nil {
return nil, err
} else {
header = httpHeader
}
}
switch s.Network { switch s.Network {
case "ws": case "ws":
path = s.NetworkSettings.Path path = s.NetworkSettings.Path
host = s.NetworkSettings.Headers.Host b, _ := simplejson.NewJson(header)
host = b.Get("Host").MustString()
case "grpc": case "grpc":
if s.NetworkSettings.ServiceName != "" { if s.NetworkSettings.ServiceName != "" {
serviceName = s.NetworkSettings.ServiceName serviceName = s.NetworkSettings.ServiceName
} }
case "tcp":
if &s.NetworkSettings.Headers != nil {
if httpHeader, err := json.Marshal(s.NetworkSettings.Headers); err != nil {
return nil, err
} else {
header = httpHeader
}
}
} }
if s.Tls == 1 { if s.Tls == 1 {