From 1119cc390b1b5ea1a4646dc16a129cc6af15a127 Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Tue, 9 Sep 2025 14:09:57 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/controller/UploadController.php | 4 ++--
 app/common/service/UploadService.php       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/common/controller/UploadController.php b/app/common/controller/UploadController.php
index 6d89815..1637350 100644
--- a/app/common/controller/UploadController.php
+++ b/app/common/controller/UploadController.php
@@ -87,7 +87,7 @@ class UploadController
             $originalName = $file->getUploadName();
 
             $result = Storage::adapter('oss')
-                ->path('vehicle_album/' . $sceneUrl . date('Ymd'))
+                ->path('x_server/' . $sceneUrl . date('Ymd'))
                 ->size(1024*1024*5)
                 ->upload($file);
             
@@ -128,7 +128,7 @@ class UploadController
             }
 
             $result = Storage::adapter('oss')
-                ->path('vehicle_album/' . $sceneUrl . date('Ymd'))
+                ->path('x_server/' . $sceneUrl . date('Ymd'))
                 ->size(1024*1024*5)
                 ->extYes(['image/jpeg','image/png'])
                 ->extNo(['image/gif'])
diff --git a/app/common/service/UploadService.php b/app/common/service/UploadService.php
index 74193d5..bec4942 100644
--- a/app/common/service/UploadService.php
+++ b/app/common/service/UploadService.php
@@ -14,7 +14,7 @@ class UploadService
      *
      * @param Request $request
      * - path: 本地文件绝对路径
-     * - scene: 业务分区/场景（可选）
+     * - scene: 业务分区/场景
      * - category: 文件分类（可选）
      * - original_name: 原始文件名（可选）
      */
@@ -24,7 +24,7 @@ class UploadService
             $filePath = $param['path'];
             $scene = $param['scene'];
             $category = $param['category']??'general';
-            $providedOriginalName = $param['original_name'];
+            $providedOriginalName = $param['original_name']??'';
 
             if (empty($filePath)) {
                 Log::error('本地文件路径不能为空',$param);

From ed5b21e3494b72f385016a1a9362b57b8c46e0c3 Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Tue, 9 Sep 2025 14:55:14 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=85=AC=E5=8F=B8=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/service/UserService.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/admin/service/UserService.php b/app/admin/service/UserService.php
index 6675a89..455b25b 100644
--- a/app/admin/service/UserService.php
+++ b/app/admin/service/UserService.php
@@ -90,6 +90,9 @@ class UserService
                 if (isset($p['id']) && $p['id']) {
                     $config['where']['id'] = $p['id'];
                 }
+                if (isset($p['corp_id']) && $p['corp_id']) {
+                    $config['where']['corp_id'] = $p['corp_id'];
+                }
 
                 $config['fields'] = ['id','sn', 'name', 'email', 'sex', 'phone', 'avatar', 'corp_id', 'country_id', 'position', 'report_to', 'status', 'created_at'];
 

From ef0e3edab34e21225fbbc98f4c02380fe96fcf65 Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Tue, 9 Sep 2025 16:59:34 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/service/SysDictService.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/admin/service/SysDictService.php b/app/admin/service/SysDictService.php
index dfb7f53..e46b07b 100644
--- a/app/admin/service/SysDictService.php
+++ b/app/admin/service/SysDictService.php
@@ -8,8 +8,6 @@ use app\common\model\SysDict;
 use app\common\model\SysDictCategory;
 use app\common\utils\translation\service\TranslationService;
 use app\queue\utils\Translat;
-use app\common\utils\translation\service\TranslationService;
-use app\queue\utils\Translat;
 use support\Request;
 
 class SysDictService

From e2088cc82d7e19d5604b166020faf5b41c47ed0a Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Tue, 9 Sep 2025 17:24:11 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E7=BF=BB=E8=AF=91=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/queue/utils/XunfeiFanyi.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/queue/utils/XunfeiFanyi.php b/app/queue/utils/XunfeiFanyi.php
index 4fe78ab..e380d21 100644
--- a/app/queue/utils/XunfeiFanyi.php
+++ b/app/queue/utils/XunfeiFanyi.php
@@ -3,6 +3,8 @@
 namespace app\queue\utils;
 
 
+use support\Log;
+
 class XunfeiFanyi
 {
 
@@ -117,10 +119,12 @@ digest: %s", "ntrans.xfyun.cn", $date, $digestBase64);
                 return $data["data"]["result"];
             } else {
                 $this->error = $data["message"];
+                Log::error("XunfeiFanyi 失败: ".$data["message"],[$data]);
                 return false;
             }
         } catch (\Throwable $th) {
             $this->error = $th->getMessage();
+            Log::error("XunfeiFanyi 错误: ".$th->getMessage());
             return false;
         }
     }