上传图片、文件、视频等方法优化

app/admin/controller/CompanyCatProfit.php

@@ -192,6 +192,7 @@ class CompanyCatProfit extends Base
         $where = [
             ['a.companyNo', '=', $param['companyNo']],
             ['a.is_del', '=', 0],
+            ['b.level', '=', 3],
         ];
 
         if ($param['cat_name'] != '') $where[] = ['b.cat_name', 'like', '%' . $param['cat_name'] . '%'];

app/admin/controller/System.php

@@ -100,26 +100,22 @@ class System extends BaseController
      */
     public function upload()
     {
-        $post  =$this->request->post();
-        $token = isset($post['token']) ? trim($post['token']) : "";
-        if($token==""){
-            return error_show(101,'token不能为空');
-        }
-        $effetc = VerifyTokens($token);
-        if(!empty($effetc) && $effetc['code']!=0){
-            return error_show($effetc['code'],$effetc['message']);
-        }
+//        $post  =$this->request->post();
+//        $token = isset($post['token']) ? trim($post['token']) : "";
+//        if($token==""){
+//            return error_show(101,'token不能为空');
+//        }
+//        $effetc = VerifyTokens($token);
+//        if(!empty($effetc) && $effetc['code']!=0){
+//            return error_show($effetc['code'],$effetc['message']);
+//        }
         $files = $this->request->file('image');
-        $list="";
-        if($files!=""){
-            $list=UploadImg($files);
-        }
+        $list = "";
+        if ($files != "") $list = UploadImg($files);
+
+        if (is_array($list) && !empty($list)) return json_show(0, "上传成功！", $list);
+        else return json_show(1005, "上传失败！" . $list);
 
-        if(is_array($list)&&!empty($list)){
-            return app_show(0, "上传成功！",$list);
-        }else{
-            return error_show(1005, "上传失败！".$list);
-        }
     }
 
     /**

app/common.php

@@ -214,18 +214,23 @@ function UploadImg($files)
         validate(['imgFile' => ['fileSize' => 10240000, 'fileExt' => 'jpg,jpeg,png,bmp,gif', 'fileMime' => 'image/jpeg,image/png,image/gif']])->check(['imgFile' => $files]);
 
         foreach ($files as $file) {
-            $url = Filesystem::disk('public')->putFile('topic/' . date("Ymd"), $file, function () use ($file) {
-                return str_replace('.' . $file->getOriginalExtension(), '', $file->getOriginalName() . "_" . date('YmdHis'));
-            });
-            $name = str_replace('.' . $file->getOriginalExtension(), '', $file->getOriginalName());
-            $temp = ["url" => $url, "name" => $name];
+
+            //文件存放路径
+            $root = config('filesystem.disks.public.root') . DIRECTORY_SEPARATOR;
+            $url = 'topic' . DIRECTORY_SEPARATOR . date("Ymd");
+
+            //文件名
+            $file_name = str_replace('.' . $file->getOriginalExtension(), "_" . date('YmdHis') . '.' . $file->getOriginalExtension(), $file->getOriginalName());
+
+            $file->move($root . $url, $file_name);
+
+            $temp = ["url" => $url . DIRECTORY_SEPARATOR . $file_name, "name" => $file->getOriginalName()];
             $savename[] = $temp;
         }
 
         return $savename;
     } catch (\think\exception\ValidateException $e) {
-
-        return $e->getMessage();
+        return $e->getError();
     }
 }
 /**
@@ -238,22 +243,35 @@ function UploadFile($files)
     $files = !is_array($files) ? [$files] : $files;
     try {
         //验证
-        validate(['imgFile' => ['fileSize' => 10240000,'fileExt' => 'xlsx,xls,pdf,zip,rar,7z,doc,docx']])->check(['imgFile' =>
+        validate(['imgFile' => ['fileSize' => 10240000, 'fileExt' => 'xlsx,xls,pdf,zip,rar,7z,doc,docx']])->check(['imgFile' =>
             $files]);
 
         foreach ($files as $file) {
-            $url = Filesystem::disk('public')->putFile('files/' . date("Ymd"), $file, function () use ($file) {
-                return str_replace('.' . $file->getOriginalExtension(), '', $file->getOriginalName() . "_" . date('YmdHis'));
-            });
-            $name = str_replace('.' . $file->getOriginalExtension(), '', $file->getOriginalName());
-            $temp = ["url" => $url, "name" => $name];
+//            $url = Filesystem::disk('public')->putFile('files/' . date("Ymd"), $file, function () use ($file) {
+//                return str_replace('.' . $file->getOriginalExtension(), '', $file->getOriginalName() . "_" . date('YmdHis'));
+//            });
+//            $name = str_replace('.' . $file->getOriginalExtension(), '', $file->getOriginalName());
+//            $temp = ["url" => $url, "name" => $name];
+
+
+            //文件存放路径
+            $root = config('filesystem.disks.public.root') . DIRECTORY_SEPARATOR;
+            $url = 'files' . DIRECTORY_SEPARATOR . date("Ymd");
+
+            //文件名
+            $file_name = str_replace('.' . $file->getOriginalExtension(), "_" . date('YmdHis') . '.' . $file->getOriginalExtension(), $file->getOriginalName());
+
+            $file->move($root . $url, $file_name);
+
+            $temp = ["url" => $url . DIRECTORY_SEPARATOR . $file_name, "name" => $file->getOriginalName()];
+
             $savename[] = $temp;
         }
 
         return $savename;
     } catch (\think\exception\ValidateException $e) {
 
-        return $e->getMessage();
+        return $e->getError();
     }
 }
 
@@ -267,21 +285,33 @@ function UploadVideo($files)
     $files = !is_array($files) ? [$files] : $files;
     try {
         //验证
-        validate(['videoFile' => ['fileSize' => 10240000,'fileExt' => 'mp4,mp3,avi']])->check(['videoFile' => $files]);
+        validate(['videoFile' => ['fileSize' => 10240000, 'fileExt' => 'mp4,mp3,avi']])->check(['videoFile' => $files]);
 
         foreach ($files as $file) {
-            $url = Filesystem::disk('public')->putFile('video/' . date("Ymd"), $file, function () use ($file) {
-                return str_replace('.' . $file->getOriginalExtension(), '', $file->getOriginalName() . "_" . date('YmdHis'));
-            });
-            $name = str_replace('.' . $file->getOriginalExtension(), '', $file->getOriginalName());
-            $temp = ["url" => $url, "name" => $name];
+//            $url = Filesystem::disk('public')->putFile('video/' . date("Ymd"), $file, function () use ($file) {
+//                return str_replace('.' . $file->getOriginalExtension(), '', $file->getOriginalName() . "_" . date('YmdHis'));
+//            });
+//            $name = str_replace('.' . $file->getOriginalExtension(), '', $file->getOriginalName());
+//            $temp = ["url" => $url, "name" => $name];
+
+            //文件存放路径
+            $root = config('filesystem.disks.public.root') . DIRECTORY_SEPARATOR;
+            $url = 'video' . DIRECTORY_SEPARATOR . date("Ymd");
+
+            //文件名
+            $file_name = str_replace('.' . $file->getOriginalExtension(), "_" . date('YmdHis') . '.' . $file->getOriginalExtension(), $file->getOriginalName());
+
+            $file->move($root . $url, $file_name);
+
+            $temp = ["url" => $url . DIRECTORY_SEPARATOR . $file_name, "name" => $file->getOriginalName()];
+
             $savename[] = $temp;
         }
 
         return $savename;
     } catch (\think\exception\ValidateException $e) {
 
-        return $e->getMessage();
+        return $e->getError();
     }
 }
 /**