From c941f12884757ba8177a35f21759179f2385503f Mon Sep 17 00:00:00 2001
From: augushong <augushong@ulthon.com>
Date: Wed, 18 Oct 2023 16:35:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/config/admin.php      |  3 ++-
 app/admin/event.php             |  2 +-
 app/admin/middleware.php        |  2 +-
 app/common.php                  |  1 +
 app/service.php                 |  1 +
 extend/think/UlthonAdminApp.php | 18 ------------------
 6 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 extend/think/UlthonAdminApp.php

diff --git a/app/admin/config/admin.php b/app/admin/config/admin.php
index af80f18..deb2e03 100644
--- a/app/admin/config/admin.php
+++ b/app/admin/config/admin.php
@@ -1,5 +1,6 @@
 <?php
-// 当前文件的内容应当兼容 /extend/base/admin/config/admin.php的内容
+
+// !当前文件的内容应当与 /extend/base/admin/config/admin.php的内容保持一直，然后再根据实际情况设置
 
 use think\facade\Env;
 
diff --git a/app/admin/event.php b/app/admin/event.php
index e854c02..5b4010e 100644
--- a/app/admin/event.php
+++ b/app/admin/event.php
@@ -1,6 +1,6 @@
 <?php
 
-// 当前文件的内容应当兼容 /extend/base/admin/event.php的内容
+// !当前文件的内容应当与 /extend/base/admin/event.php的内容一致，然后根据实际情况设置
 
 // 事件定义文件
 return [
diff --git a/app/admin/middleware.php b/app/admin/middleware.php
index 0224517..d8ca6cb 100644
--- a/app/admin/middleware.php
+++ b/app/admin/middleware.php
@@ -1,6 +1,6 @@
 <?php
 
-// 当前文件的内容应当兼容 /extend/base/admin/middleware.php的内容
+// !当前文件的内容应当与 /extend/base/admin/middleware.php 的内容一致，然后再根据实际情况设置
 
 // 全局中间件定义文件
 return [
diff --git a/app/common.php b/app/common.php
index a42c687..9f5e993 100644
--- a/app/common.php
+++ b/app/common.php
@@ -2,4 +2,5 @@
 
 use think\facade\App;
 
+// !注意，必须要引入该文件
 include App::getRootPath() . '/extend/base/helper.php';
diff --git a/app/service.php b/app/service.php
index 23fe0c2..32b4bac 100644
--- a/app/service.php
+++ b/app/service.php
@@ -5,6 +5,7 @@ declare(strict_types=1);
 use think\UlthonAdminService;
 
 $service = [
+    // !注意，必须要注册该服务
     10 => UlthonAdminService::class,
 ];
 
diff --git a/extend/think/UlthonAdminApp.php b/extend/think/UlthonAdminApp.php
deleted file mode 100644
index 14afe5d..0000000
--- a/extend/think/UlthonAdminApp.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace think;
-
-class UlthonAdminApp extends App
-{
-    /**
-     * 加载应用文件和配置.
-     * @return void
-     */
-    protected function load(): void
-    {
-        // 引入系统函数
-        include App::getRootPath() . '/extend/base/helper.php';
-
-        parent::load();
-    }
-}