refactor: http client

Author: jevantang

app/Auth/AccountGuard.php

@@ -10,8 +10,8 @@
 
 use App\Helpers\CacheHelper;
 use App\Models\File;
-use Fresns\WebsiteEngine\Helpers\ApiHelper;
 use Fresns\WebsiteEngine\Helpers\DataHelper;
+use Fresns\WebsiteEngine\Helpers\HttpHelper;
 use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Contracts\Foundation\Application;
@@ -136,7 +136,7 @@ public function get(?string $key = null): mixed
                 $result = CacheHelper::get($cacheKey, $cacheTag);
 
                 if (empty($result)) {
-                    $result = ApiHelper::make()->get('/api/fresns/v1/account/detail');
+                    $result = HttpHelper::get('/api/fresns/v1/account/detail');
 
                     $cacheTime = CacheHelper::fresnsCacheTimeByFileType(File::TYPE_ALL);
                     CacheHelper::put($result, $cacheKey, $cacheTag, $cacheTime);

app/Auth/UserGuard.php

@@ -10,8 +10,8 @@
 
 use App\Helpers\CacheHelper;
 use App\Models\File;
-use Fresns\WebsiteEngine\Helpers\ApiHelper;
 use Fresns\WebsiteEngine\Helpers\DataHelper;
+use Fresns\WebsiteEngine\Helpers\HttpHelper;
 use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Contracts\Foundation\Application;
@@ -135,7 +135,7 @@ public function get(?string $key = null): mixed
                 $result = CacheHelper::get($cacheKey, $cacheTag);
 
                 if (empty($result)) {
-                    $result = ApiHelper::make()->get("/api/fresns/v1/user/{$uid}/detail");
+                    $result = HttpHelper::get("/api/fresns/v1/user/{$uid}/detail");
 
                     $cacheTime = CacheHelper::fresnsCacheTimeByFileType(File::TYPE_ALL);
                     CacheHelper::put($result, $cacheKey, $cacheTag, $cacheTime);

app/Client/Clientable.php

@@ -15,7 +15,12 @@ class ErrorException extends \Exception
 {
     public function render()
     {
-        // dd($this->getCode(), $this->getMessage());
+        if (request()->wantsJson()) {
+            return \response()->json([
+                'code' => $this->getCode(),
+                'message' => $this->getMessage(),
+            ]);
+        }
 
         // set view
         $themeFskey = fs_theme('fskey');
@@ -31,13 +36,6 @@ public function render()
             View::getFinder()->setPaths($currentPaths);
         }
 
-        if (\request()->wantsJson()) {
-            return \response()->json([
-                'code' => $this->getCode(),
-                'message' => $this->getMessage(),
-            ]);
-        }
-
         // 403 Forbidden
         if (in_array($this->getCode(), [
             36201, 37101, 37201, 37301, 37401, 37501,