Quellcode durchsuchen

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

- 将所有控制器中的 Helper::success_response() 调用替换为 success_response() 函数
- 将所有控制器中的 Helper::error_response() 调用替换为 error_response() 函数
- 将所有控制器中的 Helper::page_response() 调用替换为 page_response() 函数
- 更新相关 use 语句以导入所需的响应函数
- 确保所有响应方法调用的一致性和简洁性
runphp vor 3 Monaten
Ursprung
Commit
3bcce7bdb8

+ 4 - 4
src/Controller/ExtensionConfigController.php

@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 namespace SixShop\System\Controller;
 
-use SixShop\Core\Helper;
+use function SixShop\Core\success_response;
 use SixShop\System\ExtensionManager;
 use think\Request;
 use think\Response;
@@ -12,16 +12,16 @@ class ExtensionConfigController
 {
     public function read(string $id, ExtensionManager $extensionManager): Response
     {
-        return Helper::success_response($extensionManager->getExtensionConfig($id));
+        return success_response($extensionManager->getExtensionConfig($id));
     }
 
     public function edit(string $id, ExtensionManager $extensionManager): Response
     {
-        return Helper::success_response($extensionManager->getExtensionConfigForm($id));
+        return success_response($extensionManager->getExtensionConfigForm($id));
     }
 
     public function update(string $id, ExtensionManager $extensionManager, Request $request): Response
     {
-        return Helper::success_response($extensionManager->saveConfig($id, $request->post()));
+        return success_response($extensionManager->saveConfig($id, $request->post()));
     }
 }

+ 11 - 9
src/Controller/ExtensionController.php

@@ -3,7 +3,9 @@ declare(strict_types=1);
 
 namespace SixShop\System\Controller;
 
-use SixShop\Core\Helper;
+use function SixShop\Core\success_response;
+use function SixShop\Core\page_response;
+use function SixShop\Core\extension_path;
 use SixShop\System\Enum\ExtensionStatusEnum;
 use SixShop\System\ExtensionManager;
 use think\App;
@@ -46,13 +48,13 @@ class ExtensionController
             };
         }
         $data['installed'] = $data['total'] - $data['uninstalled'];
-        return Helper::page_response(new Bootstrap(array_values($extensionList), $data['total'], 1, $data['total']), $data);
+        return page_response(new Bootstrap(array_values($extensionList), $data['total'], 1, $data['total']), $data);
     }
 
     public function read(string $id, ExtensionManager $extensionManager): Response
     {
         $data = $extensionManager->getInfo($id);
-        $filePath = Helper::extension_path($id) . '/README.md';
+        $filePath = extension_path($id) . '/README.md';
         if (file_exists($filePath)) {
             $data['markdown'] = file_get_contents($filePath);
         } else {
@@ -61,7 +63,7 @@ class ExtensionController
         }
         $data['migrations'] = $extensionManager->migrations($id);
         $extensionManager->refresh($id);
-        return Helper::success_response($data);
+        return success_response($data);
     }
 
     public function install(string $id, ExtensionManager $extensionManager): Response
@@ -69,7 +71,7 @@ class ExtensionController
         Event::trigger('before_install_extension', $id);
         $extensionManager->install($id);
         Event::trigger('after_install_extension', $id);
-        return Helper::success_response();
+        return success_response();
     }
 
     public function uninstall(string $id, ExtensionManager $extensionManager): Response
@@ -79,26 +81,26 @@ class ExtensionController
         $extensionManager->uninstall($id);
         Event::trigger('after_uninstall_extension', $id);
         Event::trigger('after_uninstall_' . $id . '_extension');
-        return Helper::success_response();
+        return success_response();
     }
 
     public function enable(string $id, ExtensionManager $extensionManager): Response
     {
         $extensionManager->enable($id);
         Event::trigger('after_enable_extension', $id);
-        return Helper::success_response();
+        return success_response();
     }
 
     public function disable(string $id, ExtensionManager $extensionManager): Response
     {
         $extensionManager->disable($id);
         Event::trigger('after_disable_extension', $id);
-        return Helper::success_response();
+        return success_response();
     }
 
     public function normal(App $app): Response
     {
-        $extensionPath = Helper::extension_path();
+        $extensionPath = extension_path();
         $extensionDirs = array_diff(scandir($extensionPath), ['.', '..']);
         $options = [];
         foreach ($extensionDirs as $item) {