fix: feishu

lenye · lenye · commit 26b2cc4f7e0b · 2025-07-27T14:42:26.000+08:00
diff --git a/im/feishu/bot/message.go b/im/feishu/bot/message.go
@@ -60,12 +60,15 @@ const sendURL = "https://open.feishu.cn/open-apis/bot/v2/hook/"
 func Send(accessToken string, msg *Message) error {
 	u := sendURL + accessToken
 	var resp feishu.ResponseMeta
-	_, err := client.PostJSON(u, msg, &resp)
+	headers, err := client.PostJSON(u, msg, &resp)
 	if err != nil {
-		return err
+		if headers == nil {
+			return err
+		}
+		return fmt.Errorf("%w, %s", err, resp.String())
 	}
 	if !resp.Succeed() {
-		return fmt.Errorf("%w, %s", feishu.ErrRequest, resp)
+		return fmt.Errorf("%s", resp.String())
 	}
 	return nil
 }
diff --git a/im/feishu/bot/message_cmd.go b/im/feishu/bot/message_cmd.go
@@ -94,7 +94,7 @@ func CmdSend(arg *CmdSendParams) error {
 	httpclient.SetUserAgent(arg.UserAgent)
 
 	if err := Send(arg.AccessToken, &msg); err != nil {
-		return err
+		return fmt.Errorf("%w, %w", feishu.ErrRequest, err)
 	}
 	fmt.Println(feishu.MessageOK)
 
diff --git a/im/feishu/client/client.go b/im/feishu/client/client.go
@@ -24,8 +24,6 @@ import (
 	"github.com/lenye/pmsg/im"
 )
 
-const contentTypeJson = "application/json"
-
 func PostJSON(url string, reqBody, respBody any) (http.Header, error) {
 	body, err := im.JsonEncode(reqBody)
 	if err != nil {
@@ -34,20 +32,23 @@ func PostJSON(url string, reqBody, respBody any) (http.Header, error) {
 
 	resp, err := httpclient.Post(url, httpclient.HdrValApplicationJson, body)
 	if err != nil {
-		return nil, fmt.Errorf("%w, %w", httpclient.ErrRequest, err)
+		return nil, err
 	}
 	defer func(Body io.ReadCloser) {
 		_ = Body.Close()
 	}(resp.Body)
 
-	isRespJson := strings.EqualFold(resp.Header.Get("content-type"), contentTypeJson)
-	if isRespJson {
-		if err := im.JsonDecode(resp.Body, respBody); err != nil {
-			return nil, fmt.Errorf("json decode failed, %w", err)
-		}
+	// "application/json"                 响应内容类型
+	// "application/json; charset=utf-8"  错误响应内容类型
+	contentType := resp.Header.Get("content-type")
+	if !strings.EqualFold(contentType, httpclient.HdrValApplicationJson) && !strings.EqualFold(contentType, httpclient.HdrValApplicationJsonCharset) {
+		return nil, fmt.Errorf("http.response.header.content-type != %s", httpclient.HdrValApplicationJson)
+	}
+	if err := im.JsonDecode(resp.Body, respBody); err != nil {
+		return nil, fmt.Errorf("http.response.body json decode failed, %w", err)
 	}
-	if resp.StatusCode/100 != 2 {
-		return nil, fmt.Errorf("%w, http response status: %s", httpclient.ErrRequest, resp.Status)
+	if resp.StatusCode != http.StatusOK {
+		return resp.Header, fmt.Errorf("invalid http.response.status: %s", resp.Status)
 	}
 	return resp.Header, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -60,12 +60,15 @@ const sendURL = "https://open.feishu.cn/open-apis/bot/v2/hook/"`
`60`	`60`	`func Send(accessToken string, msg *Message) error {`
`61`	`61`	`u := sendURL + accessToken`
`62`	`62`	`var resp feishu.ResponseMeta`
`63`		`- _, err := client.PostJSON(u, msg, &resp)`
	`63`	`+ headers, err := client.PostJSON(u, msg, &resp)`
`64`	`64`	`if err != nil {`
`65`		`- return err`
	`65`	`+ if headers == nil {`
	`66`	`+ return err`
	`67`	`+ }`
	`68`	`+ return fmt.Errorf("%w, %s", err, resp.String())`
`66`	`69`	`}`
`67`	`70`	`if !resp.Succeed() {`
`68`		`- return fmt.Errorf("%w, %s", feishu.ErrRequest, resp)`
	`71`	`+ return fmt.Errorf("%s", resp.String())`
`69`	`72`	`}`
`70`	`73`	`return nil`
`71`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ func CmdSend(arg *CmdSendParams) error {`
`94`	`94`	`httpclient.SetUserAgent(arg.UserAgent)`
`95`	`95`
`96`	`96`	`if err := Send(arg.AccessToken, &msg); err != nil {`
`97`		`- return err`
	`97`	`+ return fmt.Errorf("%w, %w", feishu.ErrRequest, err)`
`98`	`98`	`}`
`99`	`99`	`fmt.Println(feishu.MessageOK)`
`100`	`100`