From b217695c3f32e203439a5e6d220a59ff1c959ba0 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Wed, 22 Apr 2020 12:36:16 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E5=8C=85oss?= =?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 --- .../Base/Service/GameSourceService.class.php | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/Application/Base/Service/GameSourceService.class.php b/Application/Base/Service/GameSourceService.class.php index 4af55713c..f26eb0b6f 100644 --- a/Application/Base/Service/GameSourceService.class.php +++ b/Application/Base/Service/GameSourceService.class.php @@ -351,20 +351,27 @@ class GameSourceService { 'base_uri' => C('PACKAGE_CHUNK_URL'), 'timeout' => 30.0, ]); - $response = $client->post('/upload', [ - 'verify' => false, - 'form_params' => [ - 'file' => $localFilePath, - 'dest' => $distFilePath, - 'is_delete_local' => ($isDeleteLocal ? 1 : 0), - ] - ]); - $result = (string)$response->getBody(); - $result = json_decode($result, true); - if (!$result) { + try { + $response = $client->post('/upload', [ + 'verify' => false, + 'form_params' => [ + 'file' => $localFilePath, + 'dest' => $distFilePath, + 'is_delete_local' => ($isDeleteLocal ? 1 : 0), + ] + ]); + $result = (string)$response->getBody(); + $result = json_decode($result, true); + if (!$result) { + return [ + 'status' => false, + 'message' => '请求异常', + ]; + } + } catch (\Exception $e) { return [ 'status' => false, - 'message' => '请求打包失败', + 'message' => '请求异常: ' . $e->getMessage(), ]; } return $result; From 22f0039cb368c06850d41478a8ead0ac423d60b4 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 29 Apr 2020 17:41:29 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E9=A2=84=E5=8F=91=E5=B8=83=E5=AE=98?= =?UTF-8?q?=E7=BD=91=E5=B9=B3=E5=8F=B0=E5=B8=81=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Media/View/default/Index/business.html | 3 ++- Application/Mobile/View/Index/index.html | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Application/Media/View/default/Index/business.html b/Application/Media/View/default/Index/business.html index 1c5de2d9f..7b2ef807f 100644 --- a/Application/Media/View/default/Index/business.html +++ b/Application/Media/View/default/Index/business.html @@ -16,7 +16,8 @@
-