Эх сурвалжийг харах

refactor(system): 移除模块配置和日志类

- 删除 ExtensionConfig 类及其基础配置定义
- 移除 ExtensionManager 中对 ExtensionConfig 的依赖
- 简化 getLocalConfig 方法逻辑,去除默认配置合并
- 删除自定义 Log 类及相关扩展调试功能
- 清理相关命名空间引用和事件监听逻辑
runphp 3 сар өмнө
parent
commit
abaab6df0f

+ 0 - 39
src/Config/ExtensionConfig.php

@@ -1,39 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace SixShop\System\Config;
-
-/**
- * 模块配置
- */
-class ExtensionConfig
-{
-    /**
-     * 模块共用的配置
-     * @var array
-     */
-    const array BASE = [
-        [
-            'type' => 'switch',
-            'field' => 'debug',
-            'title' => 'Debug开关',
-            'info' => '您可以开启或关闭debug模式',
-            'required' => false,
-            'props' => [
-                'activeValue' => true,
-                'inactiveValue' => false,
-                'disabled' => false,
-                'activeText' => '开启',
-                'inactiveText' => '关闭',
-                'activeColor' => '#40FB07FF',
-                'inactiveColor' => '#FF0000FF'
-            ],
-            '_fc_id' => 'id_Fakamcartp0rawc',
-            'name' => 'ref_F15kmcartp0raxc',
-            'display' => true,
-            'hidden' => false,
-            '_fc_drag_tag' => 'switch'
-        ]
-    ];
-
-}

+ 1 - 2
src/ExtensionManager.php

@@ -8,7 +8,6 @@ use RuntimeException;
 use SixShop\Core\Contracts\ExtensionInterface;
 use SixShop\Core\Service\CoreService;
 use SixShop\Payment\Contracts\PaymentExtensionInterface;
-use SixShop\System\Config\ExtensionConfig;
 use SixShop\System\Enum\ExtensionStatusEnum;
 use SixShop\System\Model\ExtensionConfigModel;
 use SixShop\System\Model\ExtensionModel;
@@ -324,7 +323,7 @@ class ExtensionManager extends Service
 
     private function getLocalConfig(string $extensionID): Collection
     {
-        $config = array_merge(ExtensionConfig::BASE, $this->getExtension($extensionID)->getConfig());
+        $config = $this->getExtension($extensionID)->getConfig();
         $configCollection = new Collection($config);
         Event::trigger('after_read_extension_config', [$configCollection, $extensionID]);
         Event::trigger('after_read_extension_config_' . $extensionID, $configCollection);

+ 0 - 41
src/Log.php

@@ -1,41 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace SixShop\System;
-
-use think\App;
-use think\event\HttpEnd;
-
-class Log extends \think\Log
-{
-    public function __construct(App $app, private ExtensionManager $extensionManager, private string $extensionID)
-    {
-        if (!$app->runningInConsole()) {
-            $app->event->listen(HttpEnd::class, function () {
-                $this->save();
-            });
-        }
-        parent::__construct($app);
-    }
-
-    public function getConfig(?string $name = null, $default = null)
-    {
-        if ($name == 'level') {
-            return $this->getLevelConfig();
-        }
-        return parent::getConfig($name, $default);
-    }
-
-    private function getLevelConfig(): array
-    {
-        $level = parent::getConfig('level', []);
-        if (in_array('debug', $level)) {
-            return $level;
-        }
-        $debug = $this->extensionManager->getExtensionConfig($this->extensionID, 'debug');
-        if ($debug) {
-            $level[] = 'debug';
-        }
-        return $level;
-    }
-}