Merge branch 'feature/base-excel'

Author: vartruexuan

composer.json

@@ -1,6 +1,12 @@
 {
     "name": "businessg/hyperf-excel",
     "type": "library",
+    "repositories": [
+        {
+            "type": "path",
+            "url": "../base-excel"
+        }
+    ],
     "license": "MIT",
     "keywords": [
         "php",
@@ -27,7 +33,7 @@
         "php": ">=8.1",
         "ext-mbstring": "*",
         "ext-xlswriter": "*",
-        "businessg/base-excel": "~1.0.0",
+        "businessg/base-excel": "*",
         "hyperf/redis": "~3.1.0",
         "hyperf/async-queue": "~3.1.0",
         "hyperf/filesystem": "~3.1.0",

publish/excel.php

@@ -133,25 +133,35 @@
     |                   info 接口会自动拼接此域名返回完整 URL
     |                   如果 templateUrl 已是完整地址（http/https 开头），则不拼接
     |
-    | 响应格式:
+    | 响应格式（response 下）:
     |  - codeField:    响应 JSON 中状态码的字段名，默认 'code'
     |  - dataField:    响应 JSON 中数据的字段名，默认 'data'
     |  - messageField: 响应 JSON 中消息的字段名，默认 'message'
     |  - successCode:  成功时状态码的值，默认 0
     |
+    | 上传配置（upload 接口保存路径）:
+    |  - upload.disk: 文件系统磁盘名，对应 config/autoload/file.php 中 storage 的 key
+    |  - upload.dir:  相对路径，导入文件存放目录（相对于 disk 根路径）
+    |
     |  示例: 如果项目约定响应格式为 {"status": 200, "result": {...}, "msg": "ok"}
-    |        则配置 codeField => 'status', dataField => 'result',
-    |        messageField => 'msg', successCode => 200
+    |        则配置 response.codeField => 'status', response.dataField => 'result',
+    |        response.messageField => 'msg', response.successCode => 200
     |
     */
     'http' => [
         'enabled' => false,
         'prefix' => '',
         'middleware' => [],
         'domain' => \Hyperf\Support\env('APP_URL', 'http://localhost:9501'),
-        'codeField' => 'code',
-        'dataField' => 'data',
-        'messageField' => 'message',
-        'successCode' => 0,
+        'response' => [
+            'codeField' => 'code',
+            'dataField' => 'data',
+            'messageField' => 'message',
+            'successCode' => 0,
+        ],
+        'upload' => [
+            'disk' => 'local',
+            'dir' => 'excel-import',
+        ],
     ],
 ];

src/Http/Controller/ExcelController.php

@@ -4,7 +4,9 @@
 
 namespace BusinessG\HyperfExcel\Http\Controller;
 
+use BusinessG\BaseExcel\Contract\FilesystemResolverInterface;
 use BusinessG\BaseExcel\Service\ExcelBusinessService;
+use Hyperf\Contract\ConfigInterface;
 use Hyperf\HttpServer\Contract\RequestInterface;
 use Hyperf\HttpServer\Contract\ResponseInterface;
 use Psr\Container\ContainerInterface;
@@ -15,6 +17,7 @@ class ExcelController
     public function __construct(
         protected ContainerInterface $container,
         protected ExcelBusinessService $service,
+        protected FilesystemResolverInterface $filesystemResolver,
         protected RequestInterface $request,
         protected ResponseInterface $response
     ) {
@@ -89,14 +92,19 @@ public function upload(): PsrResponseInterface
             return $this->response->json($this->service->errorResponse(422, '仅支持 xlsx, xls 格式'));
         }
 
-        $dir = BASE_PATH . '/runtime/excel-import/' . date('Y/m/d');
-        if (!is_dir($dir)) {
-            mkdir($dir, 0777, true);
+        $config = $this->container->get(ConfigInterface::class);
+        $uploadDisk = $config->get('excel.http.upload.disk', 'local');
+        $uploadDir = $config->get('excel.http.upload.dir', 'excel-import');
+        $relativePath = $uploadDir . '/' . date('Y/m/d') . '/' . bin2hex(random_bytes(20)) . '.' . $extension;
+
+        $filesystem = $this->filesystemResolver->getFilesystem($uploadDisk);
+        $stream = fopen($file->getRealPath(), 'r');
+        $filesystem->writeStream($relativePath, $stream);
+        if (is_resource($stream)) {
+            fclose($stream);
         }
 
-        $fileName = bin2hex(random_bytes(20)) . '.' . $extension;
-        $fullPath = $dir . '/' . $fileName;
-        $file->moveTo($fullPath);
+        $fullPath = $this->getUploadFullPath($config, $uploadDisk, $relativePath);
 
         return $this->response->json(
             $this->service->successResponse([
@@ -105,4 +113,13 @@ public function upload(): PsrResponseInterface
             ])
         );
     }
+
+    protected function getUploadFullPath(ConfigInterface $config, string $disk, string $relativePath): string
+    {
+        $root = $config->get('file.storage.' . $disk . '.root');
+        if ($root !== null && $root !== '') {
+            return rtrim($root, '/\\') . DIRECTORY_SEPARATOR . str_replace('/', DIRECTORY_SEPARATOR, $relativePath);
+        }
+        return $relativePath;
+    }
 }