Merge branch '2.0' into 2.1

slimkit · Oct 31, 2018 · 5ba5e49 · 5ba5e49
2 parents a327e0b + 0009250
commit 5ba5e49
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/app/FileStorage/Filesystems/AliyunOss/FileMeta.php b/app/FileStorage/Filesystems/AliyunOss/FileMeta.php
@@ -39,6 +39,7 @@ class FileMeta extends FileMetaAbstract
     protected $resource;
     protected $bucket;
     protected $dimension;
+    protected $cachedMeta;
 
     /**
      * Create a file meta.
@@ -51,6 +52,7 @@ public function __construct(OssClient $oss, ResourceInterface $resource, string
         $this->oss = $oss;
         $this->resource = $resource;
         $this->bucket = $bucket;
+        $this->getSize();
     }
 
     /**
@@ -94,9 +96,11 @@ public function getImageDimension(): ImageDimensionInterface
      */
     public function getSize(): int
     {
-        $meta = $this->oss->getObjectMeta($this->bucket, $this->resource->getPath());
+        if (! $this->cachedMeta) {
+            $this->cachedMeta = $this->oss->getObjectMeta($this->bucket, $this->resource->getPath());
+        }
 
-        return (int) $meta['content-length'];
+        return (int) $this->cachedMeta['content-length'];
     }
 
     /**

diff --git a/app/FileStorage/Filesystems/Local/FileMeta.php b/app/FileStorage/Filesystems/Local/FileMeta.php
@@ -62,6 +62,7 @@ public function __construct(FilesystemContract $filesystem, ResourceInterface $r
     {
         $this->filesystem = $filesystem;
         $this->resource = $resource;
+        $this->hasImage();
     }
 
     /**
@@ -75,7 +76,6 @@ protected function useCustomTypes(): ?Closure
                 'image/jpeg',
                 'image/png',
                 'image/gif',
-                // 'image/bmp',
                 'image/webp',
             ];
         };

diff --git a/app/FileStorage/Traits/EloquentAttributeTrait.php b/app/FileStorage/Traits/EloquentAttributeTrait.php
@@ -43,15 +43,10 @@ protected function getFileStorageInstance(): StorageInterface
      */
     protected function getFileStorageResourceMeta(string $resource): ?FileMetaInterface
     {
-        // Is local mode, throw exceptions.
-        if (app()->isLocal()) {
-            return $this->getFileStorageInstance()->meta(new Resource($resource));
-        }
-
         try {
             return $this->getFileStorageInstance()->meta(new Resource($resource));
         } catch (Exception $e) {
-            return $resource;
+            return null;
         }
 
         return $resource;

diff --git a/packages/slimkit-plus-news/src/API2/Controllers/ContributeController.php b/packages/slimkit-plus-news/src/API2/Controllers/ContributeController.php
@@ -416,10 +416,13 @@ public function newStore(
             });
         }
 
-        $map = $request->only(['title', 'content', 'subject']);
+        $map = $request->only(['title', 'subject']);
         $map['from'] = $request->input('from') ?: '原创';
         $map['author'] = $request->input('author') ?: $user->name;
         $map['storage'] = $request->input('image');
+        $map['content'] = $this->app->make(Markdown::class)->safetyMarkdown(
+            $request->input('content', '')
+        );
 
         $images = $this->findMarkdownImageNotWithModels($map['content'] ?: '');
         // 提取内容中的图片，用于列表种的多种UI展示