Merge branch 'main' of ssh://18.167.251.121:10002/aidlab/lanecarford_front

src/views/asistant/index.vue

@@ -29,7 +29,7 @@ import HeaderTitle from '@/components/HeaderTitle.vue'
 import NoticeList from './components/NoticeList.vue'
 import InputArea from './components/InputArea.vue'
 import GenerateLoading from './components/GenerateLoading.vue'
-import { ref, onUnmounted, onActivated } from 'vue'
+import { ref, onMounted, onUnmounted, onActivated } from 'vue'
 import { useRouter } from 'vue-router'
 import { useUserInfoStore, useGenerateStore } from '@/stores'
 import { streamChatAddress } from '@/api/workshop'
@@ -66,6 +66,12 @@ const messageList = ref<ChatMessage[]>([])
 // 流式消息相关状态
 const isStreaming = ref<boolean>(false)
 const currentStreamingMessage = ref<ChatMessage | null>(null)
+const sessionId = ref<string>('')
+
+onMounted(() => {
+  sessionId.value = Math.floor(Date.now() / 1000).toString()
+  generateStore.setSessionId(sessionId.value)
+})
 
 onActivated(() => {
   noticeListRef.value?.scrollToBottom()
@@ -84,7 +90,7 @@ const handleSendMessage = (message: string): void => {
     type: 'text',
     content: message,
     timestamp: new Date().toISOString(),
-    sessionId: (userInfoStore.state.userInfo as any).id,
+    sessionId: sessionId.value,
     self: true
   }
   messageList.value.push(userMessage)
@@ -97,7 +103,7 @@ const abort = new AbortController()
 const handleFetchMessage = (message: string) => {
   const params = {
     message: message,
-    sessionId: (userInfoStore.state.userInfo as any).id,
+    sessionId: sessionId.value,
     gender: 'male'
   }
 
@@ -107,7 +113,7 @@ const handleFetchMessage = (message: string) => {
     type: 'text',
     content: '',
     timestamp: new Date().toISOString(),
-    sessionId: (userInfoStore.state.userInfo as any).id
+    sessionId: sessionId.value
   }
 
   // 添加到消息列表
@@ -136,16 +142,52 @@ const handleFetchMessage = (message: string) => {
     credentials: 'include'
   })
     .then(async (response) => {
-      console.log('response',response)
+      // 检查响应内容类型，判断是否为流式响应
+      const contentType = response.headers.get('content-type') || ''
+      const isStreamResponse =
+        contentType.includes('text/event-stream') || contentType.includes('stream')
+
       if (!response.ok) {
+        // 非流式错误响应，使用 text() 读取错误信息
+        const errorText = await response.text()
+        console.error('请求错误:', errorText)
         showToast({
           message: `failed to fetch: ${response.status}`,
           position: 'top',
           icon: 'none'
         })
-        throw new Error(`发起对话错误--- ${response.status}`)
+        throw new Error(`发起对话错误--- ${response.status}: ${errorText}`)
       }
 
+      // 不是流式响应，使用 text()读取错误信息
+      if (!isStreamResponse) {
+        const text = await response.text()
+
+        try {
+          const errorData = JSON.parse(text)
+          if (errorData.message || errorData.error) {
+            showToast({
+              message: errorData.message || errorData.error || '请求失败',
+              position: 'top',
+              icon: 'none'
+            })
+          }
+        } catch (e) {
+          // 如果不是 JSON，直接显示文本内容
+          showToast({
+            message: text || '请求失败',
+            position: 'top',
+            icon: 'none'
+          })
+          throw new Error(text || '请求失败')
+        }
+
+        isStreaming.value = false
+        currentStreamingMessage.value = null
+        return
+      }
+
+      // 流式响应处理
       let contentBody = ''
       let buffer = ''
       const reader = response.body?.getReader()