lh 5 ماه پیش
والد
کامیت
708597d078
2فایلهای تغییر یافته به همراه13 افزوده شده و 11 حذف شده
  1. 4 4
      app/Http/Controllers/DeepSeek/DeepSeekController.php
  2. 9 7
      app/Services/DeepSeek/DeepSeekService.php

+ 4 - 4
app/Http/Controllers/DeepSeek/DeepSeekController.php

@@ -347,7 +347,7 @@ class DeepSeekController extends BaseController
                 // 发送错误信息
                 $error = [
                     'type' => 'error',
-                    'message' => $e->getMessage(),
+                    'msg'   => $e->getMessage(),
                     'code' => $e->getCode()
                 ];
                 $jsonError = json_encode($error, JSON_UNESCAPED_UNICODE);
@@ -441,7 +441,7 @@ class DeepSeekController extends BaseController
                 // 发送错误信息
                 $error = [
                     'type' => 'error',
-                    'message' => $e->getMessage(),
+                    'msg' => $e->getMessage(),
                     'code' => $e->getCode()
                 ];
                 $jsonError = json_encode($error, JSON_UNESCAPED_UNICODE);
@@ -515,7 +515,7 @@ class DeepSeekController extends BaseController
                 // 发送错误信息
                 $error = [
                     'type' => 'error',
-                    'message' => $e->getMessage(),
+                    'msg' => $e->getMessage(),
                     'code' => $e->getCode()
                 ];
                 $jsonError = json_encode($error, JSON_UNESCAPED_UNICODE);
@@ -587,7 +587,7 @@ class DeepSeekController extends BaseController
                 // 发送错误信息
                 $error = [
                     'type' => 'error',
-                    'message' => $e->getMessage(),
+                    'msg' => $e->getMessage(),
                     'code' => $e->getCode()
                 ];
                 $jsonError = json_encode($error, JSON_UNESCAPED_UNICODE);

+ 9 - 7
app/Services/DeepSeek/DeepSeekService.php

@@ -1827,14 +1827,12 @@ class DeepSeekService
         $model = $model == 'r1' ? 'deepseek-reasoner' : 'deepseek-chat';
         $is_multi = getProp($data, 'is_multi', 1);
 
-        if (!$file && !$content && !$bid) {
-            Utils::throwError('20003:请上传文件或选择书籍或输入内容');
-        }
+        // if (!$file && !$content && !$bid) {
+        //     Utils::throwError('20003:请上传文件或选择书籍或输入内容');
+        // }
 
         // 提取文件内容
-        if ($content) {
-            $content = filterContent($content);
-        } elseif ($file) {
+        if ($file) {
             $content = $this->extractFileContent($file);
             if (!$content) {
                 Utils::throwError('20003:无法提取文件内容,请检查文件格式');
@@ -1844,7 +1842,11 @@ class DeepSeekService
             if (!$content) {
                 Utils::throwError('20003:无法获取书籍内容,请检查书籍');
             }
-        } else {
+        } elseif ($content) { 
+            $content = filterContent($content);
+        } elseif ($prompt) {
+            $content = $prompt;
+        }else {
             Utils::throwError('20003:请上传文件或选择书籍或输入内容');
         }