refactor(sixshop-core):重构助手方法为函数版本

- 将 Helper 类中的静态方法重构为函数版本，位于新创建的 functions.php 文件中
- 更新 AutoloadService、CoreService 和 RegisterRouteService 中的调用，使用新的函数版本
- 删除 Helper 类中已重构的静态方法

src/Helper.php

@@ -10,107 +10,6 @@ use think\Container;
 use think\Paginator;
 use think\Response;
 
-// 函数版本的Helper方法
-
-
-/**
- * 返回成功数据
- */
-function success_response(mixed $data = [], string $status = 'ok', int $code = 200, string $msg = 'success', string $type = 'json', string $xslt = ''): Response
-{
-    return Helper::success_response($data, $status, $code, $msg, $type, $xslt);
-}
-
-
-/**
- * 返回分页数据
- */
-function page_response(Paginator $page, mixed $data = [], string $status = 'ok', int $code = 200, string $msg = 'success'): Response
-{
-    return Helper::page_response($page, $data, $status, $code, $msg);
-}
-
-
-/**
- * 返回失败数据
- */
-function error_response(string $msg = 'error', string $status = 'error', int $code = 1, mixed $data = [], int $httpCode = 400, $header = [], $options = []): Response
-{
-    return Helper::error_response($msg, $status, $code, $data, $httpCode, $header, $options);
-}
-
-
-/**
- * 抛出逻辑异常
- * @throws LogicException
- */
-function throw_logic_exception(string $msg = 'error', int $code = 1, string $status = 'error', mixed $data = [], int $httpCode = 200, $header = [], $options = []): void
-{
-    Helper::throw_logic_exception($msg, $code, $status, $data, $httpCode, $header, $options);
-}
-
-
-/**
- * 构建树形结构选项
- * @param array $data 数据源
- * @param string $valueField 值字段
- * @param string $labelField 标签字段
- * @param string $parentField 父字段
- * @param int $parentId 父ID
- * @param string $childrenKey 子节点键
- * @param bool $preserveOriginal 是否保留原始数据
- */
-function build_tree_options(
-    array  $data,
-    string $valueField = 'id',
-    string $labelField = 'name',
-    string $parentField = 'parent_id',
-    int    $parentId = 0,
-    string $childrenKey = 'children',
-    bool   $preserveOriginal = true
-): array
-{
-    return Helper::build_tree_options($data, $valueField, $labelField, $parentField, $parentId, $childrenKey, $preserveOriginal);
-}
-
-
-/**
- * 生成随机密码
- * @param int $length 密码长度
- * @return string 生成的密码
- */
-function secret_password(int $length = 16): string
-{
-    return Helper::secret_password($length);
-}
-
-
-/**
- * 获取扩展路径
- */
-function extension_path(string $extensionID = ''): string
-{
-    return Helper::extension_path($extensionID);
-}
-
-
-/**
- * 获取扩展名称列表
- */
-function extension_name_list(): array
-{
-    return CoreService::$extensionNameList;
-}
-
-
-/**
- * 获取扩展Composer信息
- */
-function extension_composer_info(string $extensionID): array
-{
-    return CoreService::$extensionComposerMap[$extensionID];
-}
-
 /**
  * 助手类
  * @deprecated 类已弃用, 请使用函数版本的助手方法

src/Service/AutoloadService.php

@@ -4,8 +4,8 @@ declare(strict_types=1);
 namespace SixShop\Core\Service;
 
 use SixShop\Core\Contracts\ExtensionInterface;
-use SixShop\Core\Helper;
 use think\App;
+use function SixShop\Core\extension_path;
 
 
 class AutoloadService
@@ -19,7 +19,7 @@ class AutoloadService
         foreach ($extensionComposerMap as $extensionID => $composerFile) {
             $this->app->bind('extension.' . $extensionID, $composerFile['extra']['sixshop']['class']);
         }
-        $extensionPath = Helper::extension_path();
+        $extensionPath = extension_path();
         $classLoader = $this->app->classLoader;
         foreach ($extensionNameList as $moduleName) {
             $dir = $extensionPath . $moduleName;

src/Service/CoreService.php

@@ -6,12 +6,12 @@ namespace SixShop\Core\Service;
 use Composer\InstalledVersions;
 use Composer\Json\JsonFile;
 use SixShop\Core\Exception\ExceptionHandle;
-use SixShop\Core\Helper;
 use SixShop\Core\Plugin;
 use SixShop\Core\Request;
 use think\event\HttpRun;
 use think\exception\Handle;
 use think\Service;
+use function SixShop\Core\extension_path;
 
 class CoreService extends Service
 {
@@ -85,7 +85,7 @@ class CoreService extends Service
                     if (array_key_exists($item, self::$extensionComposerMap)) {
                         continue;
                     }
-                    if (is_dir(Helper::extension_path($item) . 'src')) {
+                    if (is_dir(extension_path($item) . 'src')) {
                         self::$extensionNameList[] = $item;
                         self::$normalExtensionNameList[] = $item;
                     }

src/Service/RegisterRouteService.php

@@ -4,10 +4,10 @@ declare(strict_types=1);
 namespace SixShop\Core\Service;
 
 use SixShop\Core\Event\BeforeRegisterRouteEvent;
-use SixShop\Core\Helper;
 use think\facade\Event;
 use think\facade\Route;
 use think\Http;
+use function SixShop\Core\extension_name_list;
 
 class RegisterRouteService
 {
@@ -19,7 +19,7 @@ class RegisterRouteService
     {
         return function () {
             $appName = $this->http->getName();
-            foreach (Helper::extension_name_list() as $extensionName) {
+            foreach (extension_name_list() as $extensionName) {
                 $extension = $this->autoloadService->getExtension($extensionName);
                 if (!$extension->available()) {
                     continue;

src/functions.php

@@ -0,0 +1,194 @@
+<?php
+declare(strict_types=1);
+
+namespace SixShop\Core;
+
+use SixShop\Core\Exception\LogicException;
+use SixShop\Core\Response\Xml;
+use SixShop\Core\Service\CoreService;
+use think\Container;
+use think\Paginator;
+use think\Response;
+
+/**
+ * 返回成功数据
+ */
+function success_response(mixed $data = [], string $status = 'ok', int $code = 200, string $msg = 'success', string $type = 'json', string $xslt = ''): Response
+{
+    if ($xslt) {
+        $type = 'xml';
+    }
+    $responseData = [
+        'code' => $code,
+        'status' => $status,
+        'msg' => $msg,
+        'data' => $data
+    ];
+    if ($type == 'xml') {
+        /* @var Xml $response */
+        $response = Container::getInstance()->invokeClass(Xml::class, [$responseData, 200]);
+        $response = $response->options(['root_node' => 'root', 'xslt' => $xslt]);
+    } else {
+        $response = Response::create($responseData, $type);
+    }
+    return $response;
+}
+
+
+/**
+ * 返回分页数据
+ */
+function page_response(Paginator $page, mixed $data = [], string $status = 'ok', int $code = 200, string $msg = 'success'): Response
+{
+    return json([
+        'code' => $code,
+        'status' => $status,
+        'msg' => $msg,
+        'page' => $page,
+        'data' => $data
+    ]);
+}
+
+
+/**
+ * 返回失败数据
+ */
+function error_response(string $msg = 'error', string $status = 'error', int $code = 1, mixed $data = [], int $httpCode = 400, $header = [], $options = []): Response
+{
+    return json([
+        'code' => $code,
+        'status' => $status,
+        'msg' => $msg,
+        'data' => $data
+    ], $httpCode, $header, $options);
+}
+
+
+/**
+ * 抛出逻辑异常
+ * @throws LogicException
+ */
+function throw_logic_exception(string $msg = 'error', int $code = 1, string $status = 'error', mixed $data = [], int $httpCode = 200, $header = [], $options = []): void
+{
+    throw new LogicException(error_response($msg, $status, $code, $data, $httpCode, $header, $options));
+}
+
+
+/**
+ * 构建树形结构选项
+ * @param array $data 数据源
+ * @param string $valueField 值字段
+ * @param string $labelField 标签字段
+ * @param string $parentField 父字段
+ * @param int $parentId 父ID
+ * @param string $childrenKey 子节点键
+ * @param bool $preserveOriginal 是否保留原始数据
+ */
+function build_tree_options(
+    array  $data,
+    string $valueField = 'id',
+    string $labelField = 'name',
+    string $parentField = 'parent_id',
+    int    $parentId = 0,
+    string $childrenKey = 'children',
+    bool   $preserveOriginal = true
+): array
+{
+    $tree = [];
+    foreach ($data as $item) {
+        if ($item[$parentField] == $parentId) {
+            $node = [
+                'value' => $item[$valueField],
+                'label' => $item[$labelField]
+            ];
+
+            // 根据参数决定是否保留原始数据
+            if ($preserveOriginal) {
+                $node = array_merge($item, $node);
+            }
+
+            $children = self::build_tree_options(
+                $data,
+                $valueField,
+                $labelField,
+                $parentField,
+                $item[$valueField],
+                $childrenKey,
+                $preserveOriginal // 传递参数到递归调用
+            );
+
+            if ($children) {
+                $node[$childrenKey] = $children;
+            }
+            $tree[] = $node;
+        }
+    }
+    return $tree;
+}
+
+
+/**
+ * 生成随机密码
+ * @param int $length 密码长度
+ * @return string 生成的密码
+ */
+function secret_password(int $length = 16): string
+{
+    // 确保密码包含各种字符类型
+    $lowercase = 'abcdefghijklmnopqrstuvwxyz';
+    $uppercase = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+    $numbers = '0123456789';
+    $specialChars = '!@#$%^&*()_+-=[]{}|;:,.<>?';
+
+    // 至少包含每种类型的一个字符
+    $password = $lowercase[random_int(0, strlen($lowercase) - 1)];
+    $password .= $uppercase[random_int(0, strlen($uppercase) - 1)];
+    $password .= $numbers[random_int(0, strlen($numbers) - 1)];
+    $password .= $specialChars[random_int(0, strlen($specialChars) - 1)];
+
+    // 剩余字符随机生成
+    $allChars = $lowercase . $uppercase . $numbers . $specialChars;
+    for ($i = 4; $i < $length; $i++) {
+        $password .= $allChars[random_int(0, strlen($allChars) - 1)];
+    }
+
+    // 打乱字符顺序
+    return str_shuffle($password);
+}
+
+
+/**
+ * 获取扩展路径
+ */
+function extension_path(string $extensionID = ''): string
+{
+    if (!$extensionID) {
+        return CoreService::$extensionPath;
+    }
+    if (isset(CoreService::$extensionComposerMap[$extensionID]['name'])) {
+        $extensionName = CoreService::$extensionComposerMap[$extensionID]['name'];
+        $versions = Plugin::getInstalledSixShopExtensions()['versions'];
+        if (isset($versions[$extensionName]['install_path'])) {
+            return realpath($versions[$extensionName]['install_path']) . DIRECTORY_SEPARATOR;
+        }
+    }
+    return CoreService::$extensionPath . $extensionID . DIRECTORY_SEPARATOR;
+}
+
+
+/**
+ * 获取扩展名称列表
+ */
+function extension_name_list(): array
+{
+    return CoreService::$extensionNameList;
+}
+
+
+/**
+ * 获取扩展Composer信息
+ */
+function extension_composer_info(string $extensionID): array
+{
+    return CoreService::$extensionComposerMap[$extensionID];
+}