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 @@ 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 @@ 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 @@