shkong/go-cqhttp
1
0
Fork 0
mirror of https://github.com/Mrs4s/go-cqhttp.git synced 2025-05-05 03:23:49 +08:00
Code Issues Projects Releases Wiki Activity

server: add uri Path to address

Browse Source 
For #1415
This commit is contained in:
wdvxdr 2022-03-23 19:55:21 +08:00
parent f63c59f1a4
commit d42d8dd395
No known key found for this signature in database
GPG Key ID: 703F8C071DE7A1B6
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/http.go
View File

@ -244,18 +244,19 @@ func runHTTP(bot *coolq.CQBot, node yaml.Node) {
return return
} }
network, addr := "tcp", "" network, addr := "tcp", conf.Address
s := &httpServer{accessToken: conf.AccessToken} s := &httpServer{accessToken: conf.AccessToken}
if conf.Address != "" { switch {
case conf.Address != "":
uri, err := url.Parse(conf.Address) uri, err := url.Parse(conf.Address)
if err == nil && uri.Scheme != "" { if err == nil && uri.Scheme != "" {
network = uri.Scheme network = uri.Scheme
addr = uri.Host addr = uri.Host + uri.Path
} }
} else if conf.Host != "" || conf.Port != 0 { case conf.Host != "" || conf.Port != 0:
addr = fmt.Sprintf("%s:%d", conf.Host, conf.Port) addr = fmt.Sprintf("%s:%d", conf.Host, conf.Port)
log.Warnln("HTTP 服务器使用了过时的配置格式，请更新配置文件！") log.Warnln("HTTP 服务器使用了过时的配置格式，请更新配置文件！")
} else { default:
goto client goto client
} }
s.api = api.NewCaller(bot) s.api = api.NewCaller(bot)

8
server/websocket.go
View File

@ -147,10 +147,10 @@ func runWSServer(b *coolq.CQBot, node yaml.Node) {
log.Warn("正向 Websocket 使用了过时的配置格式，请更新配置文件") log.Warn("正向 Websocket 使用了过时的配置格式，请更新配置文件")
address = fmt.Sprintf("%s:%d", conf.Host, conf.Port) address = fmt.Sprintf("%s:%d", conf.Host, conf.Port)
} else { } else {
addr, err := url.Parse(conf.Address) uri, err := url.Parse(conf.Address)
if err == nil && addr.Scheme != "" { if err == nil && uri.Scheme != "" {
network = addr.Scheme network = uri.Scheme
address = addr.Host address = uri.Host + uri.Path
} }
} }
s := &webSocketServer{ s := &webSocketServer{