Merge branch 'master' of http://124.223.61.50:8099/haojie/open_ai_api

app/Jobs/ReadDiscordMessageJob.php

@@ -27,9 +27,16 @@ public function handle()
     {
     {
         $data = $this->data;
         $data = $this->data;
         $content = $data['message_content'] ?? '';
         $content = $data['message_content'] ?? '';
+        preg_match('/\*\*<(.*)> (.*)\*\*/', $content, $matches);
+        if (blank($matches)) {
             preg_match('/\*\*(.*)\*\*/', $content, $matches);
             preg_match('/\*\*(.*)\*\*/', $content, $matches);
-        if (isset($matches[1])) {
-            $key = app(TaskService::class)->getDiscordMessageKey($matches[1]);
+            $content = $matches[1] ?? '';
+        } else {
+            $content = $matches[2] ?? '';
+        }
+
+        if (isset($content) && filled($content)) {
+            $key = app(TaskService::class)->getDiscordMessageKey($content);
             $cachePrompt = Cache::get($key);
             $cachePrompt = Cache::get($key);
             if (!empty($cachePrompt)) {
             if (!empty($cachePrompt)) {
                 $updateData = [
                 $updateData = [
@@ -38,6 +45,7 @@ public function handle()
                 ];
                 ];
                 PromptTask::where('id', $cachePrompt['prompt_task_id'])
                 PromptTask::where('id', $cachePrompt['prompt_task_id'])
                     ->update($updateData);
                     ->update($updateData);
+                Cache::forget($key);
             }
             }
         }
         }
     }
     }

app/Jobs/SendImagineJob.php

@@ -26,13 +26,13 @@ public function __construct(array $data = [])
     public function handle()
     public function handle()
     {
     {
         $data = $this->data;
         $data = $this->data;
+        $key = app(TaskService::class)->getDiscordMessageKey($data['prompt']);
+        Cache::set($key, ['prompt_task_id' => $data['prompt_id']], (60 * 60 * 24));
         // 处理图转图
         // 处理图转图
         if ($data['type'] == TaskService::TYPE_IMG_TO_IMG) {
         if ($data['type'] == TaskService::TYPE_IMG_TO_IMG) {
             $promptImg = json_decode(($data['prompt_img'] ?? ''));
             $promptImg = json_decode(($data['prompt_img'] ?? ''));
             $data['prompt'] = ($promptImg[0] ?? '') . ' ' . $data['prompt'];
             $data['prompt'] = ($promptImg[0] ?? '') . ' ' . $data['prompt'];
         }
         }
-        $key = app(TaskService::class)->getDiscordMessageKey($data['prompt']);
-        Cache::set($key, ['prompt_task_id' => $data['prompt_id']], (60 * 60 * 24));
         app(ExternalApiService::class)->imagine($data);
         app(ExternalApiService::class)->imagine($data);
     }
     }
 }
 }