Jelajahi Sumber

refactor(core): 统一使用函数式响应方法

- 将所有控制器中的 Helper::success_response() 调用替换为 success_response() 函数
- 将所有控制器中的 Helper::error_response() 调用替换为 error_response() 函数
- 将所有控制器中的 Helper::page_response() 调用替换为 page_response() 函数
- 更新相关 use 语句以导入所需的响应函数
- 确保所有响应方法调用的一致性和简洁性
runphp 3 bulan lalu
induk
melakukan
5d3305b57f
2 mengubah file dengan 11 tambahan dan 10 penghapusan
  1. 5 5
      src/Controller/CategoryController.php
  2. 6 5
      src/Controller/FileController.php

+ 5 - 5
src/Controller/CategoryController.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 namespace SixShop\Filesystem\Controller;
 
 
-use SixShop\Core\Helper;
+use function SixShop\Core\success_response;
 use SixShop\Filesystem\Model\FilesystemCategoryModel;
 use SixShop\Filesystem\Model\FilesystemFileModel;
 use think\Request;
@@ -28,7 +28,7 @@ class CategoryController
             'sort' => 0,
             'file_count' => array_sum(array_column($list, 'file_count')),
         ];
-        return Helper::success_response($list);
+        return success_response($list);
     }
 
     public function save(Request $request): Json
@@ -39,7 +39,7 @@ class CategoryController
         ]);
         $result = FilesystemCategoryModel::create($data);
 
-        return Helper::success_response($result);
+        return success_response($result);
 
     }
 
@@ -51,13 +51,13 @@ class CategoryController
         ]);
         $result = FilesystemCategoryModel::findOrFail($id)->save($data);
 
-        return Helper::success_response($result);
+        return success_response($result);
     }
 
     public function delete(int $id): Json
     {
         $result = FilesystemCategoryModel::destroy($id);
 
-        return Helper::success_response($result);
+        return success_response($result);
     }
 }

+ 6 - 5
src/Controller/FileController.php

@@ -3,7 +3,8 @@ declare(strict_types=1);
 
 namespace SixShop\Filesystem\Controller;
 
-use SixShop\Core\Helper;
+use function SixShop\Core\success_response;
+use function SixShop\Core\page_response;
 use SixShop\Filesystem\Entity\FilesystemFileEntity;
 use SixShop\System\Middleware\MacroPageMiddleware;
 use think\facade\Event;
@@ -23,7 +24,7 @@ class FileController
             'keyword/s',
         ]);
 
-        return Helper::page_response($filesystemFileEntity->getPage($params, $request->pageAndLimit()));
+        return page_response($filesystemFileEntity->getPage($params, $request->pageAndLimit()));
     }
 
     public function save(Request $request, FilesystemFileEntity $filesystemFileEntity): Response
@@ -46,14 +47,14 @@ class FileController
 
         $result = $filesystemFileEntity->upload($categoryId, $file);
 
-        return Helper::success_response($result);
+        return success_response($result);
     }
 
     public function delete(int $id, FilesystemFileEntity $filesystemFileEntity): Response
     {
         $result = $filesystemFileEntity->destroy($id);
         Event::trigger('after_filesystem_delete', $id);
-        return Helper::success_response($result);
+        return success_response($result);
     }
 
     public function update(int $id, Request $request, FilesystemFileEntity $filesystemFileEntity): Response
@@ -62,6 +63,6 @@ class FileController
             'name/s' => '',
         ]);
         $result = $filesystemFileEntity->update($data, ['id' => $id]);
-        return Helper::success_response($result);
+        return success_response($result);
     }
 }