From b34a5151782884da802c67b34d911d9447628be8 Mon Sep 17 00:00:00 2001
From: augushong <augushong@ulthon.com>
Date: Fri, 22 Mar 2024 14:07:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=95=E5=85=A5=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E7=89=88=E6=9C=AC=E6=8E=A7=E5=88=B6=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/base/admin/view/common/_require.html   | 54 +++++++++----------
 .../base/common/command/admin/VersionBase.php |  4 +-
 extend/base/helper.php                        |  7 +++
 3 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/extend/base/admin/view/common/_require.html b/extend/base/admin/view/common/_require.html
index 91fefdf..042e2d3 100644
--- a/extend/base/admin/view/common/_require.html
+++ b/extend/base/admin/view/common/_require.html
@@ -5,39 +5,39 @@
 
 {:event_view_content('AdminLayoutRequireBefore')}
 
-<link rel="stylesheet" href="__STATIC__/admin/css/public.css" media="all">
-<link rel="stylesheet" href="__STATIC__/common/css/theme/index.css">
+<link rel="stylesheet" href="__STATIC__/admin/css/public.css?t={:get_site_version_key()}" media="all">
+<link rel="stylesheet" href="__STATIC__/common/css/theme/index.css?t={:get_site_version_key()}">
 
 <!-- 基础js -->
-<script src="__STATIC__/plugs/jquery-3.4.1/jquery-3.4.1.min.js"></script>
-<script src="__STATIC__/common/js/app.js"></script>
-<script src="__STATIC__/plugs/layui-v2.8.17/layui.js" charset="utf-8"></script>
-<script src="__STATIC__/plugs/vue-2.6.10/vue.min.js"></script>
+<script src="__STATIC__/plugs/jquery-3.4.1/jquery-3.4.1.min.js?t={:get_site_version_key()}"></script>
+<script src="__STATIC__/common/js/app.js?t={:get_site_version_key()}"></script>
+<script src="__STATIC__/plugs/layui-v2.8.17/layui.js?t={:get_site_version_key()}" charset="utf-8"></script>
+<script src="__STATIC__/plugs/vue-2.6.10/vue.min.js?t={:get_site_version_key()}"></script>
 
-<script src="__STATIC__/plugs/Sortable.min.js"></script>
-<script src="__STATIC__/plugs/vuedraggable.umd.min.js"></script>
+<script src="__STATIC__/plugs/Sortable.min.js?t={:get_site_version_key()}"></script>
+<script src="__STATIC__/plugs/vuedraggable.umd.min.js?t={:get_site_version_key()}"></script>
 
 <!-- 其他js -->
-<script src="__STATIC__/plugs/jq-module/jquery.particleground.min.js"></script>
-<script src="__STATIC__/plugs/echarts/echarts.min.js"></script>
-<script src="__STATIC__/plugs/echarts/echarts-theme.js"></script>
-<script src="__STATIC__/plugs/lay-module/layuimini/miniMenu.js"></script>
-<script src="__STATIC__/plugs/lay-module/layuimini/miniTab.js"></script>
-<script src="__STATIC__/plugs/lay-module/layuimini/miniTheme.js"></script>
-<script src="__STATIC__/plugs/lay-module/layuimini/miniAdmin.js"></script>
-<script src="__STATIC__/plugs/lay-module/treetable-lay/treetable.js"></script>
-<script src="__STATIC__/plugs/lay-module/tableData/tableData.js"></script>
-<script src="__STATIC__/plugs/lay-module/tagInput/tagInput.js"></script>
-<script src="__STATIC__/plugs/lay-module/propertyInput/propertyInput.js"></script>
-<script src="__STATIC__/plugs/lay-module/iconPicker/iconPickerFa.js"></script>
-<script src="__STATIC__/plugs/lay-module/autocomplete/autocomplete.js"></script>
+<script src="__STATIC__/plugs/jq-module/jquery.particleground.min.js?t={:get_site_version_key()}"></script>
+<script src="__STATIC__/plugs/echarts/echarts.min.js?t={:get_site_version_key()}"></script>
+<script src="__STATIC__/plugs/echarts/echarts-theme.js?t={:get_site_version_key()}"></script>
+<script src="__STATIC__/plugs/lay-module/layuimini/miniMenu.js?t={:get_site_version_key()}"></script>
+<script src="__STATIC__/plugs/lay-module/layuimini/miniTab.js?t={:get_site_version_key()}"></script>
+<script src="__STATIC__/plugs/lay-module/layuimini/miniTheme.js?t={:get_site_version_key()}"></script>
+<script src="__STATIC__/plugs/lay-module/layuimini/miniAdmin.js?t={:get_site_version_key()}"></script>
+<script src="__STATIC__/plugs/lay-module/treetable-lay/treetable.js?t={:get_site_version_key()}"></script>
+<script src="__STATIC__/plugs/lay-module/tableData/tableData.js?t={:get_site_version_key()}"></script>
+<script src="__STATIC__/plugs/lay-module/tagInput/tagInput.js?t={:get_site_version_key()}"></script>
+<script src="__STATIC__/plugs/lay-module/propertyInput/propertyInput.js?t={:get_site_version_key()}"></script>
+<script src="__STATIC__/plugs/lay-module/iconPicker/iconPickerFa.js?t={:get_site_version_key()}"></script>
+<script src="__STATIC__/plugs/lay-module/autocomplete/autocomplete.js?t={:get_site_version_key()}"></script>
 
 
-<script src="__STATIC__/plugs/ckeditor4/ckeditor.js"></script>
-<script src="__STATIC__/plugs/jq-module/city-picker/js/city-picker.data.min.js"></script>
-<script src="__STATIC__/plugs/jq-module/city-picker/js/city-picker.min.js"></script>
-<script src="__STATIC__/plugs/clipboard.js/clipboard.min.js"></script>
-<script src="__STATIC__/plugs/ulthon-admin/table.js"></script>
-<script src="__STATIC__/plugs/ulthon-admin/ulthon-admin.js"></script>
+<script src="__STATIC__/plugs/ckeditor4/ckeditor.js?t={:get_site_version_key()}"></script>
+<script src="__STATIC__/plugs/jq-module/city-picker/js/city-picker.data.min.js?t={:get_site_version_key()}"></script>
+<script src="__STATIC__/plugs/jq-module/city-picker/js/city-picker.min.js?t={:get_site_version_key()}"></script>
+<script src="__STATIC__/plugs/clipboard.js/clipboard.min.js?t={:get_site_version_key()}"></script>
+<script src="__STATIC__/plugs/ulthon-admin/table.js?t={:get_site_version_key()}"></script>
+<script src="__STATIC__/plugs/ulthon-admin/ulthon-admin.js?t={:get_site_version_key()}"></script>
 
 {:event_view_content('AdminLayoutRequireAfter')}
\ No newline at end of file
diff --git a/extend/base/common/command/admin/VersionBase.php b/extend/base/common/command/admin/VersionBase.php
index 21976fd..2e8adf0 100644
--- a/extend/base/common/command/admin/VersionBase.php
+++ b/extend/base/common/command/admin/VersionBase.php
@@ -12,12 +12,12 @@ use think\console\Output;
 
 class VersionBase extends Command
 {
-    public const VERSION = 'v2.0.90';
+    public const VERSION = 'v2.0.91';
 
     public const LAYUI_VERSION = '2.8.17';
 
     public const COMMENT = [
-        '将js统计加入到后台中',
+        '增加引入文件的版本控制更新',
         '发布新版本',
     ];
 
diff --git a/extend/base/helper.php b/extend/base/helper.php
index 4ac6d9b..10de445 100644
--- a/extend/base/helper.php
+++ b/extend/base/helper.php
@@ -2,6 +2,7 @@
 
 // 应用公共文件
 
+use app\common\command\admin\Version;
 use app\common\exception\EventException;
 use app\common\service\AuthService;
 use app\common\tools\StoreValueTools;
@@ -360,3 +361,9 @@ function set_store_value($key, $value)
 {
     return StoreValueTools::set($key, $value);
 }
+if (!function_exists('get_site_version_key')) {
+    function get_site_version_key()
+    {
+        return sysconfig('site', 'site_version') . '-' . Version::VERSION . '-' . Version::LAYUI_VERSION;
+    }
+}