gx

@@ -76,14 +76,22 @@ class ImageController
             $content = file_get_contents($path);
             $content = file_get_contents($path);
             $header['Content-Length'] = $info['size'];
             $header['Content-Length'] = $info['size'];
         }
         }
-        return response($content, 200, $header);
+        $img_type = $info['type'];
+        $content = base64_encode($content);
+        $img_base64 = 'data:image/' . $img_type . ';base64,' . $content;
+        return response($img_base64, 200, $header);
     }
     }
     /**
     /**
      * 图片上传
      * 图片上传
      */
      */
     public function upload() {
     public function upload() {
-        var_dump(1111);
-        die();
+        $this->request->validate([
+            'image'=>['required'],
+            'type'=>['required'],
+        ],[
+            'image.required'=>'图片必须填写',
+            'type.required'=>'类型必须填写',
+        ]);
         $files = $this->request->file('image');
         $files = $this->request->file('image');
         if (empty($files)) {
         if (empty($files)) {
             $this->response('没有上传的文件!', 400);
             $this->response('没有上传的文件!', 400);
@@ -105,27 +113,21 @@ class ImageController
         if (is_array($files)) {
         if (is_array($files)) {
             $file = current($files);
             $file = current($files);
         }
         }
-        $image = $this->request->file('image');
-        if(empty($image)){
-            return $this->fail('没有上传图片',Code::USER_ERROR);
-        }
         $url = './../uploads/images/';
         $url = './../uploads/images/';
         $filename = date('ymdHis').rand(10000,99999);
         $filename = date('ymdHis').rand(10000,99999);
-        $res = $this->request->file('image')->move($url,$filename);
+        $res = $files->move($url,$filename);
         if ($res === false) {
         if ($res === false) {
-            return $this->fail($image->getError(), 400);
+            return $this->fail($files->getError(), 400);
         }
         }
-        var_dump($res);
-        die();
         $data = [
         $data = [
             'path' => $url.$filename,
             'path' => $url.$filename,
             'created_at' => date('Y-m-d H:i:s',time()),
             'created_at' => date('Y-m-d H:i:s',time()),
             'size' => $res->getSize(),
             'size' => $res->getSize(),
-            'hash' => $res->getHash(),
+            'hash' => sha1($url.$filename.date('Y-m-d H:i:s',time())),
         ];
         ];
         $imageModel = new ImageModel();
         $imageModel = new ImageModel();
         $imageModel->add($data);
         $imageModel->add($data);
-        return $data;
+        return 'image/'.$data['hash'];
     }
     }
     /**
     /**
      * 生成缩略图缓存
      * 生成缩略图缓存

@@ -4,7 +4,7 @@ namespace App\Models;
 
 
 class Image extends Base
 class Image extends Base
 {
 {
-    protected $table = 'gl_group';
+    protected $table = 'gl_image';
 
 
     public $timestamps = true;
     public $timestamps = true;
 }
 }