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

添加了 admin api 的监听 host支持，验证码提示增加 host+port

Browse Source
This commit is contained in:
scjtqs 2020-10-03 17:43:03 +08:00
parent e3f0dbc4ac
commit 95c399a003
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
global/config.go
View File

@ -81,6 +81,7 @@ type GoCQReverseWebsocketConfig struct {
type GoCqWebUi struct {
Enabled bool `json:"enabled"`
Host string `json:"host"`
WebUiPort uint64 `json:"web_ui_port"`
WebInput bool `json:"web_input"`
}
@ -130,6 +131,7 @@ func DefaultConfig() *JsonConfig {
},
WebUi: &GoCqWebUi{
Enabled: true,
Host: "0.0.0.0",
WebInput: false,
WebUiPort: 9999,
},

6
main.go
View File

@ -237,17 +237,21 @@ func main() {
conf.WebUi = &global.GoCqWebUi{
Enabled: true,
WebInput: false,
Host: "0.0.0.0",
WebUiPort: 9999,
}
}
if conf.WebUi.WebUiPort <= 0 {
conf.WebUi.WebUiPort = 9999
}
if conf.WebUi.Host == "" {
conf.WebUi.Host = "0.0.0.0"
}
confErr := conf.Save("config.json")
if confErr != nil {
log.Error("保存配置文件失败")
}
b := server.WebServer.Run(fmt.Sprintf("%s:%d", "0.0.0.0", conf.WebUi.WebUiPort), cli)
b := server.WebServer.Run(fmt.Sprintf("%s:%d", conf.WebUi.Host, conf.WebUi.WebUiPort), cli)
c := server.Console
signal.Notify(c, os.Interrupt, os.Kill)
<-c

8
server/apiAdmin.go
View File

@ -71,7 +71,7 @@ func (s *webServer) Run(addr string, cli *client.QQClient) *coolq.CQBot {
go func() {
//开启端口监听
if s.Conf.WebUi.Enabled{
if s.Conf.WebUi.Enabled {
log.Infof("Admin API 服务器已启动: %v", addr)
err := s.engine.Run(addr)
if err != nil {
@ -80,7 +80,7 @@ func (s *webServer) Run(addr string, cli *client.QQClient) *coolq.CQBot {
time.Sleep(time.Second * 5)
os.Exit(1)
}
}else{
} else {
//关闭端口监听
c := make(chan os.Signal, 1)
signal.Notify(c, os.Interrupt, os.Kill)
@ -109,7 +109,7 @@ func (s *webServer) Dologin() {
img, _, _ := image.Decode(bytes.NewReader(rsp.CaptchaImage))
fmt.Println(asciiart.New("image", img).Art)
if conf.WebUi.WebInput {
log.Warn("请输入验证码 (captcha.jpg)： (http://127.0.0.1/admin/web_write 输入)")
log.Warnf("请输入验证码 (captcha.jpg)： (http://%s:%d/admin/web_write 输入)", conf.WebUi.Host, conf.WebUi.WebUiPort)
text = <-WebInput
} else {
log.Warn("请输入验证码 (captcha.jpg)： (Enter 提交)")
@ -121,7 +121,7 @@ func (s *webServer) Dologin() {
case client.UnsafeDeviceError:
log.Warnf("账号已开启设备锁，请前往 -> %v <- 验证并重启Bot.", rsp.VerifyUrl)
if conf.WebUi.WebInput {
log.Infof(" (http://127.0.0.1/admin/web_write 确认后继续)....")
log.Infof(" (http://%s:%d/admin/web_write 确认后继续)....", conf.WebUi.Host, conf.WebUi.WebUiPort)
text = <-WebInput
} else {
log.Infof(" 按 Enter 继续....")