From eaaea2b24c2847af0b290575b85389de719626e2 Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Tue, 15 Apr 2025 01:46:36 +0800
Subject: [PATCH] =?UTF-8?q?update:=E6=99=BA=E6=8E=A7=E5=8F=B0=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=89=88=E6=9C=AC=E5=8F=B7=20(#793)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/security/config/ShiroConfig.java  |  1 +
 .../security/controller/LoginController.java  | 10 +++++
 main/manager-web/src/apis/module/user.js      | 18 +++++++-
 .../src/components/VersionFooter.vue          | 39 ++++++++++++++++
 .../src/views/DeviceManagement.vue            | 25 ++++-------
 main/manager-web/src/views/ModelConfig.vue    | 44 +++++--------------
 .../src/views/ParamsManagement.vue            | 16 -------
 main/manager-web/src/views/UserManagement.vue | 18 +-------
 main/manager-web/src/views/home.vue           |  9 ++--
 main/manager-web/src/views/login.vue          | 28 +++++++++---
 main/manager-web/src/views/register.vue       |  8 ++--
 main/manager-web/src/views/roleConfig.vue     |  3 --
 main/xiaozhi-server/config/logger.py          |  9 +++-
 13 files changed, 126 insertions(+), 102 deletions(-)
 create mode 100644 main/manager-web/src/components/VersionFooter.vue

diff --git a/main/manager-api/src/main/java/xiaozhi/modules/security/config/ShiroConfig.java b/main/manager-api/src/main/java/xiaozhi/modules/security/config/ShiroConfig.java
index 7bd356fc..fdcb62b2 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/security/config/ShiroConfig.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/security/config/ShiroConfig.java
@@ -76,6 +76,7 @@ public class ShiroConfig {
         filterMap.put("/favicon.ico", "anon");
         filterMap.put("/user/captcha", "anon");
         filterMap.put("/user/login", "anon");
+        filterMap.put("/user/pub-config", "anon");
         filterMap.put("/user/register", "anon");
         filterMap.put("/config/server-base", "anon");
         filterMap.put("/config/agent-models", "anon");
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/security/controller/LoginController.java b/main/manager-api/src/main/java/xiaozhi/modules/security/controller/LoginController.java
index 7db612b5..0ee6a1ce 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/security/controller/LoginController.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/security/controller/LoginController.java
@@ -1,6 +1,8 @@
 package xiaozhi.modules.security.controller;
 
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -111,4 +113,12 @@ public class LoginController {
         sysUserTokenService.changePassword(userId, passwordDTO);
         return new Result<>();
     }
+
+    @GetMapping("/pub-config")
+    @Operation(summary = "公共配置")
+    public Result<Map<String, Object>> pubConfig() {
+        Map<String, Object> config = new HashMap<>();
+        config.put("version", "0.3.3");
+        return new Result<Map<String, Object>>().ok(config);
+    }
 }
\ No newline at end of file
diff --git a/main/manager-web/src/apis/module/user.js b/main/manager-web/src/apis/module/user.js
index 748867b2..84d5b7f9 100755
--- a/main/manager-web/src/apis/module/user.js
+++ b/main/manager-web/src/apis/module/user.js
@@ -106,7 +106,7 @@ export default {
     },
     // 修改用户状态
     changeUserStatus(status, userIds, successCallback) {
-        console.log(555,userIds)
+        console.log(555, userIds)
         RequestService.sendRequest()
             .url(`${getServiceUrl()}/admin/users/changeStatus/${status}`)
             .method('put')
@@ -122,4 +122,20 @@ export default {
                 })
             }).send()
     },
