From 92eb6f3f0724624c7219132107a876533d3b7e20 Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Tue, 13 Jun 2023 15:43:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=AC=E4=B8=9C?=
 =?UTF-8?q?=E4=BA=91=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/v1/product/StoreProduct.php       | 16 ++++++++++++++--
 crmeb/crmeb/services/upload/storage/Jdoss.php    |  9 +++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/crmeb/app/adminapi/controller/v1/product/StoreProduct.php b/crmeb/app/adminapi/controller/v1/product/StoreProduct.php
index 8b979454b..aaa020ed7 100644
--- a/crmeb/app/adminapi/controller/v1/product/StoreProduct.php
+++ b/crmeb/app/adminapi/controller/v1/product/StoreProduct.php
@@ -19,6 +19,7 @@ use app\services\product\product\StoreProductServices;
 use crmeb\services\FileService;
 use app\services\other\UploadService;
 use think\facade\App;
+use think\Request;
 
 /**
  * Class StoreProduct
@@ -339,10 +340,21 @@ class StoreProduct extends AuthController
      * @return mixed
      * @throws \Exception
      */
-    public function getTempKeys()
+    public function getTempKeys(Request $request)
     {
         $upload = UploadService::init();
-        $re = $upload->getTempKeys();
+        $type = (int)sys_config('upload_type', 1);
+        $key = $request->get('key', '');
+        $path = $request->get('path', '');
+        $contentType = $request->get('contentType', '');
+        if ($type === 5) {
+            if (!$key || !$contentType) {
+                return app('json')->fail('缺少参数');
+            }
+            $re = $upload->getTempKeys($key, $path, $contentType);
+        } else {
+            $re = $upload->getTempKeys();
+        }
         return $re ? app('json')->success($re) : app('json')->fail(100016);
     }
 
diff --git a/crmeb/crmeb/services/upload/storage/Jdoss.php b/crmeb/crmeb/services/upload/storage/Jdoss.php
index 71b6b2512..d712513fa 100644
--- a/crmeb/crmeb/services/upload/storage/Jdoss.php
+++ b/crmeb/crmeb/services/upload/storage/Jdoss.php
@@ -345,17 +345,18 @@ class Jdoss extends BaseUpload
      * 获取OSS上传密钥
      * @return mixed|void
      */
-    public function getTempKeys($key = '', $path = '', $expires = '+10 minutes')
+    public function getTempKeys($key = '', $path = '', $contentType = '', $expires = '+10 minutes')
     {
         try {
             $app = $this->app();
-            $cmd = $app->getCommand([
+            $cmd = $app->getCommand(
                 'PutObject', [
                     'Bucket' => $this->storageName,
                     'Key' => $key,
-                    'SourceFile' => $path
+                    'SourceFile' => $path,
+                    'ContentType' => $contentType
                 ]
-            ]);
+            );
             $request = $app->createPresignedRequest($cmd, $expires);
             return (string)$request->getUri();
         } catch (\Throwable $e) {

From 63527e0fa092c38c4aeb559bf2ecdc547b5f5d3f Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Tue, 13 Jun 2023 16:21:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/adminapi/controller/v1/product/StoreProduct.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crmeb/app/adminapi/controller/v1/product/StoreProduct.php b/crmeb/app/adminapi/controller/v1/product/StoreProduct.php
index aaa020ed7..aae882592 100644
--- a/crmeb/app/adminapi/controller/v1/product/StoreProduct.php
+++ b/crmeb/app/adminapi/controller/v1/product/StoreProduct.php
@@ -351,7 +351,8 @@ class StoreProduct extends AuthController
             if (!$key || !$contentType) {
                 return app('json')->fail('缺少参数');
             }
-            $re = $upload->getTempKeys($key, $path, $contentType);
+            $url = $upload->getTempKeys($key, $path, $contentType);
+            $re = ['url' => $url];
         } else {
             $re = $upload->getTempKeys();
         }