bolechen · October 12, 2020 10:58 · Aug 4, 2019 · Jul 19, 2019 · Jul 17, 2019 · Jul 17, 2019
diff --git a/HasUuid.php b/HasUuid.php
@@ -16,10 +16,44 @@ public function getRouteKeyName()
         return 'uuid';
     }
 
+    public static function findByUuidOrFail($uuid)
+    {
+        return self::whereUuid($uuid)->firstOrFail();
+    }
+
+    /**
+     * Eloquent scope to look for a given UUID.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param string                                $uuid  The UUID to search for
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeWithUuid($query, $uuid)
+    {
+        return $query->where('uuid', $uuid);
+    }
+
+    /**
+     * Eloquent scope to look for multiple given UUIDs.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param array                                 $uuids The UUIDs to search for
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeWithUuids($query, array $uuids)
+    {
+        return $query->whereIn('uuid', $uuids);
+    }
+
     protected static function bootHasUuid()
     {
         static::creating(function ($model) {
-            $model->uuid = Str::orderedUuid();
+            if (!$model->uuid) {
+                // 这里使用了 orderedUuid 方便后期分表
+                $model->uuid = (string) Str::orderedUuid();
+            }
         });
     }
 }
diff --git a/laravel_uuid_trait.php → HasUuid.php b/laravel_uuid_trait.php → HasUuid.php
diff --git a/laravel_uuid_trait.php b/laravel_uuid_trait.php
@@ -16,7 +16,7 @@ public function getRouteKeyName()
         return 'uuid';
     }
 
-    protected static function bootUsesUuid()
+    protected static function bootHasUuid()
     {
         static::creating(function ($model) {
             $model->uuid = Str::orderedUuid();

diff --git a/laravel_uuid_trait.php b/laravel_uuid_trait.php
@@ -4,7 +4,7 @@
 
 use Illuminate\Support\Str;
 
-trait UsesUuid
+trait HasUuid
 {
     /**
      * Get the route key for the model.

diff --git a/laravel_uuid_trait.php b/laravel_uuid_trait.php
@@ -1,4 +1,3 @@
-```php
 <?php
 
 namespace App\Traits;
@@ -24,4 +23,3 @@ protected static function bootUsesUuid()
         });
     }
 }
-```
diff --git a/laravel_uuid_trait → laravel_uuid_trait.php b/laravel_uuid_trait → laravel_uuid_trait.php
diff --git a/laravel_uuid_trait b/laravel_uuid_trait
@@ -0,0 +1,27 @@
+```php
+<?php
+
+namespace App\Traits;
+
+use Illuminate\Support\Str;
+
+trait UsesUuid
+{
+    /**
+     * Get the route key for the model.
+     *
+     * @return string
+     */
+    public function getRouteKeyName()
+    {
+        return 'uuid';
+    }
+
+    protected static function bootUsesUuid()
+    {
+        static::creating(function ($model) {
+            $model->uuid = Str::orderedUuid();
+        });
+    }
+}
+```