From efb4cde4f1dc1e080506c5cb71e34c22b22f3652 Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Fri, 5 Sep 2025 16:26:34 +0800
Subject: [PATCH] 1

---
 app/{queue => common/utils}/translation/config/trans.php  | 0
 .../utils}/translation/jobs/TranslationJob.php            | 7 ++++---
 .../utils}/translation/queue/Translation.php              | 4 ++--
 .../utils}/translation/service/TranslationService.php     | 8 +++++---
 .../utils}/translation/service/TranslatorClient.php       | 2 +-
 app/ticket/service/CategorieService.php                   | 2 +-
 6 files changed, 13 insertions(+), 10 deletions(-)
 rename app/{queue => common/utils}/translation/config/trans.php (100%)
 rename app/{queue => common/utils}/translation/jobs/TranslationJob.php (87%)
 rename app/{queue => common/utils}/translation/queue/Translation.php (93%)
 rename app/{queue => common/utils}/translation/service/TranslationService.php (79%)
 rename app/{queue => common/utils}/translation/service/TranslatorClient.php (95%)

diff --git a/app/queue/translation/config/trans.php b/app/common/utils/translation/config/trans.php
similarity index 100%
rename from app/queue/translation/config/trans.php
rename to app/common/utils/translation/config/trans.php
diff --git a/app/queue/translation/jobs/TranslationJob.php b/app/common/utils/translation/jobs/TranslationJob.php
similarity index 87%
rename from app/queue/translation/jobs/TranslationJob.php
rename to app/common/utils/translation/jobs/TranslationJob.php
index eb5e704..ca584e2 100644
--- a/app/queue/translation/jobs/TranslationJob.php
+++ b/app/common/utils/translation/jobs/TranslationJob.php
@@ -1,8 +1,8 @@
 <?php
-namespace app\queue\translation\jobs;
+namespace app\common\utils\translation\jobs;
 
 use support\Log;
-use app\queue\translation\service\TranslatorClient;
+use app\common\utils\translation\service\TranslatorClient;
 
 class TranslationJob
 {
@@ -11,7 +11,8 @@ class TranslationJob
 
     public function __construct(array $payload)
     {
-        $this->config = getConfig('/queue/translation/config/trans.php');
+        $this->config = getConfig('/common/utils/translation/config/trans.php');
+//        $this->config = getConfig('/queue/translation/config/trans.php');
         $this->payload = $payload;
     }
 
diff --git a/app/queue/translation/queue/Translation.php b/app/common/utils/translation/queue/Translation.php
similarity index 93%
rename from app/queue/translation/queue/Translation.php
rename to app/common/utils/translation/queue/Translation.php
index 0b5841a..e9935f6 100644
--- a/app/queue/translation/queue/Translation.php
+++ b/app/common/utils/translation/queue/Translation.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace app\queue\translation\queue;
+namespace app\common\utils\translation\queue;
 
 use support\Log;
 use Webman\RedisQueue\Consumer;
-use app\queue\translation\jobs\TranslationJob;
+use app\common\utils\translation\jobs\TranslationJob;
 
 class Translation implements Consumer
 {
diff --git a/app/queue/translation/service/TranslationService.php b/app/common/utils/translation/service/TranslationService.php
similarity index 79%
rename from app/queue/translation/service/TranslationService.php
rename to app/common/utils/translation/service/TranslationService.php
index 3578d89..1828ad4 100644
--- a/app/queue/translation/service/TranslationService.php
+++ b/app/common/utils/translation/service/TranslationService.php
@@ -1,5 +1,5 @@
 <?php
-namespace app\queue\translation\service;
+namespace app\common\utils\translation\service;
 
 // use Webman\RedisQueue\Client;
 use Webman\RedisQueue\Redis;
@@ -12,7 +12,8 @@ class TranslationService
 
     public function __construct()
     {
-        $this->config = getConfig('/queue/translation/config/trans.php');
+        $this->config = getConfig('/common/utils/translation/config/trans.php');
+//        $this->config = getConfig('/queue/translation/config/trans.php');
     }
 
     /**
@@ -23,8 +24,9 @@ class TranslationService
      * @param string $sourceLocale 源语种，如 'zh'
      * @param array  $sourceFields 源语种字段 ['name'=>…,'condition_desc'=>…]
      * @param array  $clientFields 前端已传翻译 ['en'=>[...], …]
+     * @param array  $intactFields 不需要翻译的字段
      */
-    public function queueTranslations(string $entityType, int $entityId, string $sourceLocale, array $sourceFields, array $clientFields = []): void
+    public function queueTranslations(string $entityType, int $entityId, string $sourceLocale, array $sourceFields, array $clientFields = [], array $intactFields = []): void
     {
         foreach ($this->config['locales'] as $locale) {
             $payload = [
diff --git a/app/queue/translation/service/TranslatorClient.php b/app/common/utils/translation/service/TranslatorClient.php
similarity index 95%
rename from app/queue/translation/service/TranslatorClient.php
rename to app/common/utils/translation/service/TranslatorClient.php
index 3abc1df..ee227da 100644
--- a/app/queue/translation/service/TranslatorClient.php
+++ b/app/common/utils/translation/service/TranslatorClient.php
@@ -1,5 +1,5 @@
 <?php
-namespace app\queue\translation\service;
+namespace app\common\utils\translation\service;
 
 use app\queue\utils\XunfeiFanyi;
 use support\Log;
diff --git a/app/ticket/service/CategorieService.php b/app/ticket/service/CategorieService.php
index 67d1d74..dedccd4 100644
--- a/app/ticket/service/CategorieService.php
+++ b/app/ticket/service/CategorieService.php
@@ -2,7 +2,7 @@
 
 namespace app\ticket\service;
 
-use app\queue\translation\service\TranslationService;
+use app\common\utils\translation\service\TranslationService;
 use app\queue\utils\Translat;
 use app\ticket\logic\CategorieLogic;
 use app\ticket\model\CategorieTranslation;