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

feat(http): accept onebot v12 style endpoint

Browse Source 
disabled currently, enabled in v1.1.0
This commit is contained in:
wdvxdr 2021-10-06 16:13:40 +08:00
parent 19fd331c46
commit 446f624a37
No known key found for this signature in database
GPG Key ID: 703F8C071DE7A1B6
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/base/feature.go
View File

@ -29,3 +29,9 @@ var (
func nocheck(_ io.ReadSeeker) (bool, string) { func nocheck(_ io.ReadSeeker) (bool, string) {
return true, "" return true, ""
} }
// todo: enable in v1.1.0
// onebot v12 feature
const (
AcceptOneBotV12HTTPEndPoint = false
)

19
server/http.go
View File

@ -22,6 +22,8 @@ import (
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
"github.com/Mrs4s/go-cqhttp/coolq" "github.com/Mrs4s/go-cqhttp/coolq"
"github.com/Mrs4s/go-cqhttp/global"
"github.com/Mrs4s/go-cqhttp/internal/base"
"github.com/Mrs4s/go-cqhttp/modules/config" "github.com/Mrs4s/go-cqhttp/modules/config"
) )
@ -115,14 +117,21 @@ func (s *httpServer) ServeHTTP(writer http.ResponseWriter, request *http.Request
return return
} }
action := strings.TrimPrefix(request.URL.Path, "/") var response global.MSG
action = strings.TrimSuffix(action, "_async") if base.AcceptOneBotV12HTTPEndPoint && request.URL.Path == "/" {
log.Debugf("HTTPServer接收到API调用: %v", action) action := strings.TrimSuffix(ctx.Get("action").Str, "_async")
ret := s.api.callAPI(action, &ctx) log.Debugf("HTTPServer接收到API调用: %v", action)
response = s.api.callAPI(action, ctx.Get("params"))
} else {
action := strings.TrimPrefix(request.URL.Path, "/")
action = strings.TrimSuffix(action, "_async")
log.Debugf("HTTPServer接收到API调用: %v", action)
response = s.api.callAPI(action, &ctx)
}
writer.Header().Set("Content-Type", "application/json; charset=utf-8") writer.Header().Set("Content-Type", "application/json; charset=utf-8")
writer.WriteHeader(http.StatusOK) writer.WriteHeader(http.StatusOK)
_ = json.NewEncoder(writer).Encode(ret) _ = json.NewEncoder(writer).Encode(response)
} }
func checkAuth(req *http.Request, token string) int { func checkAuth(req *http.Request, token string) int {