+    // 获取公共配置
+    getPubConfig(callback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/user/pub-config`)
+            .method('GET')
+            .success((res) => {
+                RequestService.clearRequestTime();
+                callback(res);
+            })
+            .fail((err) => {
+                console.error('获取公共配置失败:', err);
+                RequestService.reAjaxFun(() => {
+                    this.getPubConfig(callback);
+                });
+            }).send();
+    },
 }
diff --git a/main/manager-web/src/components/VersionFooter.vue b/main/manager-web/src/components/VersionFooter.vue
new file mode 100644
index 00000000..8a8b76a0
--- /dev/null
+++ b/main/manager-web/src/components/VersionFooter.vue
@@ -0,0 +1,39 @@
+<template>
+    <div class="copyright">
+        ©2025 xiaozhi-esp32-server v{{ version }}
+    </div>
+</template>
+
+<script>
+import Api from '@/apis/api';
+
+export default {
+    name: 'VersionFooter',
+    data() {
+        return {
+            version: ''
+        }
+    },
+    mounted() {
+        this.getSystemVersion();
+    },
+    methods: {
+        getSystemVersion() {
+            const storedVersion = sessionStorage.getItem('systemVersion');
+            if (storedVersion) {
+                this.version = storedVersion;
+                return;
+            }
+
+            Api.user.getPubConfig(({ data }) => {
+                if (data.code === 0 && data.data.version) {
+                    this.version = data.data.version;
+                    sessionStorage.setItem('systemVersion', data.data.version);
+                }
+            });
+        }
+    }
+}
+</script>
+
+<style scoped></style>
\ No newline at end of file
diff --git a/main/manager-web/src/views/DeviceManagement.vue b/main/manager-web/src/views/DeviceManagement.vue
index bffefb07..823bedc6 100644
--- a/main/manager-web/src/views/DeviceManagement.vue
+++ b/main/manager-web/src/views/DeviceManagement.vue
@@ -4,7 +4,8 @@
     <el-main style="padding: 20px; display: flex; flex-direction: column;">
       <div class="table-container">
         <h3 class="device-list-title">设备列表</h3>
-        <el-table ref="deviceTable" :data="paginatedDeviceList" @selection-change="handleSelectionChange" style="width: 100%; margin-top: 20px" border stripe>
+        <el-table ref="deviceTable" :data="paginatedDeviceList" @selection-change="handleSelectionChange"
+          style="width: 100%; margin-top: 20px" border stripe>
           <el-table-column type="selection" align="center" width="60"></el-table-column>
           <el-table-column label="设备型号" prop="model" flex></el-table-column>
           <el-table-column label="固件版本" prop="firmwareVersion" width="120"></el-table-column>
@@ -40,22 +41,17 @@
         <div class="table_bottom">
           <div class="ctrl_btn">
             <el-button size="mini" type="primary" class="select-all-btn" @click="toggleAllSelection">
-                {{ isAllSelected ? '取消全选' : '全选' }}
+              {{ isAllSelected ? '取消全选' : '全选' }}
             </el-button>
             <el-button type="primary" size="mini" class="add-device-btn" @click="handleAddDevice">
-                新增
+              新增
             </el-button>
           </div>
           <div class="custom-pagination">
             <button class="pagination-btn" :disabled="currentPage === 1" @click="goFirst">首页</button>
             <button class="pagination-btn" :disabled="currentPage === 1" @click="goPrev">上一页</button>
-            <button
-              v-for="page in visiblePages"
-              :key="page"
-              class="pagination-btn"
-              :class="{ active: page === currentPage }"
-              @click="goToPage(page)"
-            >
+            <button v-for="page in visiblePages" :key="page" class="pagination-btn"
+              :class="{ active: page === currentPage }" @click="goToPage(page)">
               {{ page }}
             </button>
             <button class="pagination-btn" :disabled="currentPage === pageCount" @click="goNext">下一页</button>
@@ -63,9 +59,6 @@
           </div>
         </div>
       </div>
-      <div class="copyright">
-        ©2025 xiaozhi-esp32-server
-      </div>
       <AddDeviceDialog :visible.sync="addDeviceDialogVisible" :agent-id="currentAgentId"
         @refresh="fetchBindDevices(currentAgentId)" />
     </el-main>
@@ -82,7 +75,7 @@ export default {
   data() {
     return {
       addDeviceDialogVisible: false,
-       selectedDevices: [],
+      selectedDevices: [],
       isAllSelected: false,
       currentAgentId: this.$route.query.agentId || '',
       currentPage: 1,
@@ -99,7 +92,7 @@ export default {
       return this.deviceList.slice(start, end);
     },
     pageCount() {
-    return Math.ceil(this.deviceList.length / this.pageSize);
+      return Math.ceil(this.deviceList.length / this.pageSize);
     },
     visiblePages() {
       const pages = [];
@@ -346,6 +339,4 @@ export default {
     color: white;
   }
 }
-
-
 </style>
diff --git a/main/manager-web/src/views/ModelConfig.vue b/main/manager-web/src/views/ModelConfig.vue
index 343cb06f..2f5a5dae 100644
--- a/main/manager-web/src/views/ModelConfig.vue
+++ b/main/manager-web/src/views/ModelConfig.vue
@@ -3,21 +3,15 @@
     <HeaderBar />
 
     <div class="operation-bar">
-        <h2 class="page-title">{{ modelTypeText }}</h2>
+      <h2 class="page-title">{{ modelTypeText }}</h2>
       <div class="action-group">
-            <div class="search-group">
-                <el-input
-                    placeholder="请输入模型名称查询"
-                    v-model="search"
-                    class="search-input"
-                    clearable
-                    @keyup.enter.native="handleSearch"
-                    style="width: 240px"
-                />
-                <el-button class="btn-search" @click="handleSearch">
-                  搜索
-                </el-button>
-            </div>
+        <div class="search-group">
+          <el-input placeholder="请输入模型名称查询" v-model="search" class="search-input" clearable
+            @keyup.enter.native="handleSearch" style="width: 240px" />
+          <el-button class="btn-search" @click="handleSearch">
+            搜索
+          </el-button>
+        </div>
       </div>
     </div>
 
@@ -93,9 +87,9 @@
 
           <div class="table-footer">
             <div class="batch-actions">
-              <el-button size="mini" type="primary" @click="selectAll" >
+              <el-button size="mini" type="primary" @click="selectAll">
                 {{ isAllSelected ?
-                '取消全选' : '全选' }}
+                  '取消全选' : '全选' }}
               </el-button>
               <el-button type="success" size="mini" @click="addModel" class="add-btn">
                 新增
@@ -125,10 +119,6 @@
       <TtsModel :visible.sync="ttsDialogVisible" :ttsModelId="selectedTtsModelId" />
       <AddModelDialog :modelType="activeTab" :visible.sync="addDialogVisible" @confirm="handleAddConfirm" />
     </div>
-
-    <div class="copyright">
-      ©2025 xiaozhi-esp32-server
-    </div>
   </div>
 </template>
 
@@ -639,20 +629,6 @@ export default {
   gap: 8px;
 }
 
-.copyright {
-  text-align: center;
-  color: #979db1;
-  font-size: 12px;
-  font-weight: 400;
-  margin-top: auto;
-  padding: 30px 0 20px;
-  position: absolute;
-  bottom: 0;
-  left: 50%;
-  transform: translateX(-50%);
-  width: 100%;
-}
-
 .title-wrapper {
   display: flex;
   align-items: center;
diff --git a/main/manager-web/src/views/ParamsManagement.vue b/main/manager-web/src/views/ParamsManagement.vue
index e9baa1e8..02f912a1 100644
--- a/main/manager-web/src/views/ParamsManagement.vue
+++ b/main/manager-web/src/views/ParamsManagement.vue
@@ -64,8 +64,6 @@
         <!-- 新增/编辑参数对话框 -->
         <param-dialog :title="dialogTitle" :visible.sync="dialogVisible" :form="paramForm" @submit="handleSubmit"
             @cancel="dialogVisible = false" />
-
-        <div class="copyright">©2025 xiaozhi-esp32-server</div>
     </div>
 </template>
 
@@ -382,20 +380,6 @@ export default {
     }
 }
 
-.copyright {
-    text-align: center;
-    color: #979db1;
-    font-size: 12px;
-    font-weight: 400;
-    margin-top: auto;
-    padding: 30px 0 20px;
-    position: absolute;
-    bottom: 0;
-    left: 50%;
-    transform: translateX(-50%);
-    width: 100%;
-}
-
 .custom-pagination {
     display: flex;
     align-items: center;
diff --git a/main/manager-web/src/views/UserManagement.vue b/main/manager-web/src/views/UserManagement.vue
index 45015d97..617ad04c 100644
--- a/main/manager-web/src/views/UserManagement.vue
+++ b/main/manager-web/src/views/UserManagement.vue
@@ -42,7 +42,7 @@
             <div class="table_bottom">
               <div class="ctrl_btn">
                 <el-button size="mini" type="primary" class="select-all-btn" @click="handleSelectAll">
-                    {{ isAllSelected ? '取消全选' : '全选' }}
+                  {{ isAllSelected ? '取消全选' : '全选' }}
                 </el-button>
                 <el-button size="mini" type="success" icon="el-icon-circle-check" @click="batchEnable">启用</el-button>
                 <el-button size="mini" type="warning" @click="batchDisable"><i
@@ -69,8 +69,6 @@
         </div>
       </div>
     </div>
-
-    <div class="copyright">©2025 xiaozhi-esp32-server</div>
     <view-password-dialog :visible.sync="showViewPassword" :password="currentPassword" />
   </div>
 </template>
@@ -465,20 +463,6 @@ export default {
   color: black;
 }
 
-.copyright {
-  text-align: center;
-  color: #979db1;
-  font-size: 12px;
-  font-weight: 400;
-  margin-top: auto;
-  padding: 30px 0 20px;
-  position: absolute;
-  bottom: 0;
-  left: 50%;
-  transform: translateX(-50%);
-  width: 100%;
-}
-
 .custom-pagination {
   display: flex;
   align-items: center;
diff --git a/main/manager-web/src/views/home.vue b/main/manager-web/src/views/home.vue
index 0e9fd32a..5f8115f3 100644
--- a/main/manager-web/src/views/home.vue
+++ b/main/manager-web/src/views/home.vue
@@ -35,11 +35,11 @@
             @deviceManage="handleDeviceManage" @delete="handleDeleteAgent" />
         </div>
       </div>
-      <div class="copyright">
-        ©2025 xiaozhi-esp32-server
-      </div>
       <AddWisdomBodyDialog :visible.sync="addDeviceDialogVisible" @confirm="handleWisdomBodyAdded" />
     </el-main>
+    <el-footer>
+      <version-footer />
+    </el-footer>
   </div>
 
 </template>
@@ -49,10 +49,11 @@ import Api from '@/apis/api';
 import AddWisdomBodyDialog from '@/components/AddWisdomBodyDialog.vue';
 import DeviceItem from '@/components/DeviceItem.vue';
 import HeaderBar from '@/components/HeaderBar.vue';
+import VersionFooter from '@/components/VersionFooter.vue';
 
 export default {
   name: 'HomePage',
-  components: { DeviceItem, AddWisdomBodyDialog, HeaderBar },
+  components: { DeviceItem, AddWisdomBodyDialog, HeaderBar, VersionFooter },
   data() {
     return {
       addDeviceDialogVisible: false,
diff --git a/main/manager-web/src/views/login.vue b/main/manager-web/src/views/login.vue
index 23c8479e..af50bc1c 100644
--- a/main/manager-web/src/views/login.vue
+++ b/main/manager-web/src/views/login.vue
@@ -51,9 +51,7 @@
         </div>
       </el-main>
       <el-footer>
-        <div class="copyright">
-          ©2025 xiaozhi-esp32-server
-        </div>
+        <version-footer />
       </el-footer>
     </el-container>
   </div>
@@ -61,11 +59,14 @@
 
 <script>
 import Api from '@/apis/api';
+import VersionFooter from '@/components/VersionFooter.vue';
 import { getUUID, goToPage, showDanger, showSuccess } from '@/utils';
 
-
 export default {
   name: 'login',
+  components: {
+    VersionFooter
+  },
   data() {
     return {
       activeName: "username",
@@ -76,11 +77,13 @@ export default {
         captchaId: ''
       },
       captchaUuid: '',
-      captchaUrl: ''
+      captchaUrl: '',
+      version: ''
     }
   },
   mounted() {
     this.fetchCaptcha();
+    this.getSystemVersion();
   },
   methods: {
     fetchCaptcha() {
@@ -144,6 +147,21 @@ export default {
 
     goToRegister() {
       goToPage('/register')
+    },
+
+    getSystemVersion() {
+      const storedVersion = sessionStorage.getItem('systemVersion');
+      if (storedVersion) {
+        this.version = storedVersion;
+        return;
+      }
+
+      Api.user.getPubConfig(({ data }) => {
+        if (data.code === 0 && data.data.version) {
+          this.version = data.data.version;
+          sessionStorage.setItem('systemVersion', data.data.version);
+        }
+      });
     }
   }
 }
diff --git a/main/manager-web/src/views/register.vue b/main/manager-web/src/views/register.vue
index 0a5e1647..234229c3 100644
--- a/main/manager-web/src/views/register.vue
+++ b/main/manager-web/src/views/register.vue
@@ -72,9 +72,7 @@
 
       <!-- 保持相同的页脚 -->
       <el-footer>
-        <div class="copyright">
-          ©2025 xiaozhi-esp32-server
-        </div>
+        <version-footer />
       </el-footer>
     </el-container>
   </div>
@@ -82,10 +80,14 @@
 
 <script>
 import Api from '@/apis/api';
+import VersionFooter from '@/components/VersionFooter.vue';
 import { getUUID, goToPage, showDanger, showSuccess } from '@/utils';
 
 export default {
   name: 'register',
+  components: {
+    VersionFooter
+  },
   data() {
     return {
       form: {
diff --git a/main/manager-web/src/views/roleConfig.vue b/main/manager-web/src/views/roleConfig.vue
index 75ec04e4..a67fe0f4 100644
--- a/main/manager-web/src/views/roleConfig.vue
+++ b/main/manager-web/src/views/roleConfig.vue
@@ -81,9 +81,6 @@
           </div>
         </div>
       </div>
-      <div class="copyright">
-        ©2025 xiaozhi-esp32-server
-      </div>
     </el-main>
   </div>
 </template>
diff --git a/main/xiaozhi-server/config/logger.py b/main/xiaozhi-server/config/logger.py
index cc87807b..96d1fe65 100644
--- a/main/xiaozhi-server/config/logger.py
+++ b/main/xiaozhi-server/config/logger.py
@@ -3,7 +3,7 @@ import sys
 from loguru import logger
 from config.config_loader import load_config
 
-SERVER_VERSION = "0.3.1"
+SERVER_VERSION = "0.3.3"
 
 
 def get_module_abbreviation(module_name, module_dict):
@@ -65,6 +65,11 @@ def setup_logging():
     logger.add(sys.stdout, format=log_format, level=log_level, filter=formatter)
 
     # 输出到文件
-    logger.add(os.path.join(log_dir, log_file), format=log_format_file, level=log_level, filter=formatter)
+    logger.add(
+        os.path.join(log_dir, log_file),
+        format=log_format_file,
+        level=log_level,
+        filter=formatter,
+    )
 
     return logger