yingzi 2 years ago
parent
commit
f2f925879d
2 changed files with 15 additions and 3 deletions
  1. 5 1
      app/api/controller/User.php
  2. 10 2
      app/system/controller/Upload.php

+ 5 - 1
app/api/controller/User.php

@@ -695,6 +695,10 @@ class User extends BaseController
         if(empty($file)) {
             return app('json')->fail("未上传文件");
         }
+        $size = $file->getSize();
+        
+        
+        
         if(!in_array($code, $uploadConfig['image']['path'])){
             return app('json')->fail("上传路径错误");
         }
@@ -708,7 +712,7 @@ class User extends BaseController
         }
         $savePath = $sysData['system_url'].'/resource/' . $upPath;
         $imgUrl = str_replace("\\", "/", $savePath);
-        return app('json')->success(['img'=>$imgUrl]);
+        return app('json')->success(['img'=>$imgUrl,'size'=>$size]);
     }
     
     /**

+ 10 - 2
app/system/controller/Upload.php

@@ -21,17 +21,18 @@ class Upload extends AuthController{
 
 
     public function index(Request $request){
+        $uploadConfig = config('upload');
         $sysData = (new SysModel())->where("id",1)->find();
         $file = $request->file('file');
         $code = $request->post("code","image");
         if(empty($file)) {
             return app('json')->fail("未上传文件");
         }
-        if(!in_array($code, ["image","advert","goods","activity","avatar"])){
+        if(!in_array($code, $uploadConfig['image']['path'])){
             return app('json')->fail("上传路径错误");
         }
         $ext = $file->extension();
-        if(!in_array($ext, array("png","jpeg","gif","jpg"))){
+        if(!in_array($ext, $uploadConfig['image']['ext'])){
             return app('json')->fail("图片类型错误");
         }
         $upPath = \think\facade\Filesystem::disk('resource')->putFile( $code, $file);
@@ -42,6 +43,13 @@ class Upload extends AuthController{
         $imgUrl = str_replace("\\", "/", $savePath);
         return app('json')->success(['img'=>$imgUrl]);
     }
+    
+    
+    
+    
+    
+    
+    
     /**
      * 上传文件
      * @param Request $request