diff --git a/app/admin/service/UserService.php b/app/admin/service/UserService.php index 4484552..7f2fadd 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']; 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 d38bba6..2d9ac53 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); 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; } }