From 11659dde49bdca59c7297d44c206a42220cd2752 Mon Sep 17 00:00:00 2001 From: chuan <2154243450@qq.com> Date: Tue, 11 Mar 2025 15:56:05 +0800 Subject: [PATCH] upp --- app/admin/controller/Test.php | 2 ++ app/admin/controller/Upload.php | 35 +++++++++++++++----------- app/admin/controller/setting/Forex.php | 2 +- app/admin/route/app.php | 2 +- app/admin/service/LoginService.php | 6 ++--- composer.json | 2 +- 6 files changed, 29 insertions(+), 20 deletions(-) diff --git a/app/admin/controller/Test.php b/app/admin/controller/Test.php index f2af2c94..17afba7d 100644 --- a/app/admin/controller/Test.php +++ b/app/admin/controller/Test.php @@ -8,6 +8,7 @@ class Test extends AdminBaseController public function index() { + $appNumber = env('APP_NUMBER'); $appRootPath = app()->getRootPath(); $appAppPath = app()->getAppPath(); $memoryLimit = ini_get('memory_limit'); @@ -23,6 +24,7 @@ class Test extends AdminBaseController 'max_input_time' => $max_input_time, 'app_root_path' => $appRootPath, 'app_path' => $appAppPath, + 'app_number' => $appNumber ]]); } } \ No newline at end of file diff --git a/app/admin/controller/Upload.php b/app/admin/controller/Upload.php index 39d8bdf6..82588107 100644 --- a/app/admin/controller/Upload.php +++ b/app/admin/controller/Upload.php @@ -72,7 +72,7 @@ class Upload extends AdminBaseController if (isset($openFile)) { fclose($openFile); } - return json(['code' => '100500', 'message' => '系统繁忙', 'data' => [$exception->getMessage()]]); + return json(['code' => '500', 'message' => '系统繁忙', 'data' => [$exception->getMessage()]]); } } @@ -143,7 +143,7 @@ class Upload extends AdminBaseController if (isset($openFile)) { fclose($openFile); } - return json(['code' => '100500', 'message' => '系统繁忙', 'data' => [$exception->getMessage()]]); + return json(['code' => '500', 'message' => '系统繁忙', 'data' => [$exception->getMessage()]]); } } @@ -201,6 +201,7 @@ class Upload extends AdminBaseController AwsS3Model::create([ 'upload_id' => $result['UploadId'], 'key' => 'bourse-video-node/' . $fileName, + 'parts' => '', 'name' => $fileName, 'mime' => $getMime, 'ext' => $getExt, @@ -263,7 +264,7 @@ class Upload extends AdminBaseController ])->toArray(); fclose($openFile); Log::info("上传分段结果：".json_encode($result)); - if (empty($result['partNumber']) || empty($result['ETag'])) { + if (empty($result['ETag'])) { return json(['code' => 400, 'message' => '上传分片失败']); } @@ -293,7 +294,7 @@ class Upload extends AdminBaseController if (isset($openFile)) { fclose($openFile); } - return json(['code' => '100500', 'message' => '上传失败', 'data' => [$exception->getMessage()]]); + return json(['code' => '500', 'message' => '上传失败', 'data' => [$exception->getMessage()]]); } } @@ -313,7 +314,10 @@ class Upload extends AdminBaseController if (empty($awsS3) || empty($awsS3['parts']) || empty($awsS3['key'])) { return json(['code' => 400, 'message' => 'uploadId对应的数据错误']); } - $parts = json_decode($awsS3['parts']); + // 取出上传的分片记录，并排序 + $parts = json_decode($awsS3['parts'],true); + $partNumbers = array_column($parts, 'PartNumber'); + array_multisort($partNumbers, SORT_ASC, $parts); // 初始化s3客户端 $s3Config = Config::get('common.aws_s3'); @@ -337,17 +341,20 @@ class Upload extends AdminBaseController // 更新分片上传记录 $awsS3->is_complete = 1; - $awsS3->parts = json_encode($param['parts']); $awsS3->s3_url = $result['Location']; $awsS3->save(); - return json(['code' => 200, 'message' => '上传成功', 'data'=>[ - 'id' => $awsS3->id, - 'uploadId' => $param['uploadId'], - 'location' => $result['Location'], - ]]); + return json([ + 'code' => 0, + 'message' => '上传成功', + 'data'=>[ + 'id' => $awsS3->id, + 'uploadId' => $param['uploadId'], + 'location' => $result['Location'], + ] + ]); } catch (\Exception $exception) { - return json(['code' => '100500', 'message' => '完成上传失败', 'data' => [$exception->getMessage()]]); + return json(['code' => '500', 'message' => '完成上传失败', 'data' => [$exception->getMessage()]]); } } @@ -374,9 +381,9 @@ class Upload extends AdminBaseController 'UploadId' => $param['uploadId'], ]); Log::info('终止分段上传结果：'.json_encode($result)); - return json(['code' => 200, 'message' => '上传已取消']); + return json(['code' => 0, 'message' => '上传已取消']); } catch (\Exception $exception) { - return json(['code' => '100500', 'message' => '取消上传失败', 'data' => [$exception->getMessage()]]); + return json(['code' => '500', 'message' => '取消上传失败', 'data' => [$exception->getMessage()]]); } } diff --git a/app/admin/controller/setting/Forex.php b/app/admin/controller/setting/Forex.php index 29b99934..7ab94860 100644 --- a/app/admin/controller/setting/Forex.php +++ b/app/admin/controller/setting/Forex.php @@ -47,7 +47,7 @@ class Forex extends AdminBaseController public function hq_index() { $service = new ForexService(); - $result = $service->hq_index(); + $result = $service->hq_index($this->request->param()); return json($result); } diff --git a/app/admin/route/app.php b/app/admin/route/app.php index bef8b29f..b14b9fbb 100644 --- a/app/admin/route/app.php +++ b/app/admin/route/app.php @@ -213,7 +213,7 @@ Route::group('/', function () { Route::post('admin/send_email_or_sms', 'Admin/sendEmailOrSms'); // 给用户发邮件或者短信 // 配置管理 - // 合约插针行情 + // 外汇插针行情 Route::post('/setting/forex_hq_index', 'setting.Forex/hq_index'); Route::post('/setting/forex_hq_add', 'setting.Forex/hq_add'); Route::post('/setting/forex_hq_edit', 'setting.Forex/hq_edit'); diff --git a/app/admin/service/LoginService.php b/app/admin/service/LoginService.php index b5402740..4ed75731 100644 --- a/app/admin/service/LoginService.php +++ b/app/admin/service/LoginService.php @@ -29,12 +29,12 @@ class LoginService extends AdminBaseService if(empty($info)){ return $this->toData('200300', 'Incorrect account or password.1', []); } - if($info->status!==1){ - return $this->toData('200300', '该账户已被禁用', []); + if($info->status != 1){ + return $this->toData('200300', '该账户已被禁用', ['status'=>$info->status]); } //查看角色状态 $role=AuthRoleModel::find($info->role_id); - if(!$role||$role->status!==1){ + if(empty($role) || $role->status !=1){ return $this->toData('200300', '该账户所在的群组已被禁用', []); } // 校验密码 diff --git a/composer.json b/composer.json index 4bd92659..5f7acaa7 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ "guzzlehttp/guzzle": "^7.7", "lcobucci/jwt": "^4.0", "phpoffice/phpspreadsheet": "^1.29", - "ext-json": "*", + "ext-json": "*" }, "require-dev": { "symfony/var-dumper": "^4.2",