From afd8b817122a50d8984aa9cb7bfd3fad79ad3ac3 Mon Sep 17 00:00:00 2001
From: augushong <augushong@163.com>
Date: Tue, 15 Oct 2024 13:25:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=85=88=E8=87=AA=E5=AE=9A=E4=B9=89=E7=9A=84?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/base/admin/service/AdminUpdateServiceBase.php | 6 +++++-
 extend/base/common/command/admin/VersionBase.php     | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/extend/base/admin/service/AdminUpdateServiceBase.php b/extend/base/admin/service/AdminUpdateServiceBase.php
index 3e11451..ef21c9f 100644
--- a/extend/base/admin/service/AdminUpdateServiceBase.php
+++ b/extend/base/admin/service/AdminUpdateServiceBase.php
@@ -332,7 +332,11 @@ class AdminUpdateServiceBase
         $output->writeln('更新完成');
         // 更新完成
 
-        $update_tips = include $last_version_dir . '/extend/base/admin/service/adminUpdateData/tips.php';
+        $update_tips_file_path = $last_version_dir . '/app/admin/service/adminUpdateData/tips.php';
+        if(!file_exists($update_tips_file_path)){
+            $update_tips_file_path = $last_version_dir . '/extend/base/admin/service/adminUpdateData/tips.php';
+        }
+        $update_tips = include $update_tips_file_path;
 
         // 按照版本号排序
         usort($update_tips, function ($a, $b) {
diff --git a/extend/base/common/command/admin/VersionBase.php b/extend/base/common/command/admin/VersionBase.php
index c9c0de7..181b5e8 100644
--- a/extend/base/common/command/admin/VersionBase.php
+++ b/extend/base/common/command/admin/VersionBase.php
@@ -12,14 +12,14 @@ use think\console\Output;
 
 class VersionBase extends Command
 {
-    public const VERSION = 'v2.0.106';
+    public const VERSION = 'v2.0.107';
 
     public const PRODUCT_VERSION = '';
 
     public const LAYUI_VERSION = '2.8.17';
 
     public const COMMENT = [
-        '修复更新底层机制错误',
+        '更新版本提示优先自定义的路径',
         '发布新版本',
     ];