feat:后台应用增加公共函数 get_ba_client

Author: build-admin

app/admin/common.php

@@ -1,6 +1,7 @@
 <?php
 
 use ba\Filesystem;
+use GuzzleHttp\Client;
 
 if (!function_exists('get_controller_list')) {
     function get_controller_list($app = 'admin'): array
@@ -9,3 +10,25 @@ function get_controller_list($app = 'admin'): array
         return Filesystem::getDirFiles($controllerDir);
     }
 }
+
+if (!function_exists('get_ba_client')) {
+    /**
+     * 获取一个请求 BuildAdmin 开源社区的 Client
+     * @throws Throwable
+     */
+    function get_ba_client(): Client
+    {
+        return new Client([
+            'base_uri'        => config('buildadmin.api_url'),
+            'timeout'         => 30,
+            'connect_timeout' => 30,
+            'verify'          => false,
+            'http_errors'     => false,
+            'headers'         => [
+                'X-REQUESTED-WITH' => 'XMLHttpRequest',
+                'Referer'          => dirname(request()->root(true)),
+                'User-Agent'       => 'BuildAdminClient',
+            ]
+        ]);
+    }
+}

app/admin/library/module/Server.php

@@ -7,7 +7,6 @@
 use ba\Exception;
 use ba\Filesystem;
 use think\facade\Db;
-use GuzzleHttp\Client;
 use FilesystemIterator;
 use think\facade\Config;
 use RecursiveIteratorIterator;
@@ -21,8 +20,6 @@
  */
 class Server
 {
-    private static ?Client $client = null;
-
     private static string $apiBaseUrl = '/api/v6.store/';
 
     /**
@@ -33,7 +30,7 @@ public static function download(string $uid, string $dir, array $extend = []): s
     {
         $tmpFile = $dir . $uid . ".zip";
         try {
-            $client   = self::getClient();
+            $client   = get_ba_client();
             $response = $client->get(self::$apiBaseUrl . 'download', ['query' => array_merge(['uid' => $uid, 'server' => 1], $extend)]);
             $body     = $response->getBody();
             $content  = $body->getContents();
@@ -63,7 +60,7 @@ public static function download(string $uid, string $dir, array $extend = []): s
     public static function installPreCheck(array $query = []): bool
     {
         try {
-            $client     = self::getClient();
+            $client     = get_ba_client();
             $response   = $client->get(self::$apiBaseUrl . 'preCheck', ['query' => $query]);
             $body       = $response->getBody();
             $statusCode = $response->getStatusCode();
@@ -560,28 +557,4 @@ public static function getRuntime(string $dir, string $key = ''): mixed
             return $runtimeContentArr;
         }
     }
-
-    /**
-     * 获取请求对象
-     * @return Client
-     */
-    protected static function getClient(): Client
-    {
-        $options = [
-            'base_uri'        => Config::get('buildadmin.api_url'),
-            'timeout'         => 30,
-            'connect_timeout' => 30,
-            'verify'          => false,
-            'http_errors'     => false,
-            'headers'         => [
-                'X-REQUESTED-WITH' => 'XMLHttpRequest',
-                'Referer'          => dirname(request()->root(true)),
-                'User-Agent'       => 'BuildAdminClient',
-            ]
-        ];
-        if (is_null(self::$client)) {
-            self::$client = new Client($options);
-        }
-        return self::$client;
-    }
 }