lixiangwuxian/qq_bot
0
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Update configuration structure to include Management section for WebSocket and HTTP server addresses

Browse Source
This commit is contained in:
lixiangwuxian 2025-03-24 16:28:15 +08:00
parent a13eaaf5a4
commit f87922883e
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
action/group_member.go
View File

@ -12,7 +12,7 @@ import (
) )
func GetGroupMemberList(groupID int64) ([]model.GroupMember, error) { func GetGroupMemberList(groupID int64) ([]model.GroupMember, error) {
fullURL := fmt.Sprintf("http://%s%s?group_id=%d", config.ConfigManager.GetConfig().NapcatHttpSrv, constants.GET_GROUP_MEMBER_LIST, groupID) fullURL := fmt.Sprintf("http://%s%s?group_id=%d", config.ConfigManager.GetConfig().Management.NapcatHttpSrv, constants.GET_GROUP_MEMBER_LIST, groupID)
response, err := http.Get(fullURL) response, err := http.Get(fullURL)
if err != nil { if err != nil {
@ -35,7 +35,7 @@ func GetGroupMemberList(groupID int64) ([]model.GroupMember, error) {
} }
func GetGroupList() ([]model.Group, error) { func GetGroupList() ([]model.Group, error) {
fullURL := fmt.Sprintf("http://%s%s", config.ConfigManager.GetConfig().NapcatHttpSrv, constants.GET_GROUP_LIST) fullURL := fmt.Sprintf("http://%s%s", config.ConfigManager.GetConfig().Management.NapcatHttpSrv, constants.GET_GROUP_LIST)
response, err := http.Get(fullURL) response, err := http.Get(fullURL)
if err != nil { if err != nil {

13
config/config.go
View File

@ -9,16 +9,19 @@ import (
var ConfigManager = &configManager{} var ConfigManager = &configManager{}
type Config struct { type Config struct {
Admin int64 `yaml:"admin"`
SteamApiKey string `yaml:"steam_api_key"` SteamApiKey string `yaml:"steam_api_key"`
ProxyAddr string `yaml:"proxy_addr"`
NapcatWsSrv string `yaml:"napcat_ws_srv"`
NapcatHttpSrv string `yaml:"napcat_http_srv"`
OpenaiApiKey string `yaml:"openai_api_key"` OpenaiApiKey string `yaml:"openai_api_key"`
OpenaiApiBaseUrl string `yaml:"openai_api_base_url"` OpenaiApiBaseUrl string `yaml:"openai_api_base_url"`
OpenaiModelName string `yaml:"openai_model_name"` OpenaiModelName string `yaml:"openai_model_name"`
OpenaiPrompt string `yaml:"openai_prompt"` OpenaiPrompt string `yaml:"openai_prompt"`
WebServer struct { Management struct {
Admin int64 `yaml:"admin"`
ReportGroup int64 `yaml:"report_group"`
ProxyAddr string `yaml:"proxy_addr"`
NapcatWsSrv string `yaml:"napcat_ws_srv"`
NapcatHttpSrv string `yaml:"napcat_http_srv"`
} `yaml:"management"`
WebServer struct {
Token string `yaml:"token"` Token string `yaml:"token"`
} `yaml:"web_server"` } `yaml:"web_server"`
} }

2
handler/steamplaying/service.go
View File

@ -20,7 +20,7 @@ var ProxyAddr = ""
func init() { func init() {
SteamAPIKey = config.ConfigManager.GetConfig().SteamApiKey SteamAPIKey = config.ConfigManager.GetConfig().SteamApiKey
ProxyAddr = config.ConfigManager.GetConfig().ProxyAddr ProxyAddr = config.ConfigManager.GetConfig().Management.ProxyAddr
} }
func init() { func init() {

2
main.go
View File

@ -51,7 +51,7 @@ func main() {
go func() { go func() {
const reconnectDelay = 5 * time.Second const reconnectDelay = 5 * time.Second
for { for {
client, err := wsclient.NewWebSocketClient("ws", config.ConfigManager.GetConfig().NapcatWsSrv, "") client, err := wsclient.NewWebSocketClient("ws", config.ConfigManager.GetConfig().Management.NapcatWsSrv, "")
if err != nil { if err != nil {
log.Printf("WebSocket连接失败: %v, %v 后重试", err, reconnectDelay) log.Printf("WebSocket连接失败: %v, %v 后重试", err, reconnectDelay)
time.Sleep(reconnectDelay) time.Sleep(reconnectDelay)