Merge branch 'hotfix/upload_oss' of wmtx/platform into master

修改分包

Application/Base/Service/GameSourceService.class.php

@@ -229,6 +229,10 @@ class GameSourceService {
         $gameSourceUrl = $this->getGameSourceUrl($gameSource);
         if ($gameSource == null  || !file_exists($gameSourceUrl)) {
             M('apply', 'tab_')->where(['id' => $apply['id']])->setField('enable_status', -1);
+            return [
+                'status' => false,
+                'message' => '打包失败，原包或原包路径不存在！',
+            ];
         }
 
         /* 检测是否存在投放申请，存在则更改投放申请信息，否则进行渠道打包 */
@@ -351,20 +355,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;