Merge branch 'feature/stock_next' into develop

2025-09-08 18:03:21 +08:00
parent 88ef71f67e d6d421cba2
commit 50a795afb7
9 changed files with 117 additions and 18 deletions
@@ -79,12 +79,15 @@ class UploadController
                return $this->error('上传失败');
            }
            if (empty($scene)) {
-                return $this->error('上传场景不能为空');
+//                return $this->error('上传场景不能为空');
+                $sceneUrl = '';
+            }else{
+                $sceneUrl = $scene . '/';
            }
            $originalName = $file->getUploadName();

            $result = Storage::adapter('oss')
-                ->path('vehicle_album/' . $scene . '/' . date('Ymd'))
+                ->path('vehicle_album/' . $sceneUrl . date('Ymd'))
                ->size(1024*1024*5)
                ->upload($file);
            
@@ -118,11 +121,14 @@ class UploadController
                return $this->error('上传失败');
            }
            if (empty($scene)) {
-                return $this->error('上传场景不能为空');
+//                return $this->error('上传场景不能为空');
+                $sceneUrl = '';
+            }else{
+                $sceneUrl = $scene . '/';
            }

            $result = Storage::adapter('oss')
-                ->path('vehicle_album/' . $scene . '/' . date('Ymd'))
+                ->path('vehicle_album/' . $sceneUrl . date('Ymd'))
                ->size(1024*1024*5)
                ->extYes(['image/jpeg','image/png'])
                ->extNo(['image/gif'])
@@ -0,0 +1,87 @@
+<?php
+
+namespace app\common\service;
+
+use support\exception\BusinessException;
+use support\Log;
+use support\Request;
+
+class UploadService
+{
+
+    /**
+     * 从服务器本地路径上传文件到 OSS
+     *
+     * @param Request $request
+     * - path: 本地文件绝对路径
+     * - scene: 业务分区/场景（可选）
+     * - category: 文件分类（可选）
+     * - original_name: 原始文件名（可选）
+     */
+    public function uploadLocalFile($param)
+    {
+        try {
+            $filePath = $param['path'];
+            $scene = $param['scene'];
+            $category = $param['category']??'general';
+            $providedOriginalName = $param['original_name'];
+
+            if (empty($filePath)) {
+                Log::error('本地文件路径不能为空',$param);
+                throw new BusinessException('本地文件路径不能为空');
+            }
+
+            if (!file_exists($filePath) || !is_readable($filePath)) {
+                Log::error('本地文件不存在或不可读',$param);
+                throw new BusinessException('本地文件不存在或不可读');
+            }
+            if (empty($scene)) {
+                Log::error('上传场景不能为空',$param);
+                throw new BusinessException('上传场景不能为空');
+            }
+
+            $basename = basename($filePath);
+            $originalName = $providedOriginalName ?: $basename;
+            $extensionFromName = pathinfo($originalName, PATHINFO_EXTENSION);
+            $extensionFromPath = pathinfo($basename, PATHINFO_EXTENSION);
+            $extension = $extensionFromName ?: $extensionFromPath;
+
+            $mime = mime_content_type($filePath) ?: 'application/octet-stream';
+            $size = filesize($filePath) ?: 0;
+
+            $sceneUrl = $scene ? ($scene . '/') : '';
+            $dir = 'vehicle_album/' . $sceneUrl . date('Ymd') . '/';
+            $uniqueName = md5($originalName . microtime(true));
+            $objectKey = $dir . $uniqueName . ($extension ? ('.' . $extension) : '');
+
+            $ossService = new OssService();
+            $ossService->uploadImage($filePath, $objectKey);
+            $privateUrl = $ossService->generatePrivateUrl($objectKey);
+
+            // 记录文件信息到数据库
+            $uploadedFilesService = new UploadedFilesService();
+            $fileInfo = [
+                'file_name' => $objectKey,
+                'file_path' => $objectKey,
+                'file_size' => $size,
+                'file_type' => $mime,
+                'original_name' => $originalName,
+            ];
+            $recordResult = $uploadedFilesService->recordFileInfo($fileInfo, null, $scene, $category);
+
+            $data = [
+                'original_name' => $originalName,
+                'file_name' => $objectKey,
+                'file_url' => $privateUrl,
+                'file_id' => $recordResult['id'] ?? null,
+                'partition' => $scene,
+                'category' => $category,
+            ];
+
+            return $data;
+        } catch (\Throwable $e) {
+            Log::error($e->getMessage(),$param);
+            throw new BusinessException($e->getMessage());
+        }
+    }
+}
@@ -52,13 +52,13 @@ class UploadedFilesService
     * 记录文件信息到数据库
     * 
     * @param array $fileInfo 文件信息
-     * @param Request $request 请求对象
+     * @param Request|null $request 请求对象（可选）
     * @param string $partition 分区名称
     * @param string $category 文件分类
     * @return array
     * @throws BusinessException
     */
-    public function recordFileInfo(array $fileInfo, Request $request, string $partition = 'other', string $category = 'general'): array
+    public function recordFileInfo(array $fileInfo, ?Request $request = null, string $partition = 'other', string $category = 'general'): array
    {

        // 验证必需的文件信息
@@ -73,6 +73,9 @@ class UploadedFilesService
        $fileExtension = pathinfo($fileInfo['file_name'], PATHINFO_EXTENSION);
        
        // 记录到数据库
+        $uploadIp = $request ? $request->getRealIp() : '0.0.0.0';
+        $userAgent = $request ? $request->header('User-Agent', '') : '';
+
        $fileData = [
            'file_name' => $fileInfo['file_name'],
            'file_path' => $fileInfo['file_path'],
@@ -82,8 +85,8 @@ class UploadedFilesService
            'original_name' => $fileInfo['original_name'] ?? '',
            'extension' => $fileExtension,
            'partition' => $partition,
-            'upload_ip' => $request->getRealIp(),
-            'user_agent' => $request->header('User-Agent', ''),
+            'upload_ip' => $uploadIp,
+            'user_agent' => $userAgent,
        ];

        $uploadedFile = $this->logicCreate($fileData);
@@ -0,0 +1,14 @@
+<?php
+
+return [
+    // 定义所有需要多语言支持的实体
+    'entities' => [
+        'ticket_categorie' => [
+            'translation_model' => \app\ticket\model\CategorieTranslation::class,
+            'foreign_key'       => 'categorie_id',
+        ],
+    ],
+
+    // 默认支持的目标语种列表
+    'locales' => ['zh','en','ru','ar'],
+];
@@ -0,0 +1,65 @@
+<?php
+namespace app\common\utils\translation\jobs;
+
+use support\Log;
+use app\common\utils\translation\service\TranslatorClient;
+
+class TranslationJob
+{
+    protected $config = [];
+    protected array $payload;
+
+    public function __construct(array $payload)
+    {
+        $this->config = getConfig('/common/utils/translation/config/trans.php');
+//        $this->config = getConfig('/queue/translation/config/trans.php');
+        $this->payload = $payload;
+    }
+
+    public function handle(): void
+    {
+        $cfgAll       = $this->config['entities'];
+        $pt           = $this->payload;
+        $type         = $pt['entityType'];
+        $id           = $pt['entityId'];
+        $locale       = $pt['locale'];
+        $sourceLocale = $pt['sourceLocale'];
+        $sourceFields = $pt['sourceFields'];
+        $clientFields = $pt['clientFields'];
+
+        if (! isset($cfgAll[$type])) {
+            Log::warning("TranslationJob: 未配置实体 {$type}");
+            return;
+        }
+
+        $cfg          = $cfgAll[$type];
+        $modelClass   = $cfg['translation_model'];
+        $foreignKey   = $cfg['foreign_key'];
+        
+        // 决定采用前端提供、源语种还是第三方翻译
+        if (! empty($clientFields)) {
+            $fields = $clientFields;
+        } elseif ($locale === $sourceLocale) {
+            $fields = $sourceFields;
+        } else {
+            $translator = new TranslatorClient();
+            $fields = [];
+            foreach ($sourceFields as $key => $text) {
+                $fields[$key] = $translator->translate($text, $sourceLocale, $locale);
+            }
+        }
+        
+        // 写库
+        try {
+            $modelClass::updateOrCreate(
+                [
+                    $foreignKey => $id,
+                    'locale'    => $locale,
+                ],
+                array_merge($fields, ['locale' => $locale])
+            );
+        } catch (\Throwable $e) {
+            Log::error("TranslationJob 保存失败: {$type}#{$id} locale={$locale}: ".$e->getMessage());
+        }
+    }
+}
@@ -0,0 +1,50 @@
+<?php
+
+namespace app\common\utils\translation\queue;
+
+use support\Log;
+use Webman\RedisQueue\Consumer;
+use app\common\utils\translation\jobs\TranslationJob;
+
+class Translation implements Consumer
+{
+    // 要消费的队列名
+    public $queue = 'transTask';
+
+    // 连接名，对应 plugin/webman/redis-queue/redis.php 里的连接`
+    public $connection = 'default';
+
+    // 消费
+    public function consume($data)
+    {
+        try {
+            // 无需反序列化
+            // var_export($data); // 输出 ['to' => 'tom@gmail.com', 'content' => 'hello']
+
+            $job = new TranslationJob($data);
+            $job->handle();
+        } catch (\Throwable $e) {
+            Log::error("TranslationService 异步任务异常: ".$e->getMessage());
+        }
+    }
+    // 消费失败回调
+    /* 
+    $package = [
+        'id' => 1357277951, // 消息ID
+        'time' => 1709170510, // 消息时间
+        'delay' => 0, // 延迟时间
+        'attempts' => 2, // 消费次数
+        'queue' => 'send-mail', // 队列名
+        'data' => ['to' => 'tom@gmail.com', 'content' => 'hello'], // 消息内容
+        'max_attempts' => 5, // 最大重试次数
+        'error' => '错误信息' // 错误信息
+    ]
+    */
+    public function onConsumeFailure(\Throwable $e, $package)
+    {
+        echo "consume failure\n";
+        echo $e->getMessage() . "\n";
+        // 无需反序列化
+        var_export($package); 
+    }
+}
@@ -0,0 +1,43 @@
+<?php
+namespace app\common\utils\translation\service;
+
+// use Webman\RedisQueue\Client;
+use Webman\RedisQueue\Redis;
+
+class TranslationService
+{
+
+    // 配置
+    protected $config = [];
+
+    public function __construct()
+    {
+        $this->config = getConfig('/common/utils/translation/config/trans.php');
+//        $this->config = getConfig('/queue/translation/config/trans.php');
+    }
+
+    /**
+     * 异步排队所有语种的翻译任务
+     *
+     * @param string $entityType   实体名，如 'vehicle'
+     * @param int    $entityId     主表 ID
+     * @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 = [], array $intactFields = []): void
+    {
+        foreach ($this->config['locales'] as $locale) {
+            $payload = [
+                'entityType'   => $entityType,
+                'entityId'     => $entityId,
+                'locale'       => $locale,
+                'sourceLocale' => $sourceLocale,
+                'sourceFields' => $sourceFields,
+                'clientFields' => $clientFields[$locale] ?? [],
+            ];
+            Redis::send('transTask', $payload);
+        }
+    }
+}
@@ -0,0 +1,38 @@
+<?php
+namespace app\common\utils\translation\service;
+
+use app\queue\utils\XunfeiFanyi;
+use support\Log;
+
+class TranslatorClient
+{
+
+    // protected string $endpoint;
+    // protected string $apiKey;
+
+    // public function __construct()
+    // {
+    //     $this->endpoint = env('TRANSLATION_API_URL');
+    //     $this->apiKey   = env('TRANSLATION_API_KEY');
+    // }
+
+    /**
+     * 翻译文本
+     * @throws \RuntimeException
+     */
+    public function translate(string $text, string $from = 'cn', string $to = 'ru'): string
+    {
+        try {
+            $xunfei = new XunfeiFanyi();
+            $rst_dst = $xunfei->fanyi($text, $from, $to);
+            if ($rst_dst) {
+                return $rst_dst["trans_result"]["dst"];
+            } else {
+                return '';
+            }
+        } catch (\Throwable $e) {
+            Log::error("TranslatorClient 错误: ".$e->getMessage());
+            throw new \RuntimeException('翻译服务调用失败');
+        }
+    }
+}