From 01db0f99560ff4444a7c18fff1b979995558d97b Mon Sep 17 00:00:00 2001
From: augushong <augushong@ulthon.com>
Date: Mon, 18 Sep 2023 18:06:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=A7=8B=E8=87=AA=E5=8A=A8=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=9E=B6=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common.php                  |  2 ++
 app/common/app/functions.php    |  1 +
 app/{ => common/app}/listen.php |  0
 app/common/app/middleware.php   |  5 +++++
 app/common/app/service.php      |  5 +++++
 app/event.php                   |  2 +-
 app/middleware.php              | 12 ++++++++++--
 app/provider.php                |  6 +++++-
 app/service.php                 | 13 ++++++++++---
 config/update.php               | 14 ++++++++++++++
 10 files changed, 53 insertions(+), 7 deletions(-)
 create mode 100644 app/common/app/functions.php
 rename app/{ => common/app}/listen.php (100%)
 create mode 100644 app/common/app/middleware.php
 create mode 100644 app/common/app/service.php
 create mode 100644 config/update.php

diff --git a/app/common.php b/app/common.php
index 563ad31..f932179 100644
--- a/app/common.php
+++ b/app/common.php
@@ -10,6 +10,8 @@ use think\facade\Event;
 use think\facade\Filesystem;
 use think\route\Url;
 
+include_once __DIR__ . '/app/common/app/functions.php';
+
 if (!function_exists('__url')) {
     /**
      * 构建URL地址
diff --git a/app/common/app/functions.php b/app/common/app/functions.php
new file mode 100644
index 0000000..b3d9bbc
--- /dev/null
+++ b/app/common/app/functions.php
@@ -0,0 +1 @@
+<?php
diff --git a/app/listen.php b/app/common/app/listen.php
similarity index 100%
rename from app/listen.php
rename to app/common/app/listen.php
diff --git a/app/common/app/middleware.php b/app/common/app/middleware.php
new file mode 100644
index 0000000..25058db
--- /dev/null
+++ b/app/common/app/middleware.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+
+];
\ No newline at end of file
diff --git a/app/common/app/service.php b/app/common/app/service.php
new file mode 100644
index 0000000..ca5d8ed
--- /dev/null
+++ b/app/common/app/service.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+
+];
diff --git a/app/event.php b/app/event.php
index ba5d52d..cbeba8b 100644
--- a/app/event.php
+++ b/app/event.php
@@ -27,7 +27,7 @@ $event = [
     ],
 ];
 
-$listen = include __DIR__ . '/listen.php';
+$listen = include __DIR__ . '/app/common/app/listen.php';
 
 $event['listen'] = array_merge($event['listen'], $listen);
 
diff --git a/app/middleware.php b/app/middleware.php
index c8d321e..f4cde20 100644
--- a/app/middleware.php
+++ b/app/middleware.php
@@ -1,10 +1,18 @@
 <?php
+
 // 全局中间件定义文件
-return [
+
+$middleware_default = [
     // 全局请求缓存
     // \think\middleware\CheckRequestCache::class,
     // 多语言加载
     // \think\middleware\LoadLangPack::class,
     // Session初始化
-     \think\middleware\SessionInit::class
+    100 => \think\middleware\SessionInit::class,
 ];
+
+$middleware_common = include_once __DIR__ . '/app/common/app/middleware.php';
+
+$middleware = array_merge($middleware_default, $middleware_common);
+
+return ksort($middleware);
diff --git a/app/provider.php b/app/provider.php
index 2d2febf..bfde3e0 100644
--- a/app/provider.php
+++ b/app/provider.php
@@ -6,8 +6,12 @@ use app\common\provider\ExceptionHandle;
 use app\common\provider\Request;
 use app\common\provider\View;
 
-return [
+$provider_default = [
     'think\Request' => Request::class,
     'think\exception\Handle' => ExceptionHandle::class,
     'think\View' => View::class,
 ];
+
+$provider_common = include_once __DIR__ . '/app/common/app/provider.php';
+
+return array_merge($provider_default, $provider_common);
diff --git a/app/service.php b/app/service.php
index d6df24b..790b881 100644
--- a/app/service.php
+++ b/app/service.php
@@ -1,7 +1,14 @@
 <?php
-declare (strict_types=1);
 
-return [
+declare(strict_types=1);
+
+$service_default = [
     0 => 'think\\captcha\\CaptchaService',
     1 => 'think\\app\\Service',
-];
\ No newline at end of file
+];
+
+$service_common = include_once __DIR__ . '/app/common/app/service.php';
+
+$service = array_merge($service_default, $service_common);
+
+return ksort($service);
diff --git a/config/update.php b/config/update.php
new file mode 100644
index 0000000..8a1b5ed
--- /dev/null
+++ b/config/update.php
@@ -0,0 +1,14 @@
+<?php
+
+$config = [];
+
+$skip_files = [];
+
+$skip_files[] = '/app/common/app/functions.php';
+$skip_files[] = '/app/common/app/listen.php';
+$skip_files[] = '/app/common/app/middleware.php';
+$skip_files[] = '/app/common/app/service.php';
+
+$config['skip_files'] = $skip_files;
+
+return $config;