diff --git a/internal/channels/dingtalk/card.go b/internal/channels/dingtalk/card.go index d0b6ffa..f55375c 100644 --- a/internal/channels/dingtalk/card.go +++ b/internal/channels/dingtalk/card.go @@ -305,9 +305,25 @@ func (s *CardSender) postCard(ctx context.Context, body map[string]any, token st if err != nil { return err } - // Discard successful response body - if len(payload) > 0 { - // Body is already bounded by postJSON→readBoundedAPIResponse; just discard + return validateDingTalkBusinessResponse(payload) +} + +func validateDingTalkBusinessResponse(payload []byte) error { + if len(bytes.TrimSpace(payload)) == 0 { + return nil + } + var response struct { + Success *bool `json:"success"` + ErrCode any `json:"errcode"` + } + if json.Unmarshal(payload, &response) != nil { + return nil + } + if response.Success != nil && !*response.Success { + return errors.New("dingtalk card: API business failure") + } + if response.ErrCode != nil && fmt.Sprint(response.ErrCode) != "0" { + return errors.New("dingtalk card: API business failure") } return nil } @@ -326,8 +342,11 @@ func (s *CardSender) finalizeCard(ctx context.Context, outTrackID, content, toke "isFinalize": isFinalize, "isError": isError, } - _, err = s.doJSON(ctx, http.MethodPut, s.streamURL, body, token) - return err + payload, err := s.doJSON(ctx, http.MethodPut, s.streamURL, body, token) + if err != nil { + return err + } + return validateDingTalkBusinessResponse(payload) } func (s *CardSender) postJSON(ctx context.Context, endpoint string, value any, token string) ([]byte, error) { diff --git a/internal/channels/dingtalk/card_test.go b/internal/channels/dingtalk/card_test.go index 18bcd91..c28d75d 100644 --- a/internal/channels/dingtalk/card_test.go +++ b/internal/channels/dingtalk/card_test.go @@ -35,6 +35,7 @@ type cardTestServer struct { createBodySize int64 // Content-Length for oversized response streamStatus int streamBodySize int64 + streamResponse any } func newCardTestServer() *cardTestServer { @@ -42,6 +43,7 @@ func newCardTestServer() *cardTestServer { tokenStatus: http.StatusOK, createStatus: http.StatusOK, streamStatus: http.StatusOK, + streamResponse: map[string]any{"result": "ok"}, tokenResponse: map[string]any{"accessToken": "test-access-token", "expireIn": 3600}, createResponse: map[string]any{"result": "ok"}, } @@ -91,7 +93,7 @@ func newCardTestServer() *cardTestServer { return } w.Header().Set("Content-Type", "application/json") - json.NewEncoder(w).Encode(map[string]any{"result": "ok"}) + json.NewEncoder(w).Encode(ts.streamResponse) default: http.NotFound(w, r) } @@ -969,6 +971,19 @@ func TestSendFinalCardCreateStreamOnce(t *testing.T) { // Test: UpdateCard with non-final / error flags // --------------------------------------------------------------------------- +func TestUpdateCardRejectsHTTP200BusinessFailure(t *testing.T) { + ts := newCardTestServer() + defer ts.Close() + ts.streamResponse = map[string]any{"success": false, "code": "InvalidParameter", "message": "sensitive detail"} + sender, err := newCardSenderForTest("client-id", "client-secret", "card-template-123", ts.Client(), ts.URL()+"/token", ts.URL()+"/create") + if err != nil { + t.Fatal(err) + } + if err := sender.UpdateCard(context.Background(), "track-1", "answer", true, false); err == nil { + t.Fatal("HTTP 200 business failure must be rejected") + } +} + func TestUpdateCardNonFinalAndError(t *testing.T) { ts := newCardTestServer() defer ts.Close() diff --git a/internal/settings/controller.go b/internal/settings/controller.go index 8d61642..c8c0f03 100644 --- a/internal/settings/controller.go +++ b/internal/settings/controller.go @@ -77,7 +77,7 @@ func (c *Controller) Handle(ctx context.Context, in SettingInput) (string, error args = []string{action, strings.TrimSpace(in.Text)} } if explicit && cmd.Name == "/help" { - return "📖 使用帮助:\n• 直接发送问题:普通提问\n• /setting:查看个人设置\n• /setting language :设置回答语言\n• /help:查看本帮助", nil + return "设置回答语言:/setting language \n例如:/setting language en", nil } if explicit && len(args) == 1 && len(args[0]) == 6 && allDigits(args[0]) { if strings.TrimSpace(in.ConversationType) != "direct" { diff --git a/internal/settings/controller_test.go b/internal/settings/controller_test.go index 72f2f20..4231e0f 100644 --- a/internal/settings/controller_test.go +++ b/internal/settings/controller_test.go @@ -90,10 +90,9 @@ func TestControllerHelpIsHandledLocally(t *testing.T) { if err != nil { t.Fatal(err) } - for _, want := range []string{"普通提问", "/setting", "/help"} { - if !strings.Contains(out, want) { - t.Fatalf("help=%q missing %q", out, want) - } + want := "设置回答语言:/setting language \n例如:/setting language en" + if out != want { + t.Fatalf("help=%q want %q", out, want) } }