add:在日志里添加版本信息 (#529)

edge-tts 流式写

.gitignore

@@ -155,3 +155,4 @@ main/manager-web/node_modules
 # model files
 main/xiaozhi-server/models/SenseVoiceSmall/model.pt
 main/xiaozhi-server/models/sherpa-onnx*
+my_wakeup_words.mp3

main/manager-web/src/apis/api.js

@@ -1,6 +1,6 @@
 // 引入各个模块的请求
 import user from './module/user.js'
-
+import admin from './module/admin.js'
 /**
  * 接口地址
  * 当前8002端口接口还没开发完成，暂时用 apifoxmock 接口代替

main/manager-web/src/apis/module/admin.js

@@ -0,0 +1,20 @@
+import RequestService from '../httpRequest'
+import {getServiceUrl} from '../api'
+
+
+export default {
+    // 用户列表
+    getUserList(callback) {
+        RequestService.sendRequest().url(`${getServiceUrl()}/api/v1/admin/users`)
+            .method('GET')
+            .success((res) => {
+                RequestService.clearRequestTime()
+                callback(res)
+            })
+            .fail(() => {
+                RequestService.reAjaxFun(() => {
+                    this.getList()
+                })
+            }).send()
+    },
+}

main/manager-web/src/apis/module/user.js

@@ -18,51 +18,6 @@ export default {
                 })
             }).send()
     },
-    // 获取设备信息
-    getHomeList(callback) {
-        RequestService.sendRequest().url(`${getServiceUrl()}/api/v1/user/device/bind`)
-            .method('GET')
-            .success((res) => {
-                RequestService.clearRequestTime()
-                callback(res)
-            })
-            .fail(() => {
-                RequestService.reAjaxFun(() => {
-                    this.getUserInfo()
-                })
-            }).send()
-    },
-    // 解绑设备
-    unbindDevice(device_id, callback) {
-        RequestService.sendRequest()
-            .url(`${getServiceUrl()}/api/v1/user/device/unbind/${device_id}`)
-            .method('PUT')
-            .success((res) => {
-                RequestService.clearRequestTime();
-                callback(res);
-            })
-            .fail(() => {
-                RequestService.reAjaxFun(() => {
-                  this.unbindDevice(device_id, callback);
-                });
-              }).send()
-    },
-    // 绑定设备
-    bindDevice(deviceCode, callback) {
-        RequestService.sendRequest()
-            .url(`${getServiceUrl()}/api/v1/user/device/bind/${deviceCode}`)
-            .method('POST')
-            .success((res) => {
-                RequestService.clearRequestTime();
-                callback(res);
-            })
-            .fail((err) => {
-                console.error('绑定设备失败:', err);
-                RequestService.reAjaxFun(() => {
-                    this.bindDevice(deviceCode, callback);
-                });
-            }).send();
-    },
     // 获取验证码
     getCaptcha(uuid, callback) {
 
@@ -71,9 +26,9 @@ export default {
             .method('GET')
             .type('blob')
             .header({
-                  'Content-Type': 'image/gif',
-                  'Pragma': 'No-cache',
-                  'Cache-Control': 'no-cache'
+                'Content-Type': 'image/gif',
+                'Pragma': 'No-cache',
+                'Cache-Control': 'no-cache'
             })
             .success((res) => {
                 RequestService.clearRequestTime();
@@ -112,22 +67,6 @@ export default {
                 });
             }).send();
     },
-    // 获取设备配置
-    getDeviceConfig(device_id, callback) {
-        RequestService.sendRequest()
-            .url(`${getServiceUrl()}/api/v1/user/configDevice/${device_id}`)
-            .method('GET')
-            .success((res) => {
-                RequestService.clearRequestTime();
-                callback(res);
-            })
-            .fail((err) => {
-                console.error('获取配置失败:', err);
-                RequestService.reAjaxFun(() => {
-                    this.getDeviceConfig(device_id, callback);
-                });
-            }).send();
-    },
     // 获取所有模型名称
     getModelNames(callback) {
         RequestService.sendRequest()
@@ -173,8 +112,8 @@ export default {
                     this.getAgentList(callback);
                 });
             }).send();
-        },
-
+    },
+    // 用户信息获取
     getUserInfo(callback) {
         RequestService.sendRequest()
             .url(`${getServiceUrl()}/api/v1/user/info`)
@@ -195,7 +134,7 @@ export default {
         RequestService.sendRequest()
             .url(`${getServiceUrl()}/api/v1/user/agent`)
             .method('POST')
-            .data({ name: agentName })
+            .data({name: agentName})
             .success((res) => {
                 RequestService.clearRequestTime();
                 callback(res);
@@ -206,5 +145,87 @@ export default {
                 });
             }).send();
     },
-
+    // 删除智能体
+    deleteAgent(agentId, callback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/api/v1/user/agent/${agentId}`)
+            .method('DELETE')
+            .success((res) => {
+                RequestService.clearRequestTime();
+                callback(res);
+            })
+            .fail(() => {
+                RequestService.reAjaxFun(() => {
+                    this.deleteAgent(agentId, callback);
+                });
+            }).send();
+    },
+    // API接口代码修改
+    changePassword(oldPassword, newPassword, successCallback, errorCallback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/api/v1/user/change-password`)  // 修改URL
+            .method('PUT')  // 修改方法为PUT
+            .data({
+                old_password: oldPassword,  // 修改参数名
+                new_password: newPassword   // 修改参数名
+            })
+            .success((res) => {
+                RequestService.clearRequestTime();
+                successCallback(res);
+            })
+            .fail((error) => {
+                RequestService.reAjaxFun(() => {
+                    this.changePassword(oldPassword, newPassword, successCallback, errorCallback);
+                });
+            })
+            .send();
+    },
+    // 获取智能体配置
+    getDeviceConfig(deviceId, callback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/api/v1/user/agent/${deviceId}`)
+            .method('GET')
+            .success((res) => {
+                RequestService.clearRequestTime();
+                callback(res);
+            })
+            .fail((err) => {
+                console.error('获取配置失败:', err);
+                RequestService.reAjaxFun(() => {
+                    this.getDeviceConfig(deviceId, callback);
+                });
+            }).send();
+    },
+    // 配置智能体
+    updateAgentConfig(agentId, configData, callback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/api/v1/user/agent/${agentId}`)
+            .method('PUT')
+            .data(configData)
+            .success((res) => {
+                RequestService.clearRequestTime();
+                callback(res);
+            })
+            .fail(() => {
+                RequestService.reAjaxFun(() => {
+                    this.updateAgentConfig(agentId, configData, callback);
+                });
+            }).send();
+    },
+    // 已绑设备
+     getAgentBindDevices(agentId, callback) {
+         RequestService.sendRequest()
+             .url(`${getServiceUrl()}/api/v1/user/agent/device/bind/${agentId}`)
+             .method('GET')
+             .success((res) => {
+                 RequestService.clearRequestTime();
+                 callback(res);
+             })
+             .fail((err) => {
+                 console.error('获取设备列表失败:', err);
+                 RequestService.reAjaxFun(() => {
+                     this.getAgentBindDevices(agentId, callback);
+                 });
+             }).send();
+     },
 }

main/manager-web/src/components/ChangePasswordDialog.vue

@@ -0,0 +1,141 @@
+<template>
+  <el-dialog :visible.sync="visible" width="400px" center>
+    <div
+        style="margin: 0 10px 10px;display: flex;align-items: center;gap: 10px;font-weight: 700;font-size: 20px;text-align: left;color: #3d4566;">
+      <div
+          style="width: 40px;height: 40px;border-radius: 50%;background: #5778ff;display: flex;align-items: center;justify-content: center;">
+        <img src="@/assets/login/shield.png" alt="" style="width: 19px;height: 23px; filter: brightness(0) invert(1);" />
+      </div>
+      修改密码
+    </div>
+    <div style="height: 1px;background: #e8f0ff;"/>
+    <div style="margin: 22px 15px;">
+      <div style="font-weight: 400;font-size: 14px;text-align: left;color: #3d4566;">
+        <div style="color: red;display: inline-block;">*</div>
+        旧密码：
+      </div>
+      <div class="input-46" style="margin-top: 12px;">
+        <el-input placeholder="请输入旧密码" v-model="oldPassword" type="password" show-password/>
+      </div>
+      <div style="font-weight: 400;font-size: 14px;text-align: left;color: #3d4566;margin-top: 12px;">
+        <div style="color: red;display: inline-block;">*</div>
+        新密码：
+      </div>
+      <div class="input-46" style="margin-top: 12px;">
+        <el-input placeholder="请输入新密码" v-model="newPassword" type="password" show-password/>
+      </div>
+      <div style="font-weight: 400;font-size: 14px;text-align: left;color: #3d4566;margin-top: 12px;">
+        <div style="color: red;display: inline-block;">*</div>
+        确认新密码：
+      </div>
+      <div class="input-46" style="margin-top: 12px;">
+        <el-input placeholder="请再次输入新密码" v-model="confirmNewPassword" type="password" show-password/>
+      </div>
+    </div>
+    <div style="display: flex;margin: 15px 15px;gap: 7px;">
+      <div class="dialog-btn" @click="confirm">
+        确定
+      </div>
+      <div class="dialog-btn"
+           style="background: #e6ebff;border: 1px solid #adbdff;color: #5778ff;"
+           @click="cancel">
+        取消
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import userApi from '@/apis/module/user';
+
+export default {
+  name: 'ChangePasswordDialog',
+  props: {
+    visible: {type: Boolean, required: true}
+  },
+  data() {
+    return {
+      oldPassword: "",
+      newPassword: "",
+      confirmNewPassword: ""
+    }
+  },
+  methods: {
+    confirm() {
+      if (!this.oldPassword.trim() || !this.newPassword.trim() || !this.confirmNewPassword.trim()) {
+        this.$message.error('请填写所有字段');
+        return;
+      }
+      if (this.newPassword !== this.confirmNewPassword) {
+        this.$message.error('两次输入的新密码不一致');
+        return;
+      }
+      if (this.newPassword === this.oldPassword) {
+        this.$message.error('新密码不能与旧密码相同');
+        return;
+      }
+
+      // 直接调用修改密码接口
+      userApi.changePassword(this.oldPassword, this.newPassword, (res) => {
+        if (res.code === 0) {
+          this.$message.error(res.msg || '密码修改失败');
+        } else {
+          this.$message.success('密码修改成功');
+          this.$emit('confirm', res);
+          this.$emit('update:visible', false);
+          this.resetForm();
+        }
+      }, (err) => {
+        this.$message.error(err.msg || '密码修改失败');
+      });
+    },
+    cancel() {
+      this.$emit('update:visible', false);
+      this.resetForm();
+    },
+    resetForm() {
+      this.oldPassword = "";
+      this.newPassword = "";
+      this.confirmNewPassword = "";
+    }
+  }
+}
+</script>
+
+<style scoped>
+.input-46 {
+  border: 1px solid #e4e6ef;
+  background: #f6f8fb;
+  border-radius: 15px;
+}
+
+.dialog-btn {
+  cursor: pointer;
+  flex: 1;
+  border-radius: 23px;
+  background: #5778ff;
+  height: 40px;
+  font-weight: 500;
+  font-size: 12px;
+  color: #fff;
+  line-height: 40px;
+  text-align: center;
+}
+
+::v-deep .el-dialog {
+  border-radius: 15px;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+}
+
+::v-deep .el-dialog__headerbtn {
+  display: none;
+}
+
+::v-deep .el-dialog__body {
+  padding: 4px 6px;
+}
+
+::v-deep .el-dialog__header {
+  padding: 10px;
+}
+</style>

main/manager-web/src/components/DeviceItem.vue

@@ -6,7 +6,7 @@
       </div>
       <div>
         <img src="@/assets/home/delete.png" alt=""
-             style="width: 18px;height: 18px;margin-right: 10px;" />
+             style="width: 18px;height: 18px;margin-right: 10px;" @click.stop="handleDelete" />
         <img src="@/assets/home/info.png" alt="" style="width: 18px;height: 18px;" />
       </div>
     </div>
@@ -17,7 +17,7 @@
       音色模型：{{ device.ttsVoiceName }}
     </div>
     <div style="display: flex;gap: 10px;align-items: center;">
-      <div class="settings-btn" @click="$emit('configure')">
+      <div class="settings-btn" @click="handleConfigure">
         配置角色
       </div>
       <div class="settings-btn">
@@ -26,7 +26,7 @@
       <div class="settings-btn">
         历史对话
       </div>
-      <div class="settings-btn"  @click="$emit('deviceManage')">
+      <div class="settings-btn"  @click="handleDeviceManage">
         设备管理
       </div>
     </div>
@@ -44,6 +44,17 @@ export default {
   },
   data() {
     return { switchValue: false }
+  },
+  methods: {
+    handleDelete() {
+      this.$emit('delete', this.device.agentId)
+    },
+    handleConfigure() {
+      this.$router.push({ path: '/role-config', query: { agentId: this.device.agentId } });
+    },
+    handleDeviceManage() {
+      this.$router.push({ path: '/device-management', query: { agentId: this.device.agentId } });
+    }
   }
 }
 </script>

main/manager-web/src/components/HeaderBar.vue

@@ -4,14 +4,14 @@
       <div style="display: flex;align-items: center;gap: 10px;">
         <img alt="" src="@/assets/xiaozhi-logo.png" style="width: 42px;height: 42px;"/>
         <img alt="" src="@/assets/xiaozhi-ai.png" style="width: 58px;height: 12px;"/>
-        <div class="equipment-management" @click="goHome">
+        <div class="equipment-management" :class="{ 'active-tab': $route.path === '/home' }" @click="goHome">
           <img alt="" src="@/assets/home/equipment.png" style="width: 12px;height: 10px;"/>
           智能体管理
         </div>
-        <div class="equipment-management2" :class="{ 'active-tab': $route.path === '/user-management' }" @click="goUserManagement">
+        <div class="equipment-management" :class="{ 'active-tab': $route.path === '/user-management' }" @click="goUserManagement">
           用户管理
         </div>
-        <div class="equipment-management2" :class="{ 'active-tab': $route.path === '/model-config' }" @click="goModelConfig">
+        <div class="equipment-management" :class="{ 'active-tab': $route.path === '/model-config' }" @click="goModelConfig">
           模型配置
         </div>
       </div>
@@ -25,25 +25,31 @@
         <img alt="" src="@/assets/home/avatar.png" style="width: 21px;height: 21px;"/>
         <el-dropdown trigger="click">
           <span class="el-dropdown-link">
-             {{ userInfo.username || '加载中...' }}<i class="el-icon-arrow-down el-icon--right"></i>
+             {{ userInfo.mobile || '加载中...' }}<i class="el-icon-arrow-down el-icon--right"></i>
           </span>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item icon="el-icon-plus" @click.native="">个人中心</el-dropdown-item>
-            <el-dropdown-item icon="el-icon-circle-plus" @click.native="">修改密码</el-dropdown-item>
+            <el-dropdown-item icon="el-icon-circle-plus" @click.native="showChangePasswordDialog">修改密码</el-dropdown-item>
             <el-dropdown-item icon="el-icon-circle-plus-outline" @click.native="">退出登录</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
       </div>
     </div>
+
+    <!-- 修改密码弹窗 -->
+    <ChangePasswordDialog :visible.sync="isChangePasswordDialogVisible" />
   </el-header>
 </template>
 
 <script>
-import userApi from '@/apis/module/user'
-
+import userApi from '@/apis/module/user';
+import ChangePasswordDialog from './ChangePasswordDialog.vue'; // 引入修改密码弹窗组件
 
 export default {
   name: 'HeaderBar',
+  components: {
+    ChangePasswordDialog
+  },
   props: ['devices'],  // 接收父组件设备列表
   data() {
     return {
@@ -51,7 +57,8 @@ export default {
       userInfo: {
         username: '',
         mobile: ''
-      }
+      },
+      isChangePasswordDialogVisible: false // 控制修改密码弹窗的显示
     }
   },
   mounted() {
@@ -93,34 +100,18 @@ export default {
       }
 
       this.$emit('search-result', filteredDevices);
+    },
+
+    // 显示修改密码弹窗
+    showChangePasswordDialog() {
+      this.isChangePasswordDialogVisible = true;
     }
-
   }
-
 }
 </script>
 
 <style scoped>
-.equipment-management,
-.equipment-management2 {
-  cursor: pointer;
-}
-
 .equipment-management {
-  width: 82px;
-  height: 24px;
-  border-radius: 12px;
-  background: #5778ff;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 7px;
-  font-weight: 500;
-  color: #fff;
-  font-size: 10px;
-}
-
-.equipment-management2 {
   width: 82px;
   height: 24px;
   border-radius: 12px;
@@ -134,9 +125,11 @@ export default {
   margin-left: 1px;
   align-items: center;
   transition: all 0.3s ease;
+  cursor: pointer;
+
 }
 
-.equipment-management2.active-tab {
+.equipment-management.active-tab {
   background: #5778ff !important;
   color: #fff !important;
 }
@@ -178,4 +171,4 @@ export default {
   color: #3d4566;
 }
 
-</style>
+</style>

main/manager-web/src/views/DeviceManagement.vue

@@ -1,20 +1,20 @@
 <template>
   <div class="welcome">
-        <HeaderBar />
+    <HeaderBar />
     <el-main style="padding: 20px; display: flex; flex-direction: column;">
       <div class="table-container">
-         <h3 class="device-list-title">设备列表</h3>
+        <h3 class="device-list-title">设备列表</h3>
         <el-button type="primary" class="add-device-btn" @click="handleAddDevice">
           + 添加设备
         </el-button>
-        <el-table :data="deviceList" style="width: 100%; margin-top: 20px" border stripe>
+        <el-table :data="paginatedDeviceList" style="width: 100%; margin-top: 20px" border stripe>
           <el-table-column label="设备型号" prop="model" flex></el-table-column>
           <el-table-column label="固件版本" prop="firmwareVersion" width="120"></el-table-column>
           <el-table-column label="Mac地址" prop="macAddress"></el-table-column>
           <el-table-column label="绑定时间" prop="bindTime" width="200"></el-table-column>
           <el-table-column label="最近对话" prop="lastConversation" width="140"></el-table-column>
           <el-table-column label="备注" width="180">
-             <template slot-scope="scope">
+            <template slot-scope="scope">
               <el-input v-if="scope.row.isEdit" v-model="scope.row.remark" size="mini" @blur="stopEditRemark(scope.$index)"></el-input>
               <span v-else>
                 <i v-if="!scope.row.remark" class="el-icon-edit" @click="startEditRemark(scope.$index, scope.row)"></i>
@@ -37,6 +37,16 @@
             </template>
           </el-table-column>
         </el-table>
+        <el-pagination
+          class="pagination"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
+          :page-sizes="[5, 10, 20, 50]"
+          :page-size="pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="deviceList.length"
+        ></el-pagination>
       </div>
       <div style="font-size: 12px; font-weight: 400; margin-top: auto; padding-top: 30px; color: #979db1;">
         ©2025 xiaozhi-esp32-server
@@ -55,43 +65,27 @@ export default {
   data() {
     return {
       addDeviceDialogVisible: false,
-      deviceList: [
-        {
-          model: 'xingzhi-cube-0.96oled-wifi',
-          firmwareVersion: '1.4.6',
-          macAddress: 'fc:01:2c:c5:d5:7c',
-          bindTime: '2025-03-10 18:16:21',
-          lastConversation: '6 天前',
-          remark: '',
-          isEdit: false,
-          otaSwitch: false
-        },
-        {
-          model: 'xingzhi-board-1.3tft-ble',
-          firmwareVersion: '2.1.0',
-          macAddress: 'ac:12:3d:e7:f8:9a',
-          bindTime: '2025-03-12 09:30:15',
-          lastConversation: '4 天前',
-          remark: '测试设备',
-          isEdit: false,
-          otaSwitch: true
-      },
-      {
-        model: 'xingzhi-kit-0.91oled-4g',
-        firmwareVersion: '1.8.3',
-        macAddress: 'bc:45:6f:1e:2d:3c',
-        bindTime: '2025-03-15 14:22:08',
-        lastConversation: '2 天前',
-        remark: '生产环境设备',
-        isEdit: false,
-        otaSwitch: false
-      },
-      ]
+      currentPage: 1,
+      pageSize: 5,
+      deviceList: [],
+      loading: false,
     };
   },
+  computed: {
+    paginatedDeviceList() {
+      const start = (this.currentPage - 1) * this.pageSize;
+      const end = start + this.pageSize;
+      return this.deviceList.slice(start, end);
+    }
+  },
+  mounted() {
+    const agentId = this.$route.query.agentId;
+    if (agentId) {
+      this.fetchBindDevices(agentId);
+    }
+  },
   methods: {
     handleAddDevice() {
-      // 添加设备逻辑
       this.addDeviceDialogVisible = true;
     },
     startEditRemark(index, row) {
@@ -101,12 +95,42 @@ export default {
       this.deviceList[index].isEdit = false;
     },
     handleUnbind(device) {
-      // 解绑逻辑
       console.log('解绑设备', device);
     },
     handleDeviceAdded(deviceCode) {
-      console.log('添加的智慧体名称：', deviceCode);
+      console.log('添加的智能体名称：', deviceCode);
     },
+    handleSizeChange(val) {
+      this.pageSize = val;
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val;
+    },
+     fetchBindDevices(agentId) {
+        this.loading = true;
+        import('@/apis/module/user').then(({ default: userApi }) => {
+          userApi.getAgentBindDevices(agentId, ({ data }) => {
+            this.loading = false;
+            if (data.code === 0) {
+              this.deviceList = data.data[0]?.list.map(device => ({
+                id: device.id,
+                model: device.device_type,
+                firmwareVersion: device.app_version,
+                macAddress: device.mac_address,
+                lastConversation: device.recent_chat_time,
+                remark: '',
+                isEdit: false,
+                otaSwitch: device.ota_upgrade === 1
+              }));
+            } else {
+              this.$message.error(data.msg || '获取设备列表失败');
+            }
+          });
+        }).catch(error => {
+          console.error('模块加载失败:', error);
+          this.$message.error('功能模块加载失败');
+        });
+     },
   }
 };
 </script>
@@ -166,4 +190,8 @@ export default {
   vertical-align: middle;
 }
 
-</style>
+.pagination {
+  margin-top: 20px;
+  text-align: right;
+}
+</style>

main/manager-web/src/views/ModelConfig.vue

@@ -1,68 +1,93 @@
 <template>
   <div class="welcome">
     <HeaderBar />
-    <div class="model-tabs-container">
-      <el-tabs v-model="activeTab" class="model-tabs" >
-        <el-tab-pane label="语音活动检测模型(VAD)" name="vad"></el-tab-pane>
-        <el-tab-pane label="语音识别(ASR)" name="asr"></el-tab-pane>
-        <el-tab-pane label="大语言模型(LLM)" name="llm"></el-tab-pane>
-        <el-tab-pane label="意图识别模型(Intent)" name="intent"></el-tab-pane>
-        <el-tab-pane label="语音合成模型(TTS)" name="tts"></el-tab-pane>
-        <el-tab-pane label="记忆模型(Memory)" name="memory"></el-tab-pane>
-      </el-tabs>
-      <div class="import-export-btn">
-        <el-button v-if="activeTab === 'tts'" type="primary" @click="ttsDialogVisible = true" style="margin-right: 10px;">模型设置</el-button>
-        <el-button size="small" @click="handleImportExport">导入导出配置</el-button>
+    <div class="model-container">
+      <el-menu :default-active="activeTab" class="el-menu-vertical-demo" @select="handleMenuSelect">
+        <el-menu-item index="vad">语音活动检测</el-menu-item>
+        <el-menu-item index="asr">语音识别</el-menu-item>
+        <el-menu-item index="llm">大语言模型</el-menu-item>
+        <el-menu-item index="intent">意图识别</el-menu-item>
+        <el-menu-item index="tts">语音合成</el-menu-item>
+        <el-menu-item index="memory">记忆</el-menu-item>
+      </el-menu>
+      <div class="content-container">
+        <div class="import-export-btn">
+          <el-button v-if="activeTab === 'tts'" type="primary" @click="ttsDialogVisible = true" style="margin-right: 10px;">
+            模型设置
+          </el-button>
+          <el-button size="small" @click="handleImportExport">导入导出配置</el-button>
+        </div>
+        <el-main style="padding: 20px; display: flex; flex-direction: column;">
+          <el-card class="model-card" shadow="always">
+            <div class="model-header">
+              <h2>大语言模型 (LLM)</h2>
+              <el-button type="primary" @click="addModel" class="add-btn">添加</el-button>
+            </div>
+            <div class="model-search-operate" style="margin-bottom: 20px;">
+              <el-input
+                placeholder="请输入模型名称查询"
+                v-model="search"
+                style="width: 300px; margin-right: 10px"
+              />
+              <el-button @click="handleSearch">查询</el-button>
+            </div>
+            <el-table
+              :data="modelList"
+              style="width: 100%;"
+              border
+              stripe
+              header-cell-class-name="header-cell"
+            >
+              <el-table-column type="selection" width="55"></el-table-column>
+              <el-table-column label="模型名称" prop="candidateName"></el-table-column>
+              <el-table-column label="模型编码" prop="code"></el-table-column>
+              <el-table-column label="提供商" prop="supplier"></el-table-column>
+              <el-table-column label="是否启用">
+                <template slot-scope="scope">
+                  <el-switch v-model="scope.row.isApplied" active-color="#409EFF" inactive-color="#C0CCDA"></el-switch>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作">
+                <template slot-scope="scope">
+                  <el-button
+                    size="mini"
+                    @click="editModel(scope.row)"
+                    style="margin-right: 5px;"
+                    type="text"
+                    class="action-btn"
+                  >修改</el-button>
+                  <el-button
+                    size="mini"
+                    type="danger"
+                    @click="deleteModel(scope.row)"
+                    class="action-btn"
+                  >删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+            <div class="table-footer">
+              <el-button @click="selectAll" class="footer-btn">全选</el-button>
+              <el-button type="danger" @click="batchDelete" class="footer-btn">删除</el-button>
+            </div>
+          </el-card>
+          <div class="pagination-container">
+            <el-pagination
+              @current-change="handleCurrentChange"
+              :current-page="currentPage"
+              :page-sizes="[5, 10, 15]"
+              :page-size="pageSize"
+              layout="prev, pager, next"
+              :total="total"
+            />
+          </div>
+          <div class="copyright">
+            ©2025 xiaozhi-esp32-server
+          </div>
+          <ModelEditDialog :visible.sync="editDialogVisible" :modelData="editModelData" @save="handleModelSave"/>
+          <TtsModel :visible.sync="ttsDialogVisible" />
+        </el-main>
       </div>
     </div>
-
-    <el-main style="padding: 20px; display: flex; flex-direction: column;">
-
-      <el-card class="model-card" shadow="always">
-        <div class="model-search-operate" style="display: flex; align-items: center; margin-bottom: 20px;">
-          <el-input placeholder="请输入模型名称查询" v-model="search" style="width: 300px; margin-right: 10px" />
-          <el-button @click="handleSearch">查询</el-button>
-          <el-button type="primary" @click="addModel">增加模型</el-button>
-          <el-button type="danger" @click="batchDelete">批量删除</el-button>
-        </div>
-
-        <el-table :data="modelList" style="width: 100%;" border stripe>
-          <el-table-column label="模型编码" prop="code"></el-table-column>
-          <el-table-column label="模型名称" prop="candidateName"></el-table-column>
-          <el-table-column label="是否应用">
-            <template slot-scope="scope">
-              <el-tag :type="scope.row.isApplied ? 'success' : 'danger'">
-                {{ scope.row.isApplied ? '是' : '否' }}
-              </el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column label="供应商名称" prop="supplier"></el-table-column>
-          <el-table-column label="操作">
-            <template slot-scope="scope">
-              <el-button size="mini" @click="editModel(scope.row)" style="margin-right: 10px;">修改</el-button>
-              <el-button size="mini" type="danger" @click="deleteModel(scope.row)">删除</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-card>
-
-      <div class="pagination-container">
-        <el-pagination
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-sizes="[5, 10, 15]"
-          :page-size="pageSize"
-          layout="prev, pager, next"
-          :total="total"
-        />
-      </div>
-
-      <div style="font-size: 12px; font-weight: 400; margin-top: auto; padding-top: 30px; color: #979db1;">
-        ©2025 xiaozhi-esp32-server
-      </div>
-        <ModelEditDialog :visible.sync="editDialogVisible" :modelData="editModelData" @save="handleModelSave"/>
-        <TtsModel :visible.sync="ttsDialogVisible" />
-    </el-main>
   </div>
 </template>
 
@@ -75,16 +100,15 @@ export default {
   components: { HeaderBar, ModelEditDialog, TtsModel },
   data() {
     return {
-      activeTab: 'vad',
+      activeTab: 'llm',
       search: '',
       editDialogVisible: false,
       editModelData: {},
       ttsDialogVisible: false,
       modelList: [
-        { code: 'AILLM', candidateName: '阿里百炼', isApplied: true, supplier: 'openai' },
-        { code: 'DoubaoLLM', candidateName: '豆包大模型', isApplied: true, supplier: 'openai' },
-        { code: 'DeepSeekLLM', candidateName: '深度求索', isApplied: true, supplier: 'openai' },
-        { code: 'DifyLLM', candidateName: 'DifChat', isApplied: true, supplier: 'dify' },
+        { code: 'DeepSeek', candidateName: '深度求索', isApplied: true, supplier: '硅基流动' },
+        { code: 'SmartAssist', candidateName: '智能助手', isApplied: false, supplier: '智脑科技' },
+        { code: 'CogEngine', candidateName: '认知引擎', isApplied: true, supplier: '云智科技' },
       ],
       currentPage: 1,
       pageSize: 4,
@@ -92,19 +116,18 @@ export default {
     };
   },
   methods: {
-    // 查询
+    handleMenuSelect(index) {
+      this.activeTab = index;
+    },
     handleSearch() {
       console.log('查询：', this.search);
     },
-    // 批量删除
     batchDelete() {
       console.log('批量删除');
     },
-    // 增加
     addModel() {
       console.log('增加模型');
     },
-    // 修改
     editModel(model) {
       this.editModelData = {
         code: model.code,
@@ -113,7 +136,6 @@ export default {
       };
       this.editDialogVisible = true;
     },
-    // 删除
     deleteModel(model) {
       console.log('删除：', model);
     },
@@ -121,14 +143,15 @@ export default {
       this.currentPage = page;
       console.log('当前页码：', page);
     },
-    // 导入导出
     handleImportExport() {
       console.log('导入导出');
     },
     handleModelSave(formData) {
-      // 处理保存
       console.log('保存的模型数据：', formData);
     },
+    selectAll() {
+      console.log('全选');
+    }
   }
 };
 </script>
@@ -147,8 +170,31 @@ export default {
   -o-background-size: cover;
 }
 
-.model-search-operate {
+.model-container {
+  display: flex;
+  margin-top: 25px;
+}
+
+.el-menu-vertical-demo {
+  width: 250px;
+  margin-right: 20px;
+  background-color: #f8f9fa;
+}
+
+.content-container {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+}
+
+.model-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
   margin-bottom: 20px;
+}
+
+.model-search-operate {
   display: flex;
   align-items: center;
 }
@@ -160,6 +206,7 @@ export default {
 .el-table__header th {
   background-color: #f5f7fa;
   color: #606266;
+  font-weight: 500;
 }
 
 .model-card {
@@ -169,22 +216,11 @@ export default {
   box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
 }
 
-.model-tabs-container {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 25px;
-}
-
-.model-tabs {
-  flex-grow: 0;
-  margin-right: 20px;
-}
-
 .import-export-btn {
-  margin-right: 40px;
   margin-bottom: 20px;
-
+  display: flex;
+  justify-content: flex-end;
+  margin-right: 40px;
 }
 
 .pagination-container {
@@ -193,7 +229,40 @@ export default {
   justify-content: flex-end;
 }
 
-::v-deep .el-tabs {
-  margin-left: 70px;
+.table-footer {
+  margin-top: 20px;
+  display: flex;
+  align-items: center;
+}
+
+.footer-btn {
+  margin-right: 10px;
+}
+
+.copyright {
+  font-size: 12px;
+  font-weight: 400;
+  color: #979db1;
+  margin-top: auto;
+  padding-top: 30px;
+  text-align: center;
+}
+
+.action-btn {
+  padding: 0 8px;
+}
+
+.header-cell {
+  font-weight: 500;
+}
+
+.add-btn {
+  margin-right: 830px;
+  padding: 8px 16px;
+  border-radius: 4px;
+  background-color: #409eff;
+  color: white;
+  border: none;
+  cursor: pointer;
 }
 </style>

main/manager-web/src/views/UserManagement.vue

@@ -1,46 +1,68 @@
 <template>
   <div class="welcome">
     <HeaderBar />
-    <el-main style="padding: 20px; display: flex; flex-direction: column;">
-      <el-card class="user-card" shadow="always" >
-      <div class="user-search-operate" style="display: flex; align-items: center; margin-bottom: 20px;">
-        <el-input placeholder="请输入手机号码查询" v-model="searchPhone" style="width: 300px; margin-right: 10px" />
-        <el-button @click="handleSearch">查询</el-button>
-        <el-button type="danger" @click="batchDelete">批量删除</el-button>
-        <el-button type="danger" @click="batchDisable">批量禁用</el-button>
+    <el-main class="main" style="padding: 20px; display: flex; flex-direction: column;">
+      <div class="top-area">
+        <div class="page-title">用户管理</div>
+        <div class="page-search">
+          <el-input placeholder="请输入手机号码查询" v-model="searchPhone" style="width: 300px; margin-right: 10px" />
+          <el-button class="btn-search" @click="handleSearch">搜索</el-button>
+          <!-- <el-button type="danger" @click="batchDelete">批量删除</el-button>
+          <el-button type="danger" @click="batchDisable">批量禁用</el-button> -->
+        </div>
       </div>
       
-      <el-table :data="userList" style="width: 100%;" border stripe>
-        <el-table-column label="用户Id" prop="userId"></el-table-column>
-        <el-table-column label="手机号码" prop="phone"></el-table-column>
-        <el-table-column label="Status" prop="status"></el-table-column>
-        <el-table-column label="设备数量" prop="deviceCount"></el-table-column>
-        <el-table-column label="操作">
-          <template slot-scope="scope">
-            <el-button size="mini" @click="resetPassword(scope.row)">重置密码</el-button>
-            <el-button size="mini"
+      <el-card class="user-card" shadow="never">
+        <!-- <div class="user-search-operate" style="display: flex; align-items: center; margin-bottom: 20px;">
+          <el-input placeholder="请输入手机号码查询" v-model="searchPhone" style="width: 300px; margin-right: 10px" />
+          <el-button @click="handleSearch">查询</el-button>
+          <el-button type="danger" @click="batchDelete">批量删除</el-button>
+          <el-button type="danger" @click="batchDisable">批量禁用</el-button>
+        </div> -->
+        <el-table :data="userList" style="width: 100%;">
+          <el-table-column label="选择"
+            type="selection"
+            width="55">
+            </el-table-column>
+          <el-table-column label="用户Id" prop="user_id"></el-table-column>
+          <el-table-column label="手机号码" prop="mobile"></el-table-column>
+          <el-table-column label="设备数量" prop="device_count"></el-table-column>
+          <el-table-column label="状态" prop="status"></el-table-column>
+          <el-table-column label="操作">
+            <template slot-scope="scope">
+            <el-button size="mini" type="text" @click="resetPassword(scope.row)">重置密码</el-button>
+            <el-button size="mini" type="text"
               v-if="scope.row.status === '正常'"
               @click="disableUser(scope.row)">禁用</el-button>
-            <el-button size="mini"
+            <el-button size="mini" type="text"
               v-if="scope.row.status === '禁用'"
               @click="restoreUser(scope.row)">恢复</el-button>
-            <el-button size="mini" @click="deleteUser(scope.row)" style="color: #ff4949">删除用户</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
+            <el-button size="mini" type="text" @click="deleteUser(scope.row)" style="color: #ff4949">删除用户</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+		  
+        <div class="table_bottom">
+          <div class="ctrl_btn">
+            <el-button size="mini" type="primary">全选</el-button>
+            <el-button size="mini" type="success" icon="el-icon-circle-check">启用</el-button>
+            <el-button size="mini" type="warning" icon="el-icon-circle-close">禁用</el-button>
+            <el-button size="mini" type="danger" icon="el-icon-delete">删除</el-button>
+          </div>
+          <div class="pagination-container">
+            <el-pagination
+              background
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-sizes="[5, 10, 15]"
+            :page-size="pageSize"
+            layout="prev, pager, next"
+            :total="total"
+            />
+          </div>
+        </div>
       </el-card>
 
-      <div class="pagination-container">
-        <el-pagination
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-sizes="[5, 10, 15]"
-          :page-size="pageSize"
-          layout="prev, pager, next"
-          :total="total"
-        />
-      </div>
-
       <div style="font-size: 12px; font-weight: 400; margin-top: auto; padding-top: 30px; color: #979db1;">
         ©2025 xiaozhi-esp32-server
       </div>
@@ -50,6 +72,9 @@
 
 <script>
 import HeaderBar from "@/components/HeaderBar.vue";
+import Api from '@/apis/api';
+import adminApi from '@/apis/module/admin';
+
 
 export default {
   components: { HeaderBar },
@@ -67,6 +92,13 @@ export default {
       total: 20
     };
   },
+  created() {
+    adminApi.getUserList(({data}) => {
+      //mock偶尔会返回-1导致出错，又会返回两个list，所以这里只取第一个
+      this.userList = data.data[0].list;
+      console.log('用户列表：', this.userList);
+    })
+  },
   methods: {
     handleSearch() {
       // 模拟搜索逻辑
@@ -100,7 +132,32 @@ export default {
 };
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
+.main {
+  padding: 20px; display: flex; flex-direction: column;
+  background: linear-gradient(to bottom right, #dce8ff, #e4eeff, #e6cbfd);
+}
+.top-area {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 20px;
+  .page-title {
+    font-size: 20px;
+    font-weight: 600;
+    color: #303133;
+  }
+  .page-search {
+    display: flex;
+    align-items: center;
+    .btn-search {
+      margin-left: 10px;
+      background: linear-gradient(to right, #5778ff, #c793f3);
+      width: 100px;
+      color: #fff;
+    }
+  }
+}
 .welcome {
   min-width: 900px;
   min-height: 506px;
@@ -133,11 +190,22 @@ export default {
   background: #fff;
   border-radius: 12px;
   padding: 20px;
-  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  opacity: 0.9;
+  // box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+}
+
+.table_bottom {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-top: 20px;
+  .ctrl_btn {
+    display: flex;
+    align-items: center;
+  }
 }
 
 .pagination-container {
-  margin-top: 20px;
   display: flex;
   justify-content: flex-end;
 }

main/manager-web/src/views/home.vue

@@ -31,7 +31,11 @@
             </div>
           </div>
           <div style="display: flex;flex-wrap: wrap;margin-top: 20px;gap: 20px;justify-content: flex-start;box-sizing: border-box;">
-            <DeviceItem v-for="(item,index) in devices" :key="index" :device="item" @configure="goToRoleConfig" @deviceManage="handleDeviceManage" />
+            <DeviceItem v-for="(item,index) in devices" :key="index" :device="item"
+                        @configure="goToRoleConfig"
+                        @deviceManage="handleDeviceManage"
+                        @delete="handleDeleteAgent"
+            />
           </div>
         </div>
         <div style="font-size: 12px;font-weight: 400;margin-top: auto;padding-top: 30px;color: #979db1;">
@@ -83,16 +87,37 @@ export default {
     fetchAgentList() {
       import('@/apis/module/user').then(({ default: userApi }) => {
         userApi.getAgentList(({data}) => {
-          this.originalDevices = data.data;
-          this.devices = data.data;
+        this.originalDevices = data.data.map(item => ({
+          ...item,
+          agentId: item.id // 字段映射
+        }));
+        this.devices = this.originalDevices;
         });
       });
     },
     // 搜索更新智能体列表
     handleSearchResult(filteredList) {
       this.devices = filteredList; // 更新设备列表
+    },
+    // 删除智能体
+    handleDeleteAgent(agentId) {
+      this.$confirm('确定要删除该智能体吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        import('@/apis/module/user').then(({ default: userApi }) => {
+          userApi.deleteAgent(agentId, (res) => {
+            if (res.data.code === 0) {
+              this.$message.success('删除成功');
+              this.fetchAgentList(); // 刷新列表
+            } else {
+              this.$message.error(res.data.msg || '删除失败');
+            }
+          });
+        });
+      }).catch(() => {});
     }
-
   }
 }
 </script>

main/manager-web/src/views/roleConfig.vue

@@ -1,6 +1,5 @@
 <template>
   <div class="welcome">
-    <!-- 公共头部 -->
     <HeaderBar/>
     <el-main style="padding: 16px;display: flex;flex-direction: column;">
       <div style="border-radius: 16px;background: #fafcfe; border: 1px solid #e8f0ff;">
@@ -17,7 +16,7 @@
           <div style="padding: 16px 24px;max-width: 792px;">
             <el-form-item label="助手昵称：">
               <div class="input-46" style="width: 100%; max-width: 412px;">
-                <el-input v-model="form.name"/>
+                <el-input v-model="form.agentName"/>
               </div>
             </el-form-item>
             <el-form-item label="角色模版：">
@@ -30,7 +29,7 @@
             <el-form-item label="角色音色：">
               <div style="display: flex;gap: 8px;align-items: center;">
                 <div class="input-46" style="flex:1.4;">
-                  <el-select v-model="form.timbre" placeholder="请选择" style="width: 100%;">
+                  <el-select v-model="form.ttsVoiceId" placeholder="请选择" style="width: 100%;">
                     <el-option v-for="item in options" :key="item.value" :label="item.label"
                                :value="item.value">
                     </el-option>
@@ -45,14 +44,14 @@
             <el-form-item label="角色介绍：">
               <div class="textarea-box">
                 <el-input type="textarea" rows="5" resize="none" placeholder="请输入内容"
-                          v-model="form.introduction" maxlength="2000" show-word-limit/>
+                          v-model="form.systemPrompt" maxlength="2000" show-word-limit/>
               </div>
             </el-form-item>
             <el-form-item label="记忆体：">
               <div class="textarea-box">
                 <el-input type="textarea" rows="5" resize="none" placeholder="请输入内容"
-                          v-model="form.prompt" maxlength="1000"/>
-                <div class="prompt-bottom">
+                          v-model="form.langCode" maxlength="1000"/>
+                <div class="prompt-bottom" @click="clearMemory">
                   <div style="display: flex;gap: 8px;align-items: center;">
                     <div style="color: #979db1;font-size: 11px;">当前记忆（每次对话后重新生成）</div>
                     <div class="clear-btn">
@@ -60,7 +59,7 @@
                       清除
                     </div>
                   </div>
-                  <div style="color: #979db1;font-size:11px;">{{ form.prompt.length }}/1000</div>
+                  <div style="color: #979db1;font-size:11px;">{{ form.langCode.length }}/1000</div>
                 </div>
               </div>
             </el-form-item>
@@ -106,39 +105,63 @@ export default {
     return {
       deviceMac: 'CC:ba:97:11:a6:ac',
       form: {
-        name: "",
-        timbre: "",
-        introduction: "",
-        prompt: "",
+        agentCode:"",
+        agentName: "",
+        ttsVoiceId: "",
+        systemPrompt: "",
+        langCode:"",
+        language:"",
+        sort:"",
         model: {
-          tts: "",
-          vad: "",
-          asr: "",
-          llm: "",
-          memory:"",
-          intent:""
+          ttsModelId: "",
+          vadModelId: "",
+          asrModelId:"",
+          llmModelId: "",
+          memModelId: "",
+          intentModelId: "",
         }
       },
-    options: [
-      { value: '选项1', label: '黄金糕' },
-      { value: '选项2', label: '双皮奶' }
-    ],
+      options: [
+        { value: '选项1', label: '黄金糕' },
+        { value: '选项2', label: '双皮奶' }
+      ],
       models: [
-      { label: '大语言模型(LLM)', key: 'llm' },
-      { label: '语音识别(ASR)', key: 'asr' },
-      { label: '语音活动检测模型(VAD)', key: 'vad' },
-      { label: '语音合成模型(TTS)', key: 'tts' },
-      { label: '意图识别模型(Intent)', key: 'intent' },
-      { label: '记忆模型(Memory)', key: 'memory' }
-    ],
+        { label: '大语言模型(LLM)', key: 'llmModelId' },
+        { label: '语音识别(ASR)', key: 'asrModelId' },
+        { label: '语音活动检测模型(VAD)', key: 'vadModelId' },
+        { label: '语音合成模型(TTS)', key: 'ttsModelId' },
+        { label: '意图识别模型(Intent)', key: 'intentModelId' },
+        { label: '记忆模型(Memory)', key: 'memModelId' }
+      ],
       templates: ['台湾女友', '土豆子', '英语老师', '好奇小男孩', '汪汪队队长']
-
     }
   },
   methods: {
     saveConfig() {
-      // 此处写保存配置逻辑
-      this.$message.success('配置已保存')
+        const configData = {
+            agentCode: this.form.agentCode,
+            agentName: this.form.agentName,
+            asrModelId: this.form.model.asrModelId,
+            vadModelId: this.form.model.vadModelId,
+            llmModelId: this.form.model.llmModelId,
+            ttsModelId: this.form.model.ttsModelId,
+            ttsVoiceId: this.form.ttsVoiceId,
+            memModelId: this.form.model.memModelId,
+            intentModelId: this.form.model.intentModelId,
+            systemPrompt: this.form.systemPrompt,
+            langCode: this.form.langCode,
+            language: this.form.language,
+            sort: this.form.sort
+        };
+        import('@/apis/module/user').then(({ default: userApi }) => {
+            userApi.updateAgentConfig(this.$route.query.agentId, configData, ({data}) => {
+                if (data.code === 0) {
+                    this.$message.success('配置保存成功');
+                } else {
+                    this.$message.error(data.msg || '配置保存失败');
+                }
+            });
+        });
     },
     resetConfig() {
       this.$confirm('确定要重置配置吗？', '提示', {
@@ -148,20 +171,63 @@ export default {
       }).then(() => {
         // 重置表单
         this.form = {
-          name: "",
-          timbre: "",
-          introduction: "",
-          prompt: "",
-          model: ""
+          agentCode:"",
+          agentName: "",
+          ttsVoiceId: "",
+          systemPrompt: "",
+          langCode:"",
+          language:"",
+          sort:"",
+          model: {
+            ttsModelId: "",
+            vadModelId: "",
+            asrModelId:"",
+            llmModelId: "",
+            memModelId: "",
+            intentModelId: "",
+          }
         }
         this.$message.success('配置已重置')
       }).catch(() => {
       })
     },
-    // 处理选择模板的逻辑
     selectTemplate(template) {
       this.form.name = template;
       this.$message.success(`已选择模板：${template}`);
+    },
+    fetchAgentConfig(agentId) {
+      import('@/apis/module/user').then(({ default: userApi }) => {
+        userApi.getDeviceConfig(agentId, ({ data }) => {
+          if (data.code === 0) {
+            this.form = {
+              ...this.form,
+              ...data.data,
+              model: {
+                ttsModelId: data.data.ttsModelId,
+                vadModelId: data.data.vadModelId,
+                asrModelId: data.data.asrModelId,
+                llmModelId: data.data.llmModelId,
+                memModelId: data.data.memModelId,
+                intentModelId: data.data.intentModelId
+              }
+            };
+          } else {
+            this.$message.error(data.msg || '获取配置失败');
+          }
+        });
+      });
+    },
+    // 清空记忆体内容
+    clearMemory() {
+      this.form.langCode = "";
+      this.$message.success("记忆体已清空");
+    },
+},
+  mounted() {
+    const agentId = this.$route.query.agentId;
+    console.log('agentId2222',agentId);
+    if (agentId) {
+      this.fetchAgentConfig(agentId);
     }
   }
 }

main/xiaozhi-server/config.yaml

@@ -24,9 +24,9 @@ server:
     #  - "24:0A:C4:1D:3B:F0"  # MAC地址列表
 log:
   # 设置控制台输出的日志格式，时间、日志级别、标签、消息
-  log_format: "<green>{time:YY-MM-DD HH:mm:ss}</green>[<light-blue>{extra[tag]}</light-blue>] - <level>{level}</level> - <light-green>{message}</light-green>"
+  log_format: "<green>{time:YYMMDD HH:mm:ss}</green>[{version}_{selected_module}][<light-blue>{extra[tag]}</light-blue>]-<level>{level}</level>-<light-green>{message}</light-green>"
   # 设置日志文件输出的格式，时间、日志级别、标签、消息
-  log_format_simple: "{time:YYYY-MM-DD HH:mm:ss} - {name} - {level} - {extra[tag]} - {message}"
+  log_format_file: "{time:YYYY-MM-DD HH:mm:ss} - {version}_{selected_module} - {name} - {level} - {extra[tag]} - {message}"
   # 设置日志等级：INFO、DEBUG
   log_level: INFO
   # 设置日志路径

main/xiaozhi-server/config/logger.py

@@ -3,12 +3,24 @@ import sys
 from loguru import logger
 from config.settings import load_config
 
+SERVER_VERSION = "0.1.15"
+
 def setup_logging():
     """从配置文件中读取日志配置，并设置日志输出格式和级别"""
     config = load_config()
     log_config = config["log"]
-    log_format = log_config.get("log_format", "<green>{time:YY-MM-DD HH:mm:ss}</green>[<light-blue>{extra[tag]}</light-blue>] - <level>{level}</level> - <light-green>{message}</light-green>")
-    log_format_simple = log_config.get("log_format_file", "{time:YYYY-MM-DD HH:mm:ss} - {name} - {level} - {extra[tag]} - {message}")
+    log_format = log_config.get("log_format", "<green>{time:YYMMDD HH:mm:ss}</green>[{version}_{selected_module}][<light-blue>{extra[tag]}</light-blue>]-<level>{level}</level>-<light-green>{message}</light-green>")
+    log_format_file = log_config.get("log_format_file", "{time:YYYY-MM-DD HH:mm:ss} - {version_{selected_module}} - {name} - {level} - {extra[tag]} - {message}")
+
+    selected_module = config.get("selected_module")
+    selected_module_str = ''.join([key[0] + value[0] for key, value in selected_module.items()])
+
+    log_format = log_format.replace("{version}", SERVER_VERSION)
+    log_format = log_format.replace("{selected_module}", selected_module_str)
+    log_format_file = log_format_file.replace("{version}", SERVER_VERSION)
+    log_format_file = log_format_file.replace("{selected_module}", selected_module_str)
+
+
     log_level = log_config.get("log_level", "INFO")
     log_dir = log_config.get("log_dir", "tmp")
     log_file = log_config.get("log_file", "server.log")
@@ -24,6 +36,6 @@ def setup_logging():
     logger.add(sys.stdout, format=log_format, level=log_level)
 
     # 输出到文件
-    logger.add(os.path.join(log_dir, log_file), format=log_format_simple, level=log_level)
+    logger.add(os.path.join(log_dir, log_file), format=log_format_file, level=log_level)
 
     return logger

main/xiaozhi-server/core/connection.py

@@ -184,15 +184,15 @@ class ConnectionHandler:
             await handleAudioMessage(self, message)
 
     def _initialize_components(self):
-        """加载插件"""
-        self.func_handler = FunctionHandler(self)
-
         """加载提示词"""
         self.prompt = self.config["prompt"]
         if self.private_config:
             self.prompt = self.private_config.private_config.get("prompt", self.prompt)
         self.dialogue.put(Message(role="system", content=self.prompt))
 
+        """加载插件"""
+        self.func_handler = FunctionHandler(self)
+
         """加载记忆"""
         device_id = self.headers.get("device-id", None)
         self.memory.init_memory(device_id, self.llm)
@@ -323,7 +323,9 @@ class ConnectionHandler:
             self.dialogue.put(Message(role="user", content=query))
 
         # Define intent functions
-        functions = self.func_handler.get_functions()
+        functions = None
+        if hasattr(self, 'func_handler'):
+            functions = self.func_handler.get_functions()
 
         response_message = []
         processed_chars = 0  # 跟踪已处理的字符位置

main/xiaozhi-server/core/handle/helloHandle.py

@@ -45,12 +45,14 @@ async def checkWakeupWords(conn, text):
 
 def getWakeupWordFile(file_name):
     for file in os.listdir(WAKEUP_CONFIG["dir"]):
-        if "my_"+file_name in file:
-            return f"config/assets/{file}"
+        if file.startswith("my_" + file_name):
+            """避免缓存文件是一个空文件"""
+            if os.stat(f"config/assets/{file}").st_size > (5 * 1024):
+                return f"config/assets/{file}"
 
     """查找config/assets/目录下名称为wakeup_words的文件"""
     for file in os.listdir(WAKEUP_CONFIG["dir"]):
-        if file_name in file:
+        if file.startswith(file_name):
             return f"config/assets/{file}"
     return None
 
@@ -64,9 +66,9 @@ async def wakeupWordsResponse(conn):
         file_type = os.path.splitext(tts_file)[1]
         if file_type:
             file_type = file_type.lstrip('.')
-        old_file = getWakeupWordFile("my_" +WAKEUP_CONFIG["file_name"])
+        old_file = getWakeupWordFile("my_" + WAKEUP_CONFIG["file_name"])
         if old_file is not None:
             os.remove(old_file)
         """将文件挪到"wakeup_words.mp3"""
-        shutil.move(tts_file, WAKEUP_CONFIG["dir"] + "my_" +WAKEUP_CONFIG["file_name"] + "." + file_type)
+        shutil.move(tts_file, WAKEUP_CONFIG["dir"] + "my_" + WAKEUP_CONFIG["file_name"] + "." + file_type)
         WAKEUP_CONFIG["create_time"] = time.time()

main/xiaozhi-server/core/handle/sendAudioHandle.py

@@ -28,33 +28,33 @@ async def sendAudioMessage(conn, audios, text, text_index=0):
 # 播放音频
 async def sendAudio(conn, audios):
     # 流控参数优化
-    original_frame_duration = 60  # 原始帧时长（毫秒）
-    adjusted_frame_duration = int(original_frame_duration * 0.8)  # 缩短20%
-    total_frames = len(audios)  # 获取总帧数
-    compensation = total_frames * (original_frame_duration - adjusted_frame_duration) / 1000  # 补偿时间（秒）
-
+    frame_duration = 60  # 帧时长（毫秒），匹配 Opus 编码
     start_time = time.perf_counter()
-    play_position = 0  # 已播放时长（毫秒）
+    play_position = 0
 
-    for opus_packet in audios:
+    # 预缓冲：发送前 3 帧
+    pre_buffer = min(3, len(audios))
+    for i in range(pre_buffer):
+        await conn.websocket.send(audios[i])
+        conn.logger.bind(tag=TAG).debug(f"预缓冲帧 {i}, 时间: {(time.perf_counter() - start_time) * 1000:.2f}ms")
+
+    # 正常播放剩余帧
+    for opus_packet in audios[pre_buffer:]:
         if conn.client_abort:
             return
-
-        # 计算带加速因子的预期时间
+        
+        # 计算预期发送时间
         expected_time = start_time + (play_position / 1000)
         current_time = time.perf_counter()
-
-        # 流控等待（使用加速后的帧时长）
         delay = expected_time - current_time
         if delay > 0:
             await asyncio.sleep(delay)
 
         await conn.websocket.send(opus_packet)
-        play_position += adjusted_frame_duration  # 使用调整后的帧时长
+        conn.logger.bind(tag=TAG).debug(f"发送帧，位置: {play_position}ms, 实际间隔: {(time.perf_counter() - current_time) * 1000:.2f}ms")
+
+        play_position += frame_duration
 
-    # 补偿因加速损失的时长
-    if compensation > 0:
-        await asyncio.sleep(compensation)
 
 
 async def send_tts_message(conn, state, text=None):

main/xiaozhi-server/core/providers/tts/edge.py

@@ -14,5 +14,14 @@ class TTSProvider(TTSProviderBase):
         return os.path.join(self.output_file, f"tts-{datetime.now().date()}@{uuid.uuid4().hex}{extension}")
 
     async def text_to_speak(self, text, output_file):
-        communicate = edge_tts.Communicate(text, voice=self.voice)  # Use your preferred voice
-        await communicate.save(output_file)
+        communicate = edge_tts.Communicate(text, voice=self.voice)
+        # 确保目录存在并创建空文件
+        os.makedirs(os.path.dirname(output_file), exist_ok=True)
+        with open(output_file, 'wb') as f:
+            pass
+        
+        # 流式写入音频数据
+        with open(output_file, 'ab') as f:  # 改为追加模式避免覆盖
+            async for chunk in communicate.stream():
+                if chunk["type"] == "audio":  # 只处理音频数据块
+                    f.write(chunk["data"])

main/xiaozhi-server/core/websocket_server.py

@@ -63,8 +63,6 @@ class WebSocketServer:
         server_config = self.config["server"]
         host = server_config["ip"]
         port = server_config["port"]
-        selected_module = self.config.get("selected_module")
-        self.logger.bind(tag=TAG).info(f"selected_module values: {', '.join(selected_module.values())}")
 
         self.logger.bind(tag=TAG).info("Server is running at ws://{}:{}", get_local_ip(), port)
         self.logger.bind(tag=TAG).info("=======上面的地址是websocket协议地址，请勿用浏览器访问=======")

main/xiaozhi-server/plugins_func/functions/get_time.py

@@ -1,11 +1,12 @@
 from datetime import datetime
+import cnlunar
 from plugins_func.register import register_function, ToolType, ActionResponse, Action
 
 get_time_function_desc = {
     "type": "function",
     "function": {
         "name": "get_time",
-        "description": "获取当前时间、日期、星期几",
+        "description": "获取当前日期、时间和农历、黄历等信息",
         'parameters': {'type': 'object', 'properties': {}, 'required': []}
     }
 }
@@ -14,12 +15,37 @@ get_time_function_desc = {
 @register_function('get_time', get_time_function_desc, ToolType.WAIT)
 def get_time():
     """
-    获取当前时间、日期、星期几
+    获取当前日期、时间和农历、黄历等信息
     """
     now = datetime.now()
     current_time = now.strftime("%H:%M:%S")
     current_date = now.strftime("%Y-%m-%d")
     current_weekday = now.strftime("%A")
-    response_text = f"当前日期: {current_date}，当前时间: {current_time}，星期: {current_weekday}"
+    response_text = f"根据以下信息，回应用户的时间查询请求，默认仅回应公历信息；如果用户询问阴历或农历日期，则回应农历日期；如果用户要求提供更多信息，则回应黄历信息\n"
+
+    lunar = cnlunar.Lunar(now, godType='8char')
+    response_text += (
+        f"当前日期: {current_date}，当前时间: {current_time}，星期: {current_weekday}\n"
+        "农历信息：\n"
+        "%s年%s%s\n" % (lunar.lunarYearCn, lunar.lunarMonthCn[:-1], lunar.lunarDayCn) +
+        "干支: %s年 %s月 %s日\n" % (lunar.year8Char, lunar.month8Char, lunar.day8Char) +
+        "生肖: 属%s\n" % (lunar.chineseYearZodiac) +
+        "八字: %s\n" % (' '.join([lunar.year8Char, lunar.month8Char, lunar.day8Char, lunar.twohour8Char])) +
+        "今日节日: %s\n" % (",".join(filter(None, (lunar.get_legalHolidays(), lunar.get_otherHolidays(), lunar.get_otherLunarHolidays())))) +
+        "今日节气: %s\n" % (lunar.todaySolarTerms) +
+        "下一节气: %s %s年%s月%s日\n" % (lunar.nextSolarTerm, lunar.nextSolarTermYear, lunar.nextSolarTermDate[0], lunar.nextSolarTermDate[1]) +
+        "今年节气表: %s\n" % (', '.join([f"{term}({date[0]}月{date[1]}日)" for term, date in lunar.thisYearSolarTermsDic.items()])) +
+        "生肖冲煞: %s\n" % (lunar.chineseZodiacClash) +
+        "星座: %s\n" % (lunar.starZodiac) +
+        "纳音: %s\n" % lunar.get_nayin() +
+        "彭祖百忌: %s\n" % (lunar.get_pengTaboo(delimit=", ")) +
+        "值日: %s执位\n" % lunar.get_today12DayOfficer()[0] +
+        "值神: %s(%s)\n" % (lunar.get_today12DayOfficer()[1], lunar.get_today12DayOfficer()[2]) +
+        "廿八宿: %s\n" % lunar.get_the28Stars() +
+        "吉神方位: %s\n" % ' '.join(lunar.get_luckyGodsDirection()) +
+        "今日胎神: %s\n" % lunar.get_fetalGod() +
+        "宜: %s\n" % '、'.join(lunar.goodThing[:10]) +
+        "忌: %s\n" % '、'.join(lunar.badThing[:10])
+    )
 
     return ActionResponse(Action.REQLLM, response_text, None)

main/xiaozhi-server/plugins_func/functions/get_weather.py

@@ -39,6 +39,23 @@ HEADERS = {
     )
 }
 
+# 天气代码 https://dev.qweather.com/docs/resource/icons/#weather-icons
+WEATHER_CODE_MAP = {
+    "100": "晴", "101": "多云", "102": "少云", "103": "晴间多云", "104": "阴",
+    "150": "晴", "151": "多云", "152": "少云", "153": "晴间多云",
+    "300": "阵雨", "301": "强阵雨", "302": "雷阵雨", "303": "强雷阵雨", "304": "雷阵雨伴有冰雹",
+    "305": "小雨", "306": "中雨", "307": "大雨", "308": "极端降雨", "309": "毛毛雨/细雨",
+    "310": "暴雨", "311": "大暴雨", "312": "特大暴雨", "313": "冻雨", "314": "小到中雨",
+    "315": "中到大雨", "316": "大到暴雨", "317": "暴雨到大暴雨", "318": "大暴雨到特大暴雨",
+    "350": "阵雨", "351": "强阵雨", "399": "雨",
+    "400": "小雪", "401": "中雪", "402": "大雪", "403": "暴雪", "404": "雨夹雪",
+    "405": "雨雪天气", "406": "阵雨夹雪", "407": "阵雪", "408": "小到中雪", "409": "中到大雪", "410": "大到暴雪",
+    "456": "阵雨夹雪", "457": "阵雪", "499": "雪",
+    "500": "薄雾", "501": "雾", "502": "霾", "503": "扬沙", "504": "浮尘",
+    "507": "沙尘暴", "508": "强沙尘暴", 
+    "509": "浓雾", "510": "强浓雾", "511": "中度霾", "512": "重度霾", "513": "严重霾", "514": "大雾", "515": "特强浓雾",
+    "900": "热", "901": "冷", "999": "未知"
+}
 
 def fetch_city_info(location, api_key):
     url = f"https://geoapi.qweather.com/v2/city/lookup?key={api_key}&location={location}&lang=zh"
@@ -67,9 +84,11 @@ def parse_weather_info(soup):
     temps_list = []
     for row in soup.select(".city-forecast-tabs__row")[:7]:  # 取前7天的数据
         date = row.select_one(".date-bg .date").get_text(strip=True)
+        weather_code = row.select_one(".date-bg .icon")["src"].split("/")[-1].split(".")[0]
+        weather = WEATHER_CODE_MAP.get(weather_code, "未知")
         temps = [span.get_text(strip=True) for span in row.select(".tmp-cont .temp")]
         high_temp, low_temp = (temps[0], temps[-1]) if len(temps) >= 2 else (None, None)
-        temps_list.append((date, high_temp, low_temp))
+        temps_list.append((date, weather, high_temp, low_temp))
 
     return city_name, current_abstract, current_basic, temps_list
 
@@ -91,13 +110,13 @@ def get_weather(conn, location: str = None, lang: str = "zh_CN"):
 
     city_name, current_abstract, current_basic, temps_list = parse_weather_info(soup)
     weather_report = f"根据下列数据，用{lang}回应用户的查询天气请求：\n{city_name}未来7天天气:\n"
-    for i, (date, high, low) in enumerate(temps_list):
+    for i, (date, weather, high, low) in enumerate(temps_list):
         if high and low:
-            weather_report += f"{date}: {low}到{high}\n"
+            weather_report += f"{date}: {low}到{high}, {weather}\n"
     weather_report += (
         f"当前天气: {current_abstract}\n"
         f"当前天气参数: {current_basic}\n"
-        f"(确保只报告指定单日的气温范围，除非用户明确要求想要了解多日天气，如果未指定，默认报告今天的温度范围。"
+        f"(确保只报告指定单日的天气情况，除非未来会出现异常天气；或者用户明确要求想要了解多日天气，如果未指定，默认报告今天的天气。"
         "参数为0的值不需要报告给用户，每次都报告体感温度，根据语境选择合适的参数内容告知用户，并对参数给出相应评价)"
     )
 

main/xiaozhi-server/requirements.txt

@@ -22,3 +22,4 @@ mem0ai==0.1.62
 bs4==0.0.2
 modelscope==1.23.2
 sherpa_onnx==1.11.0
+cnlunar==0.2.0