Update WebmanResponseTrait.php

Author: mouyong

src/Traits/WebmanResponseTrait.php

@@ -26,6 +26,22 @@ public static function string2utf8($string = '')
         return $string;
     }
 
+    public function customPaginate($items, $total, $pageSize = 15)
+    {
+        $paginate = new \Illuminate\Pagination\LengthAwarePaginator(
+            items: $items,
+            total: $total,
+            perPage: $pageSize,
+            currentPage: \request('page'),
+        );
+
+        $paginate
+            ->withPath('/'.\request()->path())
+            ->withQueryString();
+
+        return $this->paginate($paginate);
+    }
+
     public function paginate(\Illuminate\Pagination\LengthAwarePaginator $paginate, ?callable $callable = null)
     {
         return $this->success([
@@ -45,22 +61,6 @@ public function paginate(\Illuminate\Pagination\LengthAwarePaginator $paginate,
         ]);
     }
 
-    public function customPaginate($items, $total, $pageSize = 15)
-    {
-        $paginate = new \Illuminate\Pagination\LengthAwarePaginator(
-            items: $items,
-            total: $total,
-            perPage: $pageSize,
-            currentPage: \request('page'),
-        );
-
-        $paginate
-            ->withPath('/'.\request()->path())
-            ->withQueryString();
-
-        return $this->paginate($paginate);
-    }
-
     public function success($data = [], $err_msg = 'success', $err_code = 200, $headers = [])
     {
         if (is_string($data)) {
@@ -81,6 +81,7 @@ public function success($data = [], $err_msg = 'success', $err_code = 200, $head
             $err_code = $config_err_code;
         }
 
+        $data = $data ?: null;
         $res = compact('err_code', 'err_msg', 'data') + array_filter(compact('meta'));
 
         return \response(