Skip to content

Commit 8271e18

Browse files
lz1998lz1998
committed
more header
1 parent d83d62f commit 8271e18

File tree

4 files changed

+30
-14
lines changed

4 files changed

+30
-14
lines changed

‎config/config.go‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ var (
1919
EventFilter: []int32{},
2020
RegexFilter: "",
2121
RegexReplace: "",
22-
ExtraHeader: map[string]string{},
22+
ExtraHeader: map[string][]string{
23+
"User-Agent": {"GMC"},
24+
},
2325
},
2426
},
2527
}
@@ -32,13 +34,13 @@ type GmcConfig struct {
3234
}
3335

3436
type ServerGroup struct {
35-
Name string `json:"name"` // 功能名称
36-
Disabled bool `json:"disabled"` // 不填false默认启用
37-
Urls []string `json:"urls"` // 服务器列表
38-
EventFilter []int32 `json:"event_filter"` // 事件过滤
39-
RegexFilter string `json:"regex_filter"` // 正则过滤
40-
RegexReplace string `json:"regex_replace"` // 正则替换
41-
ExtraHeader map[string]string `json:"extra_header"` // 自定义请求头
37+
Name string `json:"name"` // 功能名称
38+
Disabled bool `json:"disabled"` // 不填false默认启用
39+
Urls []string `json:"urls"` // 服务器列表
40+
EventFilter []int32 `json:"event_filter"` // 事件过滤
41+
RegexFilter string `json:"regex_filter"` // 正则过滤
42+
RegexReplace string `json:"regex_replace"` // 正则替换
43+
ExtraHeader map[string][]string `json:"extra_header"` // 自定义请求头
4244
// TODO event filter, msg filter, regex filter, prefix filter, suffix filter
4345
}
4446

‎go.mod‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,23 @@ module github.com/ProtobufBot/Go-Mirai-Client
33
go 1.15
44

55
require (
6-
github.com/Mrs4s/MiraiGo v0.0.0-20210206134348-800bf525ed0e
6+
github.com/Mrs4s/MiraiGo v0.0.0-20210219090120-c4288bd213f3
77
github.com/fanliao/go-promise v0.0.0-20141029170127-1890db352a72
88
github.com/gin-gonic/gin v1.6.3
99
github.com/go-playground/validator/v10 v10.4.1 // indirect
1010
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e
1111
github.com/golang/protobuf v1.4.3
1212
github.com/gorilla/websocket v1.4.2
1313
github.com/leodido/go-urn v1.2.1 // indirect
14+
github.com/magefile/mage v1.11.0 // indirect
1415
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
1516
github.com/modern-go/reflect2 v1.0.1 // indirect
1617
github.com/pkg/errors v0.9.1
17-
github.com/sirupsen/logrus v1.7.0
18+
github.com/sirupsen/logrus v1.8.0
1819
github.com/smartystreets/goconvey v1.6.4 // indirect
1920
github.com/ugorji/go v1.2.4 // indirect
20-
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect
21-
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c // indirect
21+
golang.org/x/crypto v0.0.0-20210218145215-b8e89b74b9df // indirect
22+
golang.org/x/sys v0.0.0-20210219172841-57ea560cfca1 // indirect
2223
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
2324
gopkg.in/yaml.v2 v2.4.0 // indirect
2425
)

‎go.sum‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
22
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
33
github.com/Mrs4s/MiraiGo v0.0.0-20210206134348-800bf525ed0e h1:SnN+nyRdqN7sULnHUWCofP+Jxs3VJN/y8AlMpcz0nbk=
44
github.com/Mrs4s/MiraiGo v0.0.0-20210206134348-800bf525ed0e/go.mod h1:yhqA0NyKxUf7I/0HR/1OMchveFggX8wde04gqdGrNfU=
5+
github.com/Mrs4s/MiraiGo v0.0.0-20210219090120-c4288bd213f3 h1:hsO/cT00Nxyi5FrnXImimBlcHKrdFh8yWEwp0OR88z8=
6+
github.com/Mrs4s/MiraiGo v0.0.0-20210219090120-c4288bd213f3/go.mod h1:yhqA0NyKxUf7I/0HR/1OMchveFggX8wde04gqdGrNfU=
57
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
68
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
79
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -61,6 +63,10 @@ github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
6163
github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
6264
github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
6365
github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
66+
github.com/magefile/mage v1.10.0 h1:3HiXzCUY12kh9bIuyXShaVe529fJfyqoVM42o/uom2g=
67+
github.com/magefile/mage v1.10.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
68+
github.com/magefile/mage v1.11.0 h1:C/55Ywp9BpgVVclD3lRnSYCwXTYxmSppIgLeDYlNuls=
69+
github.com/magefile/mage v1.11.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
6470
github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
6571
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
6672
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
@@ -78,6 +84,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
7884
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
7985
github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
8086
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
87+
github.com/sirupsen/logrus v1.8.0 h1:nfhvjKcUMhBMVqbKHJlk5RPrrfYr/NMo3692g0dwfWU=
88+
github.com/sirupsen/logrus v1.8.0/go.mod h1:4GuYW9TZmE769R5STWrRakJc4UqQ3+QQ95fyz7ENv1A=
8189
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
8290
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
8391
github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
@@ -101,6 +109,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnk
101109
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
102110
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad h1:DN0cp81fZ3njFcrLCytUHRSUkqBjfTo4Tx9RJTWs0EY=
103111
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
112+
golang.org/x/crypto v0.0.0-20210218145215-b8e89b74b9df h1:y7QZzfUiTwWam+xBn29Ulb8CBwVN5UdzmMDavl9Whlw=
113+
golang.org/x/crypto v0.0.0-20210218145215-b8e89b74b9df/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
104114
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
105115
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
106116
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -122,6 +132,8 @@ golang.org/x/sys v0.0.0-20200116001909-b77594299b42 h1:vEOn+mP2zCOVzKckCZy6YsCtD
122132
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
123133
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c h1:VwygUrnw9jn88c4u8GD3rZQbqrP/tgas88tPUbBxQrk=
124134
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
135+
golang.org/x/sys v0.0.0-20210219172841-57ea560cfca1 h1:mDSj8NPponP6fRpRDblAGl5bpSHjPulHtk5lGl0gLSY=
136+
golang.org/x/sys v0.0.0-20210219172841-57ea560cfca1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
125137
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
126138
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
127139
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=

‎service/bot/remote.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,12 @@ func ConnectUniversal(cli *client.QQClient) {
4141
log.Infof("开始连接Websocket服务器 [%s](%s)", serverGroup.Name, serverUrl)
4242
header := http.Header{}
4343
for k, v := range serverGroup.ExtraHeader {
44-
header[k] = []string{v}
44+
if v != nil {
45+
header[k] = v
46+
}
4547
}
4648
header["X-Self-ID"] = []string{strconv.FormatInt(cli.Uin, 10)}
4749
header["X-Client-Role"] = []string{"Universal"}
48-
header["User-Agent"] = []string{"GMC"}
4950
conn, _, err := websocket.DefaultDialer.Dial(serverUrl, header)
5051
if err != nil {
5152
log.Warnf("连接Websocket服务器 [%s](%s) 错误，5秒后重连: %v", serverGroup.Name, serverUrl, err)

0 commit comments

Comments
 (0)