From 53e039567404cb105981ca9c27b933676c1cd54c Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Tue, 22 Oct 2019 18:18:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/AutoPackController.class.php | 1 +
 Application/Base/Service/OssService.class.php             | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/AutoPackController.class.php b/Application/Admin/Controller/AutoPackController.class.php
index af6beaab7..a3ab3f691 100644
--- a/Application/Admin/Controller/AutoPackController.class.php
+++ b/Application/Admin/Controller/AutoPackController.class.php
@@ -19,6 +19,7 @@ use BaiduBce\Services\Bos\BosOptions;
 use BaiduBce\Auth\SignOptions;
 use BaiduBce\Log\LogFactory;
 use Think\Think;
+use Base\Service\GameSourceService;
 
 /**
  * 后台首页控制器
diff --git a/Application/Base/Service/OssService.class.php b/Application/Base/Service/OssService.class.php
index dcf3cba89..f6c563459 100644
--- a/Application/Base/Service/OssService.class.php
+++ b/Application/Base/Service/OssService.class.php
@@ -39,7 +39,7 @@ class OssService {
                 'status' => true,
                 'message' => '上传OSS成功',
                 'data' => [
-                    'url' => $this->getUrl()
+                    'url' => $this->getUrl($saveFileName)
                 ]
             ];
         } catch (OssException $e) {
@@ -92,7 +92,7 @@ class OssService {
         /**
          * step 3. 完成上传
          */
-        $this->client->completeMultipartUpload($this->bucket, $url, $uploadId, $uploadParts);
+        $this->client->completeMultipartUpload($this->bucket, $saveFileName, $uploadId, $uploadParts);
     }
 
     /**
@@ -118,5 +118,6 @@ class OssService {
         if (!empty($this->bdDomain) && strlen($this->bdDomain) > 5) {
             $url = $this->bdDomain . $saveFileName;
         }
+        return $url;
     }
 }
\ No newline at end of file