From 4941f0b5293c7235be32bfc704c90cd87f3941c3 Mon Sep 17 00:00:00 2001
From: admin <admin@admin.com>
Date: Fri, 19 Jan 2024 12:00:52 +0800
Subject: [PATCH] =?UTF-8?q?edit=E4=BF=AE=E6=94=B9=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/Oss.php                            |  2 +-
 modules/admin/views/wechat/mp-slide-edit.php  |  2 +-
 modules/file/controllers/UploadController.php | 30 ++++++++++++++-----
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/components/Oss.php b/components/Oss.php
index 268c50a..7c7b184 100644
--- a/components/Oss.php
+++ b/components/Oss.php
@@ -22,7 +22,7 @@ class Oss
         $this->accessKeyId = 'LTAI5tMaDbEbWyQWpwmxp24y';
         $this->accessKeySecret = '3bjqbBFC08YIub3c8ry9Elz05UF1J7';
         $this->bucket = 'cxgjsz1';
-        $this->endpoint = 'https://oss-cn-shenzhen.aliyuncs.com';
+        $this->endpoint = 'http://oss-cn-shenzhen.aliyuncs.com';
 
         try {
             if (!isset($this->client)) {
diff --git a/modules/admin/views/wechat/mp-slide-edit.php b/modules/admin/views/wechat/mp-slide-edit.php
index 121dc65..9fe27c3 100644
--- a/modules/admin/views/wechat/mp-slide-edit.php
+++ b/modules/admin/views/wechat/mp-slide-edit.php
@@ -342,7 +342,6 @@ $type = Banner::type();
             }
             init_page();
         });
-
         var ue = UE.getEditor('editor', {
             serverUrl: "<?= \Yii::$app->urlManager->createUrl(['file/upload']) ?>",
             toolbars: [
@@ -398,6 +397,7 @@ $type = Banner::type();
                 ]
             ]
         });
+        console.log(ue)
 
         <?php $this->endBlock(); ?>
     </script>
diff --git a/modules/file/controllers/UploadController.php b/modules/file/controllers/UploadController.php
index 5860ba3..3465b31 100644
--- a/modules/file/controllers/UploadController.php
+++ b/modules/file/controllers/UploadController.php
@@ -365,6 +365,7 @@ class UploadController extends \app\controllers\Controller
             }
         } else {
             echo $result;
+            exit();
         }
     }
 
@@ -451,7 +452,9 @@ class UploadController extends \app\controllers\Controller
         }
         $file = md5($_FILES['file']['name']);
         // 上传文件的全名
-        $upload_file = \Yii::$app->basePath . '/web/upload/1/' . $file . '.png';
+        $explode = explode('.',$_FILES['file']['name']);
+        $ext = end($explode);
+        $upload_file = \Yii::$app->basePath . '/web/upload/1/' . $file . '.'.$ext;
         // 将上传的文件从临时目录移动到指定目录
         if (!move_uploaded_file($_FILES['file']['tmp_name'], $upload_file)) {
             $data = [
@@ -460,13 +463,13 @@ class UploadController extends \app\controllers\Controller
             ];
         } else {
             $oss = new Oss();
-            $file = '/web/upload/1/' . $file . '.png';
+            $file_name = '/web/upload/1/' . $file . '.'.$ext;
             //上传文件目录
-            $oss_data = $oss->upload($upload_file, $file);
+            $oss_data = $oss->upload($upload_file);
             if ($oss == false) {
                 $data = [
                     'code' => 1,
-                    'msg' => "文件上传失败"
+                    'msg' => "文件上传失败",
                 ];
             } else {
                 $data = [
@@ -688,7 +691,6 @@ class UploadController extends \app\controllers\Controller
         }
 
         /* 生成上传实例对象并完成上传 */
-        $up = new Uploader($fieldName, $config, $base64);
         /**
          * 得到上传文件所对应的各个参数,数组结构
          * array(
@@ -702,9 +704,23 @@ class UploadController extends \app\controllers\Controller
          */
 
         /* 返回数据 */
-        $fileInfo = $up->getFileInfo();
+        /*if($action != 'uploadimage'){
+            $up = new Uploader($fieldName, $config, $base64);
+            $fileInfo = $up->getFileInfo();
+        }else{
+
+        }*/
+        $fileInfo = [];
+        $re = $this->actionImage();
+        if(empty($re['code'])){
+            $fileInfo["url"] = $re['data']['url'];
+            $fileInfo["type"] = '.png';
+            $fileInfo["size"] = '0';
+            $fileInfo["state"] = 'SUCCESS';
+        }
+
         if ($fileInfo["state"] == "SUCCESS") {
-            $this->imageCompress($fileInfo);
+//            $this->imageCompress($fileInfo);
             $model = new UploadFile();
             $model->user_id = Model::getUserId();
             $model->file_url = $fileInfo["url"];