Merge branch 'main' into MVP

2026-07-22 07:03:53 +08:00 · 2025-03-26 19:44:02 +08:00
parent ee0da9fc3a d0fdeb33e0
commit 4b90e70aad
43 changed files with 2456 additions and 266 deletions
@@ -145,6 +145,7 @@ tmp
 .history
 .DS_Store
 main/xiaozhi-server/data
+main/xiaozhi-server/config/assets/wakeup_words.*
 main/manager-web/node_modules
 .config.yaml
 .secrets.yaml
@@ -154,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
@@ -51,7 +51,7 @@
        </a>
    </td>
    <td>
-        <a href="https://www.bilibili.com/video/av114036381327149" target="_blank">
+        <a href="https://www.bilibili.com/video/BV1pNXWYGEx1" target="_blank">
         <picture>
           <img alt="控制家电开关" src="docs/images/demo5.png" />
         </picture>
@@ -95,6 +95,11 @@
        </a>
    </td>
    <td>
+        <a href="https://www.bilibili.com/video/BV17LXWYvENb" target="_blank">
+         <picture>
+           <img alt="播报新闻" src="docs/images/demo0.png" />
+         </picture>
+        </a>
    </td>
  </tr>
 </table>
@@ -185,7 +190,6 @@ server:
 | LLM |     FastgptLLM     |     fastgpt 接口调用      | 免费/消耗 token |                                              本地化部署，注意配置提示词需在 Fastgpt 控制台设置                                              |
 | LLM |     GeminiLLM      |      gemini 接口调用      |     免费      |                                      [点击申请密钥](https://aistudio.google.com/apikey)                                       |
 | LLM |      CozeLLM       |       coze 接口调用       |  消耗 token   |                                                需提供 bot_id、user_id 及个人令牌                                                 |
-| LLM |   Home Assistant   | homeassistant语音助手接口调用 |     免费      |                                                   需提供home assistant令牌                                                   |

 实际上，任何支持 openai 接口调用的 LLM 均可接入使用。

@@ -370,7 +374,41 @@ VAD:

 ### 6、我想通过小智控制电灯、空调、远程开关机等操作 💡

-建议：在配置文件中将 `LLM` 设置为 `HomeAssistant`，通过 调用`HomeAssistant`接口实现相关控制。
+本项目，支持以工具调用的方式控制HomeAssistant设备
+
+1、首先选择一款支持function call支持的LLM，例如`ChatGLMLLM`。
+
+2、在配置文件中，将 `selected_module.Intent` 设置为 `function_call`。
+
+3、登录`HomeAssistant`，点击`左下角个人`，切换`安全`导航栏，划到底部`长期访问令牌`生成api_key。
+
+在配置文件中，配置好你的home assistant的`devices`（被控制的设备）和`api_key`和`base_url`等信息。例如：
+
+``` yaml 
+plugins
+  home_assistant:
+    devices:
+      - 客厅,玩具灯,switch.cuco_cn_460494544_cp1_on_p_2_1
+      - 卧室,台灯,switch.iot_cn_831898993_socn1_on_p_2_1
+    base_url: http://你的homeassistant地址:8123
+    api_key: 你的home assistant api访问令牌
+```
+
+最后，允许function_call 插件在配置文件中启用`hass_get_state`(必须)、`hass_set_state`(必须)、`hass_play_music`(不想用ha听音乐可以不启动)，例如：
+
+``` yaml 
+Intent:
+  ...
+  function_call:
+    type: nointent
+    functions:
+      - change_role
+      - get_weather
+      - get_news
+      - hass_get_state
+      - hass_set_state
+      - hass_play_music
+```

 ### 7、更多问题，可联系我们反馈 💬

@@ -3,6 +3,7 @@ import agent from './module/agent.js'
 import device from './module/device.js'
 import user from './module/user.js'
 import ota from './module/ota.js'
+import admin from './module/admin.js'

 /**
 * 接口地址
@@ -29,5 +30,6 @@ export default {
    user,
    agent,
    device,
-    ota
+    ota,
+    admin
 }
@@ -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()
+    },
+}
@@ -26,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();
@@ -0,0 +1,384 @@
+<template>
+  <el-dialog
+      :visible.sync="visible"
+      width="1000px"
+      center
+      custom-class="custom-dialog"
+      :show-close="false"
+  >
+    <div style="margin: 0 30px 20px; text-align: left; padding: 20px; border-radius: 10px;">
+      <div style="font-size: 27px; color: #3d4566; margin-bottom: 15px; text-align: center;">添加模型</div>
+
+      <!-- 模型信息部分 -->
+      <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 15px;">
+        <div style="font-size: 20px; font-weight: bold; color: #3d4566;">模型信息</div>
+        <div style="display: flex; align-items: center; gap: 20px;">
+          <div style="display: flex; align-items: center;">
+            <span style="margin-right: 8px;">是否启用</span>
+            <el-switch v-model="formData.isEnabled" class="custom-switch"></el-switch>
+          </div>
+          <div style="display: flex; align-items: center;">
+            <span style="margin-right: 8px;">设为默认</span>
+            <el-switch v-model="formData.isDefault" class="custom-switch"></el-switch>
+          </div>
+        </div>
+      </div>
+
+      <div style="height: 2px; background: #e9e9e9; margin-bottom: 20px;"></div>
+
+      <el-form :model="formData" label-width="100px" label-position="left" class="custom-form">
+        <!-- 第一行：模型名称和模型编码 -->
+        <div style="display: flex; gap: 20px; margin-bottom: 15px;">
+          <el-form-item label="模型名称" prop="modelName" style="flex: 1; margin-bottom: 0;">
+            <el-input
+              v-model="formData.modelName"
+              placeholder="请输入模型名称"
+              class="custom-input-bg"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="模型编码" prop="modelCode" style="flex: 1; margin-bottom: 0;">
+            <el-input
+              v-model="formData.modelCode"
+              placeholder="请输入模型编码"
+              class="custom-input-bg"
+            ></el-input>
+          </el-form-item>
+        </div>
+
+        <!-- 第二行：供应器和排序号 -->
+        <div style="display: flex; gap: 20px; margin-bottom: 15px;">
+          <el-form-item label="供应器" prop="supplier" style="flex: 1; margin-bottom: 0;">
+            <el-select
+              v-model="formData.supplier"
+              placeholder="请选择"
+              class="custom-select custom-input-bg"
+              style="width: 100%;"
+            >
+              <el-option label="硅基流动" value="硅基流动"></el-option>
+              <el-option label="智脑科技" value="智脑科技"></el-option>
+              <el-option label="云智科技" value="云智科技"></el-option>
+              <el-option label="其他" value="其他"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="排序号" prop="sortOrder" style="flex: 1; margin-bottom: 0;">
+            <el-input
+              v-model="formData.sort"
+              placeholder="请输入排序号"
+              class="custom-input-bg"
+            ></el-input>
+          </el-form-item>
+        </div>
+
+        <!-- 文档地址 -->
+        <el-form-item label="文档地址" prop="docLink" style="margin-bottom: 15px;">
+          <el-input
+            v-model="formData.docLink"
+            placeholder="请输入文档地址"
+            class="custom-input-bg"
+          ></el-input>
+        </el-form-item>
+
+        <!-- 备注 -->
+        <el-form-item label="备注" prop="remark" style="margin-bottom: 15px;">
+          <el-input
+              v-model="formData.remark"
+              type="textarea"
+              :rows="3"
+              placeholder="请输入模型备注"
+              class="custom-input-bg"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+
+      <!-- 调用信息部分 -->
+      <div style="font-size: 20px; font-weight: bold; color: #3d4566; margin-bottom: 15px;">调用信息</div>
+      <div style="height: 2px; background: #e9e9e9; margin-bottom: 20px;"></div>
+
+      <el-form :model="formData" label-width="100px" label-position="left" class="custom-form">
+        <!-- 第一行：模型名称和接口地址 -->
+        <div style="display: flex; gap: 20px; margin-bottom: 15px;">
+          <el-form-item label="模型名称" prop="param1" style="flex: 0.5; margin-bottom: 0;">
+            <el-input
+              v-model="formData.configJson.param1"
+              placeholder="请输入model_name"
+              class="custom-input-bg"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="接口地址" prop="param2" style="flex: 1; margin-bottom: 0;">
+            <el-input
+              v-model="formData.configJson.param2"
+              placeholder="请输入base_url"
+              class="custom-input-bg"
+            ></el-input>
+          </el-form-item>
+        </div>
+
+        <!-- 秘钥信息 -->
+        <el-form-item label="秘钥信息" prop="apiKey" style="margin-bottom: 15px;">
+          <el-input
+              v-model="formData.configJson.apiKey"
+              placeholder="请输入api_key"
+              show-password
+              class="custom-input-bg"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <!-- 保存按钮 -->
+    <div style="display: flex; margin: 20px 0; justify-content: center;">
+      <el-button
+          type="primary"
+          @click="confirm"
+          class="save-btn"
+      >
+        保存
+      </el-button>
+    </div>
+
+    <!-- 关闭按钮 -->
+    <!-- 修改关闭按钮 -->
+    <button class="custom-close-btn" @click="handleClose">
+      ×
+    </button>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'AddModelDialog',
+  props: {
+    visible: {type: Boolean, required: true},
+    modelType: {type: String, required: true}
+  },
+  data() {
+    return {
+      formData: {
+        modelName: '',
+        modelCode: '',
+        supplier: '',
+        sort: 1,
+        docLink: '',
+        remark: '',
+        isEnabled: true,
+        isDefault: true,
+        configJson: {
+          param1: '',
+          param2: '',
+          apiKey: ''
+        }
+      }
+    }
+  },
+  methods: {
+    confirm() {
+      if (!this.formData.modelName || !this.formData.modelCode || !this.formData.supplier ||
+          !this.formData.configJson.param1 || !this.formData.configJson.param2 || !this.formData.configJson.apiKey) {
+        this.$message.error('请填写所有必填字段');
+        return;
+      }
+
+      this.$emit('confirm', {
+        ...this.formData,
+        provideType: this.formData.supplier
+      });
+      this.$emit('update:visible', false);
+      this.resetForm();
+    },
+    resetForm() {
+      this.formData = {
+        modelName: '',
+        modelCode: '',
+        supplier: '',
+        sort: 1,
+        docLink: '',
+        remark: '',
+        isEnabled: true,
+        isDefault: true,
+        configJson: {
+          param1: '',
+          param2: '',
+          apiKey: ''
+        }
+      };
+    },
+    handleClose() {
+      this.resetForm();
+      this.$emit('update:visible', false);
+    }
+  }
+}
+</script>
+
+<style>
+.custom-dialog {
+  position: relative;
+  border-radius: 20px;
+  overflow: hidden;
+  background: white;
+}
+
+.custom-dialog .el-dialog__header {
+  padding: 0;
+  border-bottom: none;
+}
+
+.custom-close-btn {
+  position: absolute;
+  top: 20px;
+  right: 20px;
+  width: 35px;
+  height: 35px;
+  border-radius: 50%;
+  border: 2px solid #cfcfcf;
+  background: none;
+  font-size: 30px;
+  font-weight: lighter;
+  color: #cfcfcf;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 1;
+  padding: 0;
+  outline: none;
+}
+
+.custom-close-btn:hover {
+  color: #409EFF;
+  border-color: #409EFF;
+}
+
+.custom-select .el-input__inner {
+  padding-right: 30px !important;
+}
+
+.custom-select .el-input__suffix {
+  background: #e6e8ea;
+  right: 7px;
+  width: 24px;
+  height: 24px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  top: 7px;
+}
+
+.custom-select .el-input__suffix-inner {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+}
+
+.custom-select .el-icon-arrow-up:before {
+  content: "";
+  display: inline-block;
+  width: 0;
+  height: 0;
+  border-left: 6px solid transparent;
+  border-right: 6px solid transparent;
+  border-top: 8px solid #c0c4cc;
+  position: relative;
+  top: -1px;
+  transform: rotate(180deg);
+}
+
+.custom-select .el-select .el-input .el-select__caret {
+  color: #c0c4cc;
+  font-size: 14px;
+  transition: transform .3s;
+  transform: rotateZ(0deg);
+  cursor: pointer;
+}
+
+.custom-select .el-select .el-input.is-focus .el-icon-arrow-up:before {
+  transform: rotateZ(180deg);
+}
+
+/* 表单样式调整 */
+.custom-form .el-form-item {
+  margin-bottom: 0;
+}
+
+.custom-form .el-form-item__label {
+  color: #3d4566;
+  font-weight: normal;
+  text-align: right;
+  padding-right: 15px;
+}
+
+/* 修改placeholder颜色 */
+.custom-input-bg .el-input__inner::-webkit-input-placeholder,
+.custom-input-bg .el-textarea__inner::-webkit-input-placeholder {
+  color: #9c9f9e ;
+}
+
+/* 输入框背景色 */
+.custom-input-bg .el-input__inner,
+.custom-input-bg .el-textarea__inner {
+  background-color: #f6f8fc;
+}
+
+.custom-form .el-input__inner,
+.custom-form .el-textarea__inner {
+  border-radius: 4px;
+  border: 1px solid #DCDFE6;
+}
+
+.custom-form .el-input__inner:focus,
+.custom-form .el-textarea__inner:focus {
+  border-color: #409EFF;
+}
+
+.save-btn {
+  background: #e6f0fd;
+  color: #237ff4;
+  border: 1px solid #b3d1ff;
+  width: 150px;
+  height: 40px;
+  font-size: 16px;
+  transition: all 0.3s ease;
+}
+
+.save-btn:hover {
+  background: linear-gradient(to right, #237ff4, #9c40d5);
+  color: white;
+  border: none;
+}
+
+/* 修复select宽度问题 */
+.el-select {
+  display: block;
+}
+
+/* 修改开关样式 */
+.custom-switch .el-switch__core {
+  border-radius: 20px;
+  height: 23px;
+  background-color: #c0ccda;
+  width: 35px;
+  padding: 0 20px; /* 调整左右内边距 */
+}
+
+.custom-switch .el-switch__core:after {
+  width: 15px;
+  height: 15px;
+  background-color: white;
+  top: 3px;
+  left: 4px;
+  transition: all .3s;
+}
+
+.custom-switch.is-checked .el-switch__core {
+  border-color: #b5bcf0;
+  background-color: #cfd7fa;
+  padding: 0 20px; /* 确保启用状态也有相同的间隔 */
+}
+
+.custom-switch.is-checked .el-switch__core:after {
+  left: 100%;
+  margin-left: -18px;
+  background-color: #1b47ee;
+}
+</style>
@@ -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>
@@ -0,0 +1,149 @@
+<template>
+  <el-dialog :visible.sync="dialogVisible" width="900px" @close="handleClose" class="compact-dialog" :append-to-body="true">
+    <el-form :model="voiceForm" :rules="rules" ref="voiceForm" label-width="80px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="音色编码" prop="voiceCode">
+            <el-input v-model="voiceForm.voiceCode" placeholder="请输入内容" class="compact-input"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="音色名称" prop="voiceName">
+            <el-input v-model="voiceForm.voiceName" placeholder="请输入内容" class="compact-input"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="语言类型" prop="languageType">
+            <el-input v-model="voiceForm.languageType" placeholder="请输入内容" class="compact-input"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="排序号" prop="sortNumber">
+            <el-input-number v-model="voiceForm.sortNumber" :min="1" :controls="false" class="compact-number"></el-input-number>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="voiceForm.remark" type="textarea" :rows="2" placeholder="请输入内容" class="compact-textarea"
+        ></el-input>
+        <div class="audio-controls">
+           <div class="audio-player">
+      <audio
+        :src="audioUrl"
+        controls
+        preload="metadata"
+        class="custom-audio"
+      ></audio>
+    </div>
+          <el-button type="primary" size="mini" class="preview-btn">生成试听</el-button>
+        </div>
+      </el-form-item>
+    </el-form>
+
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="handleSave">保存</el-button>
+      <el-button type="primary" @click="handleClose">关闭</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'EditVoiceDialog',
+  props: {
+    showDialog: Boolean,
+    voiceData: {
+      type: Object,
+      default: () => ({
+        voiceCode: 'wawaxiaohe',
+        voiceName: '湾湾小何',
+        languageType: '中文',
+        sortNumber: 123
+      })
+    }
+  },
+  data() {
+    return {
+      dialogVisible: this.showDialog,
+      voiceForm: { ...this.voiceData },
+      audioUrl: 'http://music.163.com/song/media/outer/url?id=447925558.mp3',
+      generatedAudio: null,
+      rules: {
+        voiceCode: [{ required: true, message: '请输入音色编码', trigger: 'blur' }],
+        voiceName: [{ required: true, message: '请输入音色名称', trigger: 'blur' }]
+      }
+    }
+  },
+  watch: {
+    showDialog(newVal) {
+      this.dialogVisible = newVal
+      if (newVal) this.voiceForm = { ...this.voiceData }
+    }
+  },
+  methods: {
+    handleClose() {
+      this.dialogVisible = false
+      this.$emit('update:showDialog', false)
+    },
+    handleSave() {
+      this.$refs.voiceForm.validate(valid => {
+        if (valid) this.$emit('save', this.voiceForm)
+      })
+    },
+  }
+}
+</script>
+
+<style scoped>
+.compact-dialog {
+  /deep/ .el-dialog__body {
+    padding: 20px;
+  }
+
+  .el-form-item {
+    margin-bottom: 16px;
+  }
+
+  .compact-input {
+    width: 100%;
+  }
+
+  .compact-number {
+    width: 100%;
+    /deep/ .el-input__inner {
+      padding-right: 10px;
+    }
+  }
+
+  .compact-textarea {
+    width: 100%;
+    margin-bottom: 8px;
+  }
+
+  .audio-controls {
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+    gap: 16px;
+    margin-top: 8px;
+
+
+    .preview-btn {
+      padding: 7px 15px;
+    }
+  }
+
+  .dialog-footer {
+    padding: 16px 20px 0;
+    text-align: right;
+    border-top: 1px solid #EBEEF5;
+
+    .el-button {
+      min-width: 80px;
+    }
+  }
+}
+</style>
@@ -13,6 +13,12 @@
          <i class="el-icon-s-grid" style="font-size: 10px;color: #979db1;"/>
          控制台
        </div>
+        <div ref="menu-code_user" class="menu-btn" @click="goToPage('/user-management')">
+          用户管理
+        </div>
+        <div ref="menu-code_model" class="menu-btn" @click="goToPage('/model-config')">
+          模型配置
+        </div>
        <div ref="menu-code_ota" class="menu-btn" @click="goToPage('/ota')">
          <i class="el-icon-lightning"></i>
          OTA管理
@@ -28,7 +34,7 @@
        <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-user" @click.native="">个人中心</el-dropdown-item>
@@ -38,15 +44,21 @@
        </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 {
@@ -55,7 +67,7 @@ export default {
        username: '',
        mobile: ''
      },
-
+      isChangePasswordDialogVisible: false // 控制修改密码弹窗的显示
    }
  },
  watch: {
@@ -111,10 +123,13 @@ export default {
      }

      this.$emit('search-result', filteredDevices);
+    },
+
+    // 显示修改密码弹窗
+    showChangePasswordDialog() {
+      this.isChangePasswordDialogVisible = true;
    }
-
  }
-
 }
 </script>

@@ -0,0 +1,159 @@
+<template>
+  <el-dialog :visible.sync="dialogVisible" width="800px" center>
+    <el-form :model="form" ref="form" label-width="70px">
+      <el-row :gutter="20" class="form-row">
+        <el-col :span="12">
+          <el-form-item label="模型编码">
+            <el-input v-model="form.code" placeholder="请输入内容" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="模型名称">
+            <el-input v-model="form.name" placeholder="请输入内容" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <!-- 供应商 -->
+      <el-row :gutter="20" class="form-row">
+        <el-col :span="12">
+          <el-form-item label="供应器">
+            <el-select v-model="form.supplier" placeholder="请选择">
+              <el-option label="openai" value="openai" />
+              <el-option label="dify" value="dify" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+           <el-form-item>
+            <div style="display: flex; align-items: center;">
+              <span class="el-form-item__label" style="width: 70px;">设成默认</span>
+              <el-switch v-model="form.isDefault" style="margin-right: 20px;" />
+              <span class="el-form-item__label" style="width: 70px;">是否启用</span>
+              <el-switch v-model="form.isEnable" />
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <!-- 文档 -->
+      <el-row :gutter="20" class="form-row">
+        <el-col :span="12">
+          <el-form-item label="文档地址">
+            <el-input v-model="form.docUrl" placeholder="请输入内容" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="排序号">
+            <el-input-number v-model="form.sort" :min="1" :max="999" controls-position="right" placeholder="123"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <!-- 备注 -->
+      <el-form-item label="备注" class="form-row">
+        <el-input type="textarea" v-model="form.remark" :rows="2" placeholder="请输入"
+        />
+      </el-form-item>
+
+      <div class="vertical-fields">
+        <el-form-item label="接口地址">
+          <el-input v-model="form.apiUrl" placeholder="请输入base_url" />
+        </el-form-item>
+        <el-form-item label="模型名称">
+          <el-input v-model="form.modelName" placeholder="请输入model_name" />
+        </el-form-item>
+        <el-form-item label="密钥信息">
+          <el-input v-model="form.apiKey" placeholder="请输入api_key" show-password/>
+        </el-form-item>
+      </div>
+    </el-form>
+
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="handleSave">保存</el-button>
+      <el-button @click="dialogVisible = false">关闭</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: "ModelConfigDialog",
+  props: {
+    visible: { type: Boolean, default: false },
+    configData: { type: Object, default: () => ({}) }
+  },
+  data() {
+    return {
+      dialogVisible: this.visible,
+      form: {
+        code: "",
+        name: "",
+        supplier: "",
+        isDefault: true,
+        isEnable: true,
+        docUrl: "",
+        sort: 123,
+        remark: "",
+        apiUrl: "",
+        modelName: "",
+        apiKey: ""
+      }
+    };
+  },
+  watch: {
+    dialogVisible(val) {
+      this.$emit('update:visible', val);
+    },
+    visible(val) {
+      this.dialogVisible = val;
+      if (val) this.form = { ...this.form, ...this.configData };
+    }
+  },
+  methods: {
+    handleSave() {
+      this.$emit("submit", this.form);
+      this.dialogVisible = false;
+    }
+  }
+};
+</script>
+
+<style scoped>
+.dialog-footer {
+  margin-top: -30px;
+  text-align: center;
+}
+.el-form-item {
+  margin-bottom: 18px;
+}
+.el-input-number {
+  width: 100%;
+}
+.form-row {
+  margin-bottom: 12px;
+}
+
+.vertical-fields {
+  margin-top: 8px;
+}
+
+.dialog-footer {
+  margin-top: -10px;
+  text-align: center;
+}
+.el-input-number {
+  width: 100%;
+}
+
+.el-input__inner {
+  height: 36px;
+  line-height: 36px;
+}
+
+.el-form-item__label {
+  text-align: left;
+  padding-right: 10px;
+}
+</style>
@@ -0,0 +1,194 @@
+<template>
+  <el-dialog :visible.sync="visible" width="80%" @close="handleClose">
+    <el-row class="main-container">
+      <el-col :span="4">
+        <el-menu class="model-menu" :default-active="activeModel" mode="vertical" @select="handleModelSelect">
+          <el-menu-item index="EdgeTTS">EdgeTTS</el-menu-item>
+          <el-menu-item index="DoubaoTTS">DoubaoTTS</el-menu-item>
+          <el-menu-item index="TTS302AI">TTS302AI</el-menu-item>
+          <el-menu-item index="CosyVoiceSiliconflow">CosyVoiceSiliconflow</el-menu-item>
+        </el-menu>
+      </el-col>
+
+      <el-col :span="20">
+        <div class="search-operate">
+          <el-input placeholder="请输入音色名称查询" v-model="searchQuery" style="width: 300px; margin-right: 10px;"/>
+          <el-button type="primary" @click="handleSearch">查询</el-button>
+          <el-button type="primary" plain @click="handleAddVoice">添加音色</el-button>
+          <el-button type="danger" plain @click="handleBatchDelete">批量删除</el-button>
+        </div>
+
+        <el-table :data="filteredTtsModels" style="width: 100%" border stripe header-row-class-name="table-header">
+          <el-table-column label="音色编码" prop="voiceCode" width="150" align="center"></el-table-column>
+          <el-table-column label="音色名称" prop="voiceName" width="180" align="center"></el-table-column>
+          <el-table-column label="语言类型" prop="languageType" width="120" align="center"></el-table-column>
+          <el-table-column label="备注" prop="remark" align="center"></el-table-column>
+          <el-table-column label="操作" width="200" align="center">
+            <template slot-scope="scope">
+              <el-button size="mini" type="text" @click="editVoice(scope.row)" style="color: #409EFF; margin-right: 15px;">修改</el-button>
+              <el-button size="mini" type="text" @click="deleteVoice(scope.row)" style="color: #F56C6C;">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <div class="pagination-container">
+          <el-pagination :current-page="currentPage" :page-size="pageSize" :total="total" layout="prev, pager, next" prev-text="<" next-text=">"/>
+        </div>
+
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="handleClose" size="medium">关闭</el-button>
+          <el-button type="primary" @click="handleImportExport" size="medium">导入导出配置</el-button>
+        </div>
+        <EditVoiceDialog :showDialog="editDialogVisible" :voiceData="editVoiceData" @update:showDialog="editDialogVisible = $event" @saveVoice="handleSaveEditedVoice"/>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import EditVoiceDialog from "@/components/EditVoiceDialog.vue";
+export default {
+  components: { EditVoiceDialog },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      activeModel: 'EdgeTTS',
+      searchQuery: '',
+      editDialogVisible: false,
+      editVoiceData: {},
+      ttsModels: [
+        { voiceCode: 'wawaxiaohe', voiceName: '湾湾小何', languageType: '中文', remark: '' },
+        { voiceCode: 'wawaxiaohe', voiceName: '湾湾小何', languageType: '中文', remark: '' },
+        { voiceCode: 'wawaxiaohe', voiceName: '湾湾小何', languageType: '中文', remark: '' },
+        { voiceCode: 'wawaxiaohe', voiceName: '湾湾小何', languageType: '中文', remark: '' },
+      ],
+      currentPage: 1,
+      pageSize: 4,
+      total: 20
+    };
+  },
+  computed: {
+    filteredTtsModels() {
+      return this.ttsModels.filter(model =>
+        model.voiceName.toLowerCase().includes(this.searchQuery.toLowerCase())
+      );
+    }
+  },
+  methods: {
+    handleClose() {
+      this.$emit('update:visible', false);
+    },
+    handleModelSelect(index) {
+      this.activeModel = index;
+      // 可根据选中模型加载对应数据
+    },
+    handleSearch() {
+      // 搜索
+    },
+    handleAddVoice() {
+      // 添加音色
+    },
+    handleBatchDelete() {
+      // 批量删除
+    },
+     editVoice(voice) {
+      this.editVoiceData = { ...voice };
+      this.editDialogVisible = true;
+    },
+    handleSaveEditedVoice(voiceForm) {
+      const index = this.ttsModels.findIndex(item => item.voiceCode === voiceForm.voiceCode);
+      if (index !== -1) {
+        this.ttsModels.splice(index, 1, voiceForm);
+      }
+    },
+    deleteVoice(voice) {
+      // 删除
+    },
+    handleImportExport() {
+      // 导入导出
+    }
+  }
+};
+</script>
+
+<style scoped>
+.main-container {
+  padding: 20px;
+}
+
+.model-menu {
+  border-right: 1px solid #ebeef5;
+  height: calc(100vh - 300px);
+  background-color: #fafafa;
+}
+
+.search-operate {
+  margin-bottom: 20px;
+  display: flex;
+  align-items: center;
+}
+
+.pagination-container {
+  margin: 20px 0;
+  display: flex;
+  justify-content: right;
+}
+
+.dialog-footer {
+  text-align: right;
+  padding: 20px 20px 0;
+  border-top: 1px solid #ebeef5;
+}
+
+::v-deep .table-header th {
+  background-color: #f5f7fa;
+  color: #606266;
+  font-weight: 600;
+}
+
+::v-deep .el-table--striped .el-table__body tr.el-table__row--striped td {
+  background-color: #fafafa;
+}
+
+::v-deep .el-table--border td, ::v-deep .el-table--border th {
+  border-right: 1px solid #ebeef5;
+}
+
+::v-deep .el-pagination {
+  padding: 10px;
+  background-color: #f5f7fa;
+  border-radius: 4px;
+}
+
+::v-deep .el-pagination .btn-prev, ::v-deep .el-pagination .btn-next {
+  background-color: #fff;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+}
+
+::v-deep .el-pagination .btn-prev:hover, ::v-deep .el-pagination .btn-next:hover {
+  background-color: #f5f7fa;
+}
+
+::v-deep .el-pagination .el-pager li {
+  background-color: #fff;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  margin: 0 2px;
+}
+
+::v-deep .el-pagination .el-pager li:hover {
+  background-color: #f5f7fa;
+}
+
+::v-deep .el-pagination .el-pager li.active {
+  background-color: #409EFF;
+  color: #fff;
+  border-color: #409EFF;
+}
+</style>
@@ -64,7 +64,29 @@ const routes = [
    component: function () {
      return import('../views/ota.vue')
    }
-  }
+  },
+  // 添加用户管理路由
+  {
+    path: '/user-management',
+    name: 'UserManagement',
+    meta: {
+      menuCode: 'user',
+    },
+    component: function () {
+      return import('../views/UserManagement.vue')
+    }
+  },
+  {
+   path: '/model-config',
+   name: 'ModelConfig',
+   meta: {
+     menuCode: 'model',
+   },
+   component: function () {
+     return import('../views/ModelConfig.vue')
+   }
+  },
+
 ]

 const router = new VueRouter({
@@ -0,0 +1,285 @@
+  <template>
+    <div class="welcome">
+      <HeaderBar />
+      <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" />
+            <AddModelDialog :visible.sync="addDialogVisible" :modelType="activeTab" @confirm="handleAddConfirm"/>
+          </el-main>
+        </div>
+      </div>
+    </div>
+  </template>
+
+  <script>
+  import HeaderBar from "@/components/HeaderBar.vue";
+  import ModelEditDialog from "@/components/ModelEditDialog.vue";
+  import TtsModel from "@/components/TtsModel.vue";
+  import AddModelDialog from "@/components/AddModelDialog.vue";
+
+  export default {
+    components: { HeaderBar, ModelEditDialog, TtsModel, AddModelDialog},
+    data() {
+      return {
+        activeTab: 'llm',
+        search: '',
+        editDialogVisible: false,
+        editModelData: {},
+        ttsDialogVisible: false,
+        addDialogVisible: false, // 新增弹窗显示状态
+        modelList: [
+          { code: 'DeepSeek', candidateName: '深度求索', isApplied: true, supplier: '硅基流动' },
+          { code: 'SmartAssist', candidateName: '智能助手', isApplied: false, supplier: '智脑科技' },
+          { code: 'CogEngine', candidateName: '认知引擎', isApplied: true, supplier: '云智科技' },
+        ],
+        currentPage: 1,
+        pageSize: 4,
+        total: 20
+      };
+    },
+    methods: {
+      handleMenuSelect(index) {
+        this.activeTab = index;
+      },
+      handleSearch() {
+        console.log('查询：', this.search);
+      },
+      batchDelete() {
+        console.log('批量删除');
+      },
+      // 修改addModel方法
+      addModel() {
+        this.addDialogVisible = true;
+      },
+      // 新增处理方法
+      handleAddConfirm(formData) {
+        // 这里处理添加模型的逻辑
+        console.log('新增模型数据:', formData);
+        // 模拟添加到列表
+        this.modelList.unshift({
+          code: formData.modelCode,
+          candidateName: formData.modelName,
+          supplier: formData.supplier,
+          isApplied: formData.isEnabled
+        });
+        this.$message.success('模型添加成功');
+      },
+      editModel(model) {
+        this.editModelData = {
+          code: model.code,
+          name: model.candidateName,
+          supplier: model.supplier,
+        };
+        this.editDialogVisible = true;
+      },
+      deleteModel(model) {
+        console.log('删除：', model);
+      },
+      handleCurrentChange(page) {
+        this.currentPage = page;
+        console.log('当前页码：', page);
+      },
+      handleImportExport() {
+        console.log('导入导出');
+      },
+      handleModelSave(formData) {
+        console.log('保存的模型数据：', formData);
+      },
+      selectAll() {
+        console.log('全选');
+      }
+    }
+  };
+  </script>
+
+  <style scoped>
+  .welcome {
+    min-width: 900px;
+    min-height: 506px;
+    height: 100vh;
+    display: flex;
+    flex-direction: column;
+    background-image: url("@/assets/home/background.png");
+    background-size: cover;
+    background-position: center;
+    -webkit-background-size: cover;
+    -o-background-size: cover;
+  }
+
+  .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;
+  }
+
+  .model-search-operate > * {
+    margin-right: 10px;
+  }
+
+  .el-table__header th {
+    background-color: #f5f7fa;
+    color: #606266;
+    font-weight: 500;
+  }
+
+  .model-card {
+    background: #fff;
+    border-radius: 12px;
+    padding: 20px;
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  }
+
+  .import-export-btn {
+    margin-bottom: 20px;
+    display: flex;
+    justify-content: flex-end;
+    margin-right: 40px;
+  }
+
+  .pagination-container {
+    margin-top: 20px;
+    display: flex;
+    justify-content: flex-end;
+  }
+
+  .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>
@@ -0,0 +1,213 @@
+<template>
+  <div class="welcome">
+    <HeaderBar />
+    <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-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" type="text"
+              v-if="scope.row.status === '禁用'"
+              @click="restoreUser(scope.row)">恢复</el-button>
+            <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 style="font-size: 12px; font-weight: 400; margin-top: auto; padding-top: 30px; color: #979db1;">
+        ©2025 xiaozhi-esp32-server
+      </div>
+    </el-main>
+  </div>
+</template>
+
+<script>
+import HeaderBar from "@/components/HeaderBar.vue";
+import Api from '@/apis/api';
+import adminApi from '@/apis/module/admin';
+
+
+export default {
+  components: { HeaderBar },
+  data() {
+    return {
+      searchPhone: '',
+      userList: [
+        { userId: '123456', phone: '13800138000', status: '正常', deviceCount: 10 },
+        { userId: '123456', phone: '13800138000', status: '正常', deviceCount: 9 },
+        { userId: '123456', phone: '13800138000', status: '正常', deviceCount: 7 },
+        { userId: '123456', phone: '13800138000', status: '禁用', deviceCount: 7 }
+      ],
+      currentPage: 1,
+      pageSize: 4,
+      total: 20
+    };
+  },
+  created() {
+    adminApi.getUserList(({data}) => {
+      //mock偶尔会返回-1导致出错，又会返回两个list，所以这里只取第一个
+      this.userList = data.data[0].list;
+      console.log('用户列表：', this.userList);
+    })
+  },
+  methods: {
+    handleSearch() {
+      // 模拟搜索逻辑
+      console.log('执行查询，搜索号码：', this.searchPhone);
+    },
+    batchDelete() {
+      console.log('执行批量删除操作');
+    },
+    batchDisable() {
+      console.log('执行批量禁用操作');
+    },
+    resetPassword(row) {
+      console.log('重置用户密码，用户：', row);
+    },
+    disableUser(row) {
+      row.status = '禁用';
+      console.log('禁用用户：', row);
+    },
+    restoreUser(row) {
+      row.status = '正常';
+      console.log('恢复用户：', row);
+    },
+    deleteUser(row) {
+      console.log('删除用户：', row);
+    },
+    handleCurrentChange(page) {
+      this.currentPage = page;
+      console.log('当前页码：', page);
+    },
+  }
+};
+</script>
+
+<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;
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+  background-image: url("@/assets/home/background.png");
+  background-size: cover;
+  background-position: center;
+  -webkit-background-size: cover;
+  -o-background-size: cover;
+}
+
+.user-search-operate {
+  margin-bottom: 20px;
+  display: flex;
+  align-items: center;
+}
+
+.user-search-operate > * {
+  margin-right: 10px;
+}
+
+.el-table__header th {
+  background-color: #f5f7fa;
+  color: #606266;
+}
+
+.user-card {
+  background: #fff;
+  border-radius: 12px;
+  padding: 20px;
+  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 {
+  display: flex;
+  justify-content: flex-end;
+}
+
+</style>
@@ -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
  # 设置日志路径
@@ -49,7 +49,7 @@ prompt: |
  你是一个叫小智/小志的台湾女孩，说话机车，声音好听，习惯简短表达，爱用网络梗。
  请注意，要像一个人一样说话，请不要回复表情符号、代码、和xml标签。
  现在我正在和你进行语音聊天，我们开始吧。
-  如果用户希望结束对话，请在最后说“拜拜”或“再见”。
+
 # 使用完声音文件后删除文件(Delete the sound file when you are done using it)
 delete_audio: true

@@ -57,6 +57,14 @@ delete_audio: true
 close_connection_no_voice_time: 120
 # TTS请求超时时间(秒)
 tts_timeout: 10
+# 开启唤醒词加速
+enable_wakeup_words_response_cache: true
+# 开场是否回复唤醒词
+enable_greeting: true
+# 说完话是否开启提示音
+enable_stop_tts_notify: false
+# 说完话是否开启提示音，音效地址
+stop_tts_notify_voice: "config/assets/tts_notify.mp3"

 CMD_exit:
  - "退出"
@@ -99,6 +107,12 @@ Intent:
      - change_role
      - get_weather
      - get_news
+      # play_music是服务器自带的音乐播放，hass_play_music是通过home assistant控制的独立外部程序音乐播放
+      # 如果用了hass_play_music，就不要开启play_music，两者只留一个
+      - play_music
+      #- hass_get_state
+      #- hass_set_state
+      #- hass_play_music

 # 插件的基础配置
 plugins:
@@ -115,6 +129,20 @@ plugins:
      society: "https://www.chinanews.com.cn/rss/society.xml"
      world: "https://www.chinanews.com.cn/rss/world.xml"
      finance: "https://www.chinanews.com.cn/rss/finance.xml"
+  home_assistant:
+    devices:
+      - 客厅,玩具灯,switch.cuco_cn_460494544_cp1_on_p_2_1
+      - 卧室,台灯,switch.iot_cn_831898993_socn1_on_p_2_1
+    base_url: http://homeassistant.local:8123
+    api_key: 你的home assistant api访问令牌
+  play_music:
+    music_dir: "./music"  # 音乐文件存放路径，将从该目录及子目录下搜索音乐文件
+    music_ext: # 音乐文件类型，p3格式效率最高
+      - ".mp3"
+      - ".wav"
+      - ".p3"
+    refresh_time: 300 # 刷新音乐列表的时间间隔，单位为秒
+

 Memory:
  mem0ai:
@@ -241,12 +269,6 @@ LLM:
    model_name: deepseek-r1-distill-llama-8b@q4_k_m # 使用的模型名称，需要预先在社区下载
    url: http://localhost:1234/v1 # LM Studio服务地址
    api_key: lm-studio # LM Studio服务的固定API Key
-  HomeAssistant:
-    # 定义LLM API类型
-    type: homeassistant
-    base_url: http://homeassistant.local:8123
-    agent_id: conversation.chatgpt
-    api_key: 你的home assistant api访问令牌
  FastgptLLM:
    # 定义LLM API类型
    type: fastgpt
@@ -501,24 +523,20 @@ module_test:
    - "What's the weather like today?"
    - "请用100字概括量子计算的基本原理和应用前景"

-# 本地音乐播放配置
-music:
-  music_dir: "./music"  # 音乐文件存放路径，将从该目录及子目录下搜索音乐文件
-  music_ext: # 音乐文件类型，p3格式效率最高
-    - ".mp3"
-    - ".wav"
-    - ".p3"
-  refresh_time: 300 # 刷新音乐列表的时间间隔，单位为秒
+# 唤醒词，用于识别唤醒词还是讲话内容
+wakeup_words:
+  - "你好小智"
+  - "你好小志"
+  - "小爱同学"
+  - "你好小鑫"
+  - "你好小新"
+  - "小美同学"
+  - "小龙小龙"
+  - "喵喵同学"
+  - "小滨小滨"
+  - "小冰小冰"

 # 远程配置
 remote_config:
  enabled: true
-  url: http://192.168.5.11:8002/user/agent/loadAgentConfig/
-
-# 以下配置在小于等于0.0.9版本中的docker容器中可用
-# 0.0.9以后的新版本源码部署已经无法奏效
-manager:
-  enabled: false
-  ip: 0.0.0.0
-  port: 8002
-use_private_config: false
+  url: http://192.168.5.11:8002/user/agent/loadAgentConfig/
@@ -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
@@ -9,7 +9,7 @@ import traceback
 import threading
 import websockets
 from typing import Dict, Any
-import plugins_func.loadplugins
+from plugins_func.loadplugins import auto_import_modules
 from config.logger import setup_logging
 from core.utils.dialogue import Message, Dialogue
 from core.handle.textHandle import handleTextMessage
@@ -25,6 +25,8 @@ from core.utils.auth_code_gen import AuthCodeGenerator

 TAG = __name__

+auto_import_modules('plugins_func.functions')
+

 class TTSException(RuntimeError):
    pass
@@ -109,11 +111,15 @@ class ConnectionHandler:

            # 进行认证
            await self.auth.authenticate(self.headers)
-
            device_id = self.headers.get("device-id", None)
-            self.memory.init_memory(device_id, self.llm)
-            self.intent.set_llm(self.llm)

+            # 认证通过,继续处理
+            self.websocket = ws
+            self.session_id = str(uuid.uuid4())
+
+            self.welcome_msg = self.config["xiaozhi"]
+            self.welcome_msg["session_id"] = self.session_id
+            await self.websocket.send(json.dumps(self.welcome_msg))
            # Load private configuration if device_id is provided
            bUsePrivateConfig = self.config.get("use_private_config", False)
            self.logger.bind(tag=TAG).info(f"bUsePrivateConfig: {bUsePrivateConfig}, device_id: {device_id}")
@@ -141,43 +147,32 @@ class ConnectionHandler:
                    self.private_config = None
                    raise

-            # 认证通过,继续处理
-            self.websocket = ws
-            self.session_id = str(uuid.uuid4())
-
-            self.welcome_msg = self.config["xiaozhi"]
-            self.welcome_msg["session_id"] = self.session_id
-            await self.websocket.send(json.dumps(self.welcome_msg))
-
            # 异步初始化
-            await self.loop.run_in_executor(None, self._initialize_components)
-
+            self.executor.submit(self._initialize_components)
            # tts 消化线程
-            tts_priority = threading.Thread(target=self._tts_priority_thread, daemon=True)
-            tts_priority.start()
+            self.tts_priority_thread = threading.Thread(target=self._tts_priority_thread, daemon=True)
+            self.tts_priority_thread.start()

            # 音频播放 消化线程
-            audio_play_priority = threading.Thread(target=self._audio_play_priority_thread, daemon=True)
-            audio_play_priority.start()
+            self.audio_play_priority_thread = threading.Thread(target=self._audio_play_priority_thread, daemon=True)
+            self.audio_play_priority_thread.start()

            try:
                async for message in self.websocket:
                    await self._route_message(message)
            except websockets.exceptions.ConnectionClosed:
                self.logger.bind(tag=TAG).info("客户端断开连接")
-                await self.close()

        except AuthenticationError as e:
            self.logger.bind(tag=TAG).error(f"Authentication failed: {str(e)}")
-            await ws.close()
            return
        except Exception as e:
            stack_trace = traceback.format_exc()
            self.logger.bind(tag=TAG).error(f"Connection error: {str(e)}-{stack_trace}")
-            await ws.close()
            return
        finally:
            await self.memory.save_memory(self.dialogue.dialogue)
+            await self.close(ws)

    async def _route_message(self, message):
        """消息路由"""
@@ -187,16 +182,26 @@ class ConnectionHandler:
            await handleAudioMessage(self, message)

    def _initialize_components(self):
+        """加载提示词"""
        self.prompt = self.config["prompt"]
        if self.private_config:
            self.prompt = self.private_config.private_config.get("prompt", self.prompt)
-
-        self.client_ip_info = get_ip_info(self.client_ip)
-        self.logger.bind(tag=TAG).info(f"Client ip info: {self.client_ip_info}")
-        self.prompt = self.prompt + f"\n我在:{self.client_ip_info}"
        self.dialogue.put(Message(role="system", content=self.prompt))

-        self.func_handler = FunctionHandler(self.config)
+        """加载插件"""
+        self.func_handler = FunctionHandler(self)
+
+        """加载记忆"""
+        device_id = self.headers.get("device-id", None)
+        self.memory.init_memory(device_id, self.llm)
+        self.intent.set_llm(self.llm)
+
+        """加载位置信息"""
+        self.client_ip_info = get_ip_info(self.client_ip)
+        if self.client_ip_info is not None and "city" in self.client_ip_info:
+            self.logger.bind(tag=TAG).info(f"Client ip info: {self.client_ip_info}")
+            self.prompt = self.prompt + f"\nuser location:{self.client_ip_info}"
+            self.dialogue.update_system_message(self.prompt)

    def change_system_prompt(self, prompt):
        self.prompt = prompt
@@ -316,7 +321,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  # 跟踪已处理的字符位置
@@ -492,7 +499,12 @@ class ConnectionHandler:
        while not self.stop_event.is_set():
            text = None
            try:
-                future = self.tts_queue.get()
+                try:
+                    future = self.tts_queue.get(timeout=1)
+                except queue.Empty:
+                    if self.stop_event.is_set():
+                        break
+                    continue
                if future is None:
                    continue
                text = None
@@ -533,7 +545,12 @@ class ConnectionHandler:
        while not self.stop_event.is_set():
            text = None
            try:
-                opus_datas, text, text_index = self.audio_play_queue.get()
+                try:
+                    opus_datas, text, text_index = self.audio_play_queue.get(timeout=1)
+                except queue.Empty:
+                    if self.stop_event.is_set():
+                        break
+                    continue
                future = asyncio.run_coroutine_threadsafe(sendAudioMessage(self, opus_datas, text, text_index),
                                                          self.loop)
                future.result()
@@ -563,16 +580,41 @@ class ConnectionHandler:
            self.tts_first_text_index = text_index
        self.tts_last_text_index = text_index

-    async def close(self):
+    async def close(self, ws=None):
        """资源清理方法"""

-        # 清理其他资源
-        self.stop_event.set()
-        self.executor.shutdown(wait=False)
-        if self.websocket:
+        # 触发停止事件并清理资源
+        if self.stop_event:
+            self.stop_event.set()
+        
+        # 立即关闭线程池
+        if self.executor:
+            self.executor.shutdown(wait=False, cancel_futures=True)
+            self.executor = None
+        
+        # 清空任务队列
+        self._clear_queues()
+        
+        if ws:
+            await ws.close()
+        elif self.websocket:
            await self.websocket.close()
        self.logger.bind(tag=TAG).info("连接资源已释放")

+    def _clear_queues(self):
+        # 清空所有任务队列
+        for q in [self.tts_queue, self.audio_play_queue]:
+            if not q:
+                continue
+            while not q.empty():
+                try:
+                    q.get_nowait()
+                except queue.Empty:
+                    continue
+            q.queue.clear()
+            # 添加毒丸信号到队列，确保线程退出
+            # q.queue.put(None)
+
    def reset_vad_states(self):
        self.client_audio_buffer = bytes()
        self.client_have_voice = False
@@ -1,16 +1,16 @@
-import asyncio
-from enum import Enum
-
 from config.logger import setup_logging
 import json
 from plugins_func.register import FunctionRegistry, ActionResponse, Action, ToolType
+from plugins_func.functions.hass_init import append_devices_to_prompt
+
 TAG = __name__
 logger = setup_logging()


 class FunctionHandler:
-    def __init__(self, config):
-        self.config = config
+    def __init__(self, conn):
+        self.conn = conn
+        self.config = conn.config
        self.function_registry = FunctionRegistry()
        self.register_nessary_functions()
        self.register_config_functions()
@@ -26,9 +26,10 @@ class FunctionHandler:
        func_names = ",".join(surport_plugins)
        for function_desc in self.functions_desc:
            if function_desc["function"]["name"] == "plugin_loader":
-                function_desc["function"]["description"] = function_desc["function"]["description"].replace("[plugins]", func_names)
+                function_desc["function"]["description"] = function_desc["function"]["description"].replace("[plugins]",
+                                                                                                            func_names)
                break
-        
+
    def upload_functions_desc(self):
        self.functions_desc = self.function_registry.get_all_function_desc()

@@ -47,16 +48,19 @@ class FunctionHandler:
    def register_nessary_functions(self):
        """注册必要的函数"""
        self.function_registry.register_function("handle_exit_intent")
-        self.function_registry.register_function("play_music")
        self.function_registry.register_function("plugin_loader")
        self.function_registry.register_function("get_time")
-        self.function_registry.register_function("raise_and_lower_the_volume")
+        self.function_registry.register_function("get_lunar")
+        self.function_registry.register_function("handle_device")

    def register_config_functions(self):
        """注册配置中的函数,可以不同客户端使用不同的配置"""
        for func in self.config["Intent"]["function_call"].get("functions", []):
            self.function_registry.register_function(func)

+        """home assistant需要初始化提示词"""
+        append_devices_to_prompt(self.conn)
+
    def get_function(self, name):
        return self.function_registry.get_function(name)

@@ -81,4 +85,4 @@ class FunctionHandler:
        except Exception as e:
            logger.bind(tag=TAG).error(f"处理function call错误: {e}")

-        return None
+        return None
@@ -1,8 +1,74 @@
 import json
 from config.logger import setup_logging
+from core.handle.sendAudioHandle import send_stt_message
+from core.utils.util import remove_punctuation_and_length
+import shutil
+import asyncio
+import os
+import random
+import time

 logger = setup_logging()

+WAKEUP_CONFIG = {"dir": "config/assets/", "file_name": "wakeup_words", "create_time": time.time(), "refresh_time": 10,
+                 "words": ["很高兴见到你", "你好啊", "我们又见面了", "最近可好?", "很高兴再次和你谈话", "在干嘛"]}
+

 async def handleHelloMessage(conn):
    await conn.websocket.send(json.dumps(conn.welcome_msg))
+
+
+async def checkWakeupWords(conn, text):
+    enable_wakeup_words_response_cache = conn.config["enable_wakeup_words_response_cache"]
+    """是否开启唤醒词加速"""
+    if not enable_wakeup_words_response_cache:
+        return False
+    """检查是否是唤醒词"""
+    _, text = remove_punctuation_and_length(text)
+    if text in conn.config.get("wakeup_words"):
+        await send_stt_message(conn, text)
+        conn.tts_first_text_index = 0
+        conn.tts_last_text_index = 0
+        conn.llm_finish_task = True
+
+        file = getWakeupWordFile(WAKEUP_CONFIG["file_name"])
+        if file is None:
+            asyncio.create_task(wakeupWordsResponse(conn))
+            return False
+        opus_packets, duration = conn.tts.audio_to_opus_data(file)
+        conn.audio_play_queue.put((opus_packets, text, 0))
+        if time.time() - WAKEUP_CONFIG["create_time"] > WAKEUP_CONFIG["refresh_time"]:
+            asyncio.create_task(wakeupWordsResponse(conn))
+        return True
+    return False
+
+
+def getWakeupWordFile(file_name):
+    for file in os.listdir(WAKEUP_CONFIG["dir"]):
+        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.startswith(file_name):
+            return f"config/assets/{file}"
+    return None
+
+
+async def wakeupWordsResponse(conn):
+    """唤醒词响应"""
+    wakeup_word = random.choice(WAKEUP_CONFIG["words"])
+    result = conn.llm.response_no_stream(conn.config["prompt"], wakeup_word)
+    tts_file = await asyncio.to_thread(conn.tts.to_tts, result)
+    if tts_file is not None and os.path.exists(tts_file):
+        file_type = os.path.splitext(tts_file)[1]
+        if file_type:
+            file_type = file_type.lstrip('.')
+        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)
+        WAKEUP_CONFIG["create_time"] = time.time()
@@ -2,6 +2,7 @@ from config.logger import setup_logging
 import json
 import uuid
 from core.handle.sendAudioHandle import send_stt_message
+from core.handle.helloHandle import checkWakeupWords
 from core.utils.util import remove_punctuation_and_length

 TAG = __name__
@@ -12,6 +13,10 @@ async def handle_user_intent(conn, text):
    # 检查是否有明确的退出命令
    if await check_direct_exit(conn, text):
        return True
+    # 检查是否是唤醒词
+    if await checkWakeupWords(conn, text):
+        return True
+
    if conn.use_function_call_mode:
        # 使用支持function calling的聊天方法,不再进行意图分析
        return False
@@ -35,6 +40,7 @@ async def check_direct_exit(conn, text):
    return False


+
 async def analyze_intent_with_llm(conn, text):
    """使用LLM分析用户意图"""
    if not hasattr(conn, 'intent') or not conn.intent:
@@ -7,40 +7,15 @@ from core.utils.util import remove_punctuation_and_length, get_string_no_punctua
 TAG = __name__
 logger = setup_logging()

+
 async def sendAudioMessage(conn, audios, text, text_index=0):
    # 发送句子开始消息
    if text_index == conn.tts_first_text_index:
        logger.bind(tag=TAG).info(f"发送第一段语音: {text}")
    await send_tts_message(conn, "sentence_start", text)

-    # 流控参数优化
-    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  # 补偿时间（秒）
-
-    start_time = time.perf_counter()
-    play_position = 0  # 已播放时长（毫秒）
-
-    for opus_packet in audios:
-        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  # 使用调整后的帧时长
-
-    # 补偿因加速损失的时长
-    if compensation > 0:
-        await asyncio.sleep(compensation)
+    # 播放音频
+    await sendAudio(conn, audios)

    await send_tts_message(conn, "sentence_end", text)

@@ -50,6 +25,38 @@ async def sendAudioMessage(conn, audios, text, text_index=0):
        if conn.close_after_chat:
            await conn.close()

+# 播放音频
+async def sendAudio(conn, audios):
+    # 流控参数优化
+    frame_duration = 60  # 帧时长（毫秒），匹配 Opus 编码
+    start_time = time.perf_counter()
+    play_position = 0
+
+    # 预缓冲：发送前 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)
+        conn.logger.bind(tag=TAG).debug(f"发送帧，位置: {play_position}ms, 实际间隔: {(time.perf_counter() - current_time) * 1000:.2f}ms")
+
+        play_position += frame_duration
+
+
+
 async def send_tts_message(conn, state, text=None):
    """发送 TTS 状态消息"""
    message = {
@@ -60,10 +67,20 @@ async def send_tts_message(conn, state, text=None):
    if text is not None:
        message["text"] = text

-    await conn.websocket.send(json.dumps(message))
+    # TTS播放结束
    if state == "stop":
+        # 播放提示音
+        tts_notify = conn.config.get("enable_stop_tts_notify", False)
+        if tts_notify:
+            stop_tts_notify_voice = conn.config.get("stop_tts_notify_voice", "config/assets/tts_notify.mp3")
+            audios, duration = conn.tts.audio_to_opus_data(stop_tts_notify_voice)
+            await sendAudio(conn, audios)
+        # 清除服务端讲话状态
        conn.clearSpeakStatus()

+    # 发送消息到客户端
+    await conn.websocket.send(json.dumps(message))
+

 async def send_stt_message(conn, text):
    """发送 STT 状态消息"""
@@ -2,7 +2,9 @@ from config.logger import setup_logging
 import json
 from core.handle.abortHandle import handleAbortMessage
 from core.handle.helloHandle import handleHelloMessage
+from core.utils.util import remove_punctuation_and_length
 from core.handle.receiveAudioHandle import startToChat, handleAudioMessage
+from core.handle.sendAudioHandle import send_stt_message, send_tts_message
 from core.handle.iotHandle import handleIotDescriptors, handleIotStatus

 TAG = __name__
@@ -38,7 +40,21 @@ async def handleTextMessage(conn, message):
                conn.client_have_voice = False
                conn.asr_audio.clear()
                if "text" in msg_json:
-                    await startToChat(conn, msg_json["text"])
+                    text = msg_json["text"]
+                    _, text = remove_punctuation_and_length(text)
+
+                    # 识别是否是唤醒词
+                    is_wakeup_words = text in conn.config.get("wakeup_words")
+                    # 是否开启唤醒词回复
+                    enable_greeting = conn.config.get("enable_greeting", True)
+
+                    if is_wakeup_words and not enable_greeting:
+                        # 如果是唤醒词，且关闭了唤醒词回复，就不用回答
+                        await send_stt_message(conn, text)
+                        await send_tts_message(conn, "stop", None)
+                    else:
+                        # 否则需要LLM对文字内容进行答复
+                        await startToChat(conn, text)
        elif msg_json["type"] == "iot":
            if "descriptors" in msg_json:
                await handleIotDescriptors(conn, msg_json["descriptors"])
@@ -1,62 +0,0 @@
-import requests
-from requests.exceptions import RequestException
-from config.logger import setup_logging
-from core.providers.llm.base import LLMProviderBase
-
-TAG = __name__
-logger = setup_logging()
-
-
-class LLMProvider(LLMProviderBase):
-    def __init__(self, config):
-        self.agent_id = config.get("agent_id")  # 对应 agent_id
-        self.api_key = config.get("api_key")
-        self.base_url = config.get("base_url", config.get("url"))  # 默认使用 base_url
-        self.api_url = f"{self.base_url}/api/conversation/process"  # 拼接完整的 API URL
-
-    def response(self, session_id, dialogue):
-        print(dialogue)
-        try:
-            # home assistant语音助手自带意图，无需使用xiaozhi ai自带的，只需要把用户说的话传递给home assistant即可
-
-            # 提取最后一个 role 为 'user' 的 content
-            input_text = None
-            if isinstance(dialogue, list):  # 确保 dialogue 是一个列表
-                # 逆序遍历，找到最后一个 role 为 'user' 的消息
-                for message in reversed(dialogue):
-                    if message.get("role") == "user":  # 找到 role 为 'user' 的消息
-                        input_text = message.get("content", "")
-                        break  # 找到后立即退出循环
-
-            # 构造请求数据
-            payload = {
-                "text": input_text,
-                "agent_id": self.agent_id,
-                "conversation_id": session_id  # 使用 session_id 作为 conversation_id
-            }
-            # 设置请求头
-            headers = {
-                "Authorization": f"Bearer {self.api_key}",
-                "Content-Type": "application/json"
-            }
-
-            # 发起 POST 请求
-            response = requests.post(self.api_url, json=payload, headers=headers)
-
-            # 检查请求是否成功
-            response.raise_for_status()
-
-            # 解析返回数据
-            data = response.json()
-            speech = data.get("response", {}).get("speech", {}).get("plain", {}).get("speech", "")
-
-            # 返回生成的内容
-            if speech:
-                yield speech
-            else:
-                logger.bind(tag=TAG).warning("API 返回数据中没有 speech 内容")
-
-        except RequestException as e:
-            logger.bind(tag=TAG).error(f"HTTP 请求错误: {e}")
-        except Exception as e:
-            logger.bind(tag=TAG).error(f"生成响应时出错: {e}")
@@ -36,7 +36,7 @@ class TTSProviderBase(ABC):

            return tmp_file
        except Exception as e:
-            logger.bind(tag=TAG).info(f"Failed to generate TTS file: {e}")
+            logger.bind(tag=TAG).error(f"Failed to generate TTS file: {e}")
            return None

    @abstractmethod
@@ -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"])
@@ -35,6 +35,15 @@ class Dialogue:
            self.getMessages(m, dialogue)
        return dialogue

+    def update_system_message(self, new_content: str):
+        """更新或添加系统消息"""
+        # 查找第一个系统消息
+        system_msg = next((msg for msg in self.dialogue if msg.role == "system"), None)
+        if system_msg:
+            system_msg.content = new_content
+        else:
+            self.put(Message(role="system", content=new_content))
+
    def get_llm_dialogue_with_memory(self, memory_str: str = None) -> List[Dict[str, str]]:
        if memory_str is None or len(memory_str) == 0:
            return self.get_llm_dialogue()
@@ -73,9 +73,7 @@ def get_ip_info(ip_addr):
        resp = requests.get(url).json()

        ip_info = {
-            "city": resp.get("cityName"),
-            "region": resp.get("regionName"), 
-            "country": resp.get("countryName")
+            "city": resp.get("cityName")
        }
        return ip_info
    except Exception as e:
@@ -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协议地址，请勿用浏览器访问=======")
@@ -1,20 +1,19 @@
 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': []}
    }
 }
-
-
@register_function('get_time', get_time_function_desc, ToolType.WAIT)
 def get_time():
    """
-    获取当前时间、日期、星期几
+    获取当前的日期时间信息
    """
    now = datetime.now()
    current_time = now.strftime("%H:%M:%S")
@@ -22,4 +21,65 @@ def get_time():
    current_weekday = now.strftime("%A")
    response_text = f"当前日期: {current_date}，当前时间: {current_time}，星期: {current_weekday}"

+    return ActionResponse(Action.REQLLM, response_text, None)
+
+
+get_lunar_function_desc = {
+    "type": "function",
+    "function": {
+        "name": "get_lunar",
+        "description": (
+          "用于获取今天的阴历/农历和黄历信息。"
+          "用户可以指定查询内容，如：阴历日期、天干地支、节气、生肖、星座、八字、宜忌等。"
+          "如果没有指定查询内容，则默认查询干支年和农历日期。"
+        ),
+        "parameters": {
+            "type": "object", 
+            "properties": {
+                "query": {
+                    "type": "string",
+                    "description": "要查询的内容，例如阴历日期、天干地支、节日、节气、生肖、星座、八字、宜忌等"
+                }
+            }, 
+            "required": []
+        }
+    }
+}
+@register_function('get_lunar', get_lunar_function_desc, ToolType.WAIT)
+def get_lunar(query):
+    """
+    用于获取当前的阴历/农历，和天干地支、节气、生肖、星座、八字、宜忌等黄历信息
+    """
+    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"根据以下信息回应用户的查询请求，并提供与{query}相关的信息：\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)
@@ -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的值不需要报告给用户，每次都报告体感温度，根据语境选择合适的参数内容告知用户，并对参数给出相应评价)"
    )

@@ -0,0 +1,105 @@
+from config.logger import setup_logging
+from plugins_func.register import register_function, ToolType, ActionResponse, Action
+from core.handle.iotHandle import get_iot_status, send_iot_conn
+import asyncio
+
+TAG = __name__
+logger = setup_logging()
+
+async def _get_device_status(conn, device_name, device_type, property_name):
+    """获取设备状态"""
+    status = await get_iot_status(conn, device_type, property_name)
+    if status is None:
+        raise Exception(f"你的设备不支持{device_name}控制")
+    return status
+
+async def _set_device_property(conn, device_name, device_type, method_name, property_name, new_value=None, action=None, step=10):
+    """设置设备属性"""
+    current_value = await _get_device_status(conn, device_name, device_type, property_name)
+
+    if action == 'raise':
+        current_value += step
+    elif action == 'lower':
+        current_value -= step
+    elif action == 'set':
+        if new_value is None:
+            raise Exception(f"缺少{property_name}参数")
+        current_value = new_value
+
+    # 限制属性范围在0到100之间
+    current_value = max(0, min(100, current_value))
+
+    await send_iot_conn(conn, device_type, method_name, {property_name: current_value})
+    return current_value
+
+def _handle_device_action(conn, func, success_message, error_message, *args, **kwargs):
+    """处理设备操作的通用函数"""
+    future = asyncio.run_coroutine_threadsafe(func(conn, *args, **kwargs), conn.loop)
+    try:
+        result = future.result()
+        logger.bind(tag=TAG).info(f"{success_message}: {result}")
+        response = f"{success_message}{result}"
+        return ActionResponse(action=Action.RESPONSE, result=result, response=response)
+    except Exception as e:
+        logger.bind(tag=TAG).error(f"{error_message}: {e}")
+        response = f"{error_message}: {e}"
+        return ActionResponse(action=Action.RESPONSE, result=None, response=response)
+
+# 设备控制
+handle_device_function_desc = {
+    "type": "function",
+    "function": {
+        "name": "handle_device",
+        "description": (
+            "用户想要获取或者设置设备的音量/亮度大小，或者用户觉得声音/亮度过高或过低，或者用户想提高或降低音量/亮度。"
+            "比如用户说现在亮度多少，参数为：device_type:Backlight,action:get。"
+            "比如用户说设置音量为50，参数为：device_type:Speaker,action:set,value:50。"
+            "比如用户说亮度太高了，参数为：device_type:Backlight,action:lower。"
+            "比如用户说调大音量，参数为：device_type:Speaker,action:raise。"
+        ),
+        "parameters": {
+            "type": "object",
+            "properties": {
+                "device_type": {
+                    "type": "string",
+                    "description": "设备类型，可选值：Speaker(音量),Backlight(亮度)"
+                },
+                "action": {
+                    "type": "string",
+                    "description": "动作名称，可选值：get(获取),set(设置),raise(提高),lower(降低)"
+                },
+                "value": {
+                    "type": "int",
+                    "description": "值大小，可选值：0-100之间的整数"
+                }
+            },
+            "required": ["device_type", "action"]
+        }
+    }
+}
+
+@register_function('handle_device', handle_device_function_desc, ToolType.IOT_CTL)
+def handle_device(conn, device_type: str, action: str, value: int = None):
+    if device_type == "Speaker":
+        method_name, property_name, device_name = "SetVolume", "volume", "音量"
+    elif device_type == "Backlight":
+        method_name, property_name, device_name = "SetBrightness", "brightness", "亮度"
+    else:
+        raise Exception(f"未识别的设备类型: {device_type}")
+    
+    if action not in ["get", "set", "raise", "lower"]:
+        raise Exception(f"未识别的动作名称: {action}")
+    
+    if action == "get":
+        # get
+        return _handle_device_action(
+            conn, _get_device_status, f"当前{device_name}", f"获取{device_name}失败",
+            device_name=device_name, device_type=device_type, property_name=property_name,
+        )
+    else:
+        # set, raise, lower
+        return _handle_device_action(
+            conn, _set_device_property, f"{device_name}已调整到", f"{device_name}调整失败",
+            device_name=device_name, device_type=device_type, method_name=method_name,
+            property_name=property_name, new_value=value, action=action
+        )
@@ -0,0 +1,56 @@
+from plugins_func.register import register_function, ToolType, ActionResponse, Action
+from plugins_func.functions.hass_init import initialize_hass_handler
+from config.logger import setup_logging
+import asyncio
+import requests
+
+TAG = __name__
+logger = setup_logging()
+
+hass_get_state_function_desc = {
+    "type": "function",
+    "function": {
+        "name": "hass_get_state",
+        "description": "获取homeassistant里设备的状态,包括灯光亮度,媒体播放器的音量,设备的暂停、继续操作",
+        "parameters": {
+            "type": "object",
+            "properties": {
+                "entity_id": {
+                    "type": "string",
+                    "description": "需要操作的设备id,homeassistant里的entity_id"
+                }
+            },
+            "required": ["entity_id"]
+        }
+    }
+}
+
+
+@register_function("hass_get_state", hass_get_state_function_desc, ToolType.SYSTEM_CTL)
+def hass_get_state(conn, entity_id=''):
+    try:
+
+        future = asyncio.run_coroutine_threadsafe(
+            handle_hass_get_state(conn, entity_id),
+            conn.loop
+        )
+        ha_response = future.result()
+        return ActionResponse(action=Action.REQLLM, result="执行成功", response=ha_response)
+    except Exception as e:
+        logger.bind(tag=TAG).error(f"处理设置属性意图错误: {e}")
+
+
+async def handle_hass_get_state(conn, entity_id):
+    HASS_CACHE = initialize_hass_handler(conn)
+    api_key = HASS_CACHE['api_key']
+    base_url = HASS_CACHE['base_url']
+    url = f"{base_url}/api/states/{entity_id}"
+    headers = {
+        "Authorization": f"Bearer {api_key}",
+        "Content-Type": "application/json"
+    }
+    response = requests.get(url, headers=headers)
+    if response.status_code == 200:
+        return response.json()['state']
+    else:
+        return f"切换失败，错误码: {response.status_code}"
@@ -0,0 +1,35 @@
+from config.logger import setup_logging
+from core.utils.util import check_model_key
+
+TAG = __name__
+logger = setup_logging()
+
+HASS_CACHE = {}
+
+
+def append_devices_to_prompt(conn):
+    if conn.use_function_call_mode:
+        funcs = conn.config["Intent"]["function_call"].get("functions", [])
+        if "hass_get_state" in funcs or "hass_get_state" in funcs:
+            prompt = "下面是我家智能设备，可以通过homeassistant控制\n"
+            devices = conn.config["plugins"]["home_assistant"].get("devices", [])
+            if len(devices) == 0:
+                return
+            for device in devices:
+                prompt += device + "\n"
+            conn.prompt += prompt
+            # 更新提示词
+            conn.dialogue.update_system_message(conn.prompt)
+
+
+def initialize_hass_handler(conn):
+    global HASS_CACHE
+    if HASS_CACHE == {}:
+        if conn.use_function_call_mode:
+            funcs = conn.config["Intent"]["function_call"].get("functions", [])
+            if "hass_get_state" in funcs or "hass_get_state" in funcs:
+                HASS_CACHE['base_url'] = conn.config["plugins"]["home_assistant"].get("base_url")
+                HASS_CACHE['api_key'] = conn.config["plugins"]["home_assistant"].get("api_key")
+
+                check_model_key("home_assistant", HASS_CACHE['api_key'])
+    return HASS_CACHE
@@ -0,0 +1,64 @@
+from plugins_func.register import register_function, ToolType, ActionResponse, Action
+from plugins_func.functions.hass_init import initialize_hass_handler
+from config.logger import setup_logging
+import asyncio
+import requests
+
+TAG = __name__
+logger = setup_logging()
+
+hass_play_music_function_desc = {
+    "type": "function",
+    "function": {
+        "name": "hass_play_music",
+        "description": "用户想听音乐、有声书的时候使用，在房间的媒体播放器（media_player）里播放对应音频",
+        "parameters": {
+            "type": "object",
+            "properties": {
+                "media_content_id": {
+                    "type": "string",
+                    "description": "可以是音乐或有声书的专辑名称、歌曲名、演唱者,如果未指定就填random"
+                },
+                "entity_id": {
+                    "type": "string",
+                    "description": "需要操作的音箱的设备id,homeassistant里的entity_id,media_player开头"
+                }
+            },
+            "required": ["media_content_id", "entity_id"]
+        }
+    }
+}
+
+
+@register_function('hass_play_music', hass_play_music_function_desc, ToolType.SYSTEM_CTL)
+def hass_play_music(conn, entity_id='', media_content_id='random'):
+    try:
+        # 执行音乐播放命令
+        future = asyncio.run_coroutine_threadsafe(
+            handle_hass_play_music(conn, entity_id, media_content_id),
+            conn.loop
+        )
+        ha_response = future.result()
+        return ActionResponse(action=Action.RESPONSE, result="退出意图已处理", response=ha_response)
+    except Exception as e:
+        logger.bind(tag=TAG).error(f"处理音乐意图错误: {e}")
+
+
+async def handle_hass_play_music(conn, entity_id, media_content_id):
+    HASS_CACHE = initialize_hass_handler(conn)
+    api_key = HASS_CACHE['api_key']
+    base_url = HASS_CACHE['base_url']
+    url = f"{base_url}/api/services/music_assistant/play_media"
+    headers = {
+        "Authorization": f"Bearer {api_key}",
+        "Content-Type": "application/json"
+    }
+    data = {
+        "entity_id": entity_id,
+        "media_id": media_content_id
+    }
+    response = requests.post(url, headers=headers, json=data)
+    if response.status_code == 200:
+        return f"正在播放{media_content_id}的音乐"
+    else:
+        return f"音乐播放失败，错误码: {response.status_code}"
@@ -0,0 +1,159 @@
+from plugins_func.register import register_function, ToolType, ActionResponse, Action
+from plugins_func.functions.hass_init import initialize_hass_handler
+from config.logger import setup_logging
+import asyncio
+import requests
+
+TAG = __name__
+logger = setup_logging()
+
+hass_set_state_function_desc = {
+    "type": "function",
+    "function": {
+        "name": "hass_set_state",
+        "description": "设置homeassistant里设备的状态,包括开、关,调整灯光亮度,调整播放器的音量,设备的暂停、继续、静音操作",
+        "parameters": {
+            "type": "object",
+            "properties": {
+                "state": {
+                    "type": "object",
+                    "properties": {
+                        "type": {
+                            "type": "string",
+                            "description": "需要操作的动作,打开设备:turn_on,关闭设备:turn_off,增加亮度:brightness_up,降低亮度:brightness_down,设置亮度:brightness_value,增加>音量:,volume_up降低音量:volume_down,设置音量:volume_set,设备暂停:pause,设备继续:continue,静音/取消静音:volume_mute"
+                        },
+                        "input": {
+                            "type": "int",
+                            "description": "只有在设置音量,设置亮度时候才需要,有效值为1-100,对应音量和亮度的1%-100%"
+                        },
+                        "is_muted": {
+                            "type": "string",
+                            "description": "只有在设置静音操作时才需要,设置静音的时候该值为true,取消静音时该值为false"
+                        }
+                    },
+                    "required": ["type"]
+                },
+                "entity_id": {
+                    "type": "string",
+                    "description": "需要操作的设备id,homeassistant里的entity_id"
+                }
+            },
+            "required": ["state", "entity_id"]
+        }
+    }
+}
+
+
+@register_function('hass_set_state', hass_set_state_function_desc, ToolType.SYSTEM_CTL)
+def hass_set_state(conn, entity_id='', state={}):
+    try:
+        future = asyncio.run_coroutine_threadsafe(
+            handle_hass_set_state(conn, entity_id, state),
+            conn.loop
+        )
+        ha_response = future.result()
+        return ActionResponse(action=Action.REQLLM, result="执行成功", response=ha_response)
+    except Exception as e:
+        logger.bind(tag=TAG).error(f"处理设置属性意图错误: {e}")
+
+
+async def handle_hass_set_state(conn, entity_id, state):
+    HASS_CACHE = initialize_hass_handler(conn)
+    api_key = HASS_CACHE['api_key']
+    base_url = HASS_CACHE['base_url']
+    '''
+    state = { "type":"brightness_up","input":"80","is_muted":"true"}
+    '''
+    domains = entity_id.split(".")
+    if len(domains) > 1:
+        domain = domains[0]
+    else:
+        return "执行失败，错误的设备id"
+    action = ''
+    arg = ''
+    value = ''
+    if state['type'] == 'turn_on':
+        description = "设备已打开"
+        if domain == "cover":
+            action = "open_cover"
+        elif domain == "vacuum":
+            action = "start"
+        else:
+            action = "turn_on"
+    elif state['type'] == 'turn_off':
+        description = "设备已关闭"
+        if domain == 'cover':
+            action = "close_cover"
+        elif domain == 'vacuum':
+            action = "stop"
+        else:
+            action = "turn_off"
+    elif state['type'] == 'brightness_up':
+        description = "灯光已调亮"
+        action = 'turn_on'
+        arg = 'brightness_step_pct'
+        value = 10
+    elif state['type'] == 'brightness_down':
+        description = "灯光已调暗"
+        action = 'turn_on'
+        arg = 'brightness_step_pct'
+        value = -10
+    elif state['type'] == 'brightness_value':
+        description = f"亮度已调整到{state['input']}"
+        action = 'turn_on'
+        arg = 'brightness_pct'
+        value = state['input']
+    elif state['type'] == 'volume_up':
+        description = "音量已调大"
+        action = state['type']
+    elif state['type'] == 'volume_down':
+        description = "音量已调小"
+        action = state['type']
+    elif state['type'] == 'volume_set':
+        description = f"音量已调整到{state['input']}"
+        action = state['type']
+        arg = 'volume_level'
+        value = state['input']
+    elif state['type'] == 'volume_mute':
+        description = f"设备已静音"
+        action = state['type']
+        arg = 'is_volume_muted'
+        value = state['is_muted']
+    elif state['type'] == 'pause':
+        description = f"设备已暂停"
+        action = state['type']
+        if domain == 'media_player':
+            action = 'media_pause'
+        if domain == 'cover':
+            action = 'stop_cover'
+        if domain == 'vacuum':
+            action = 'pause'
+    elif state['type'] == 'continue':
+        description = f"设备已继续"
+        if domain == 'media_player':
+            action = 'media_play'
+        if domain == 'vacuum':
+            action = 'start'
+    else:
+        return f"{domain} {state.type}功能尚未支持"
+
+    if arg == '':
+        data = {
+            "entity_id": entity_id,
+        }
+    else:
+        data = {
+            "entity_id": entity_id,
+            arg: value
+        }
+    url = f"{base_url}/api/services/{domain}/{action}"
+    headers = {
+        "Authorization": f"Bearer {api_key}",
+        "Content-Type": "application/json"
+    }
+    response = requests.post(url, headers=headers, json=data)
+    logger.bind(tag=TAG).info(f"设置状态:url:{url},return_code:{response.status_code}")
+    if response.status_code == 200:
+        return description
+    else:
+        return f"设置失败，错误码: {response.status_code}"
@@ -21,13 +21,13 @@ play_music_function_desc = {
                "type": "function",
                "function": {
                    "name": "play_music",
-                    "description": "唱歌、听歌、播放音乐方法。比如用户说播放音乐，参数为：random，比如用户说播放两只老虎，参数为：两只老虎",
+                    "description": "唱歌、听歌、播放音乐的方法。",
                    "parameters": {
                        "type": "object",
                        "properties": {
                            "song_name": {
                                "type": "string",
-                                "description": "歌曲名称，如果没有指定具体歌名则为'random'"
+                                "description": "歌曲名称，如果用户没有指定具体歌名则为'random', 明确指定的时返回音乐的名字 示例: ```用户:播放两只老虎\n参数：两只老虎``` ```用户:播放音乐 \n参数：random ```"
                            }
                        },
                        "required": ["song_name"]
@@ -112,8 +112,8 @@ def get_music_files(music_dir, music_ext):
 def initialize_music_handler(conn):
    global MUSIC_CACHE
    if MUSIC_CACHE == {}:
-        if "music" in conn.config:
-            MUSIC_CACHE["music_config"] = conn.config["music"]
+        if "play_music" in conn.config["plugins"]:
+            MUSIC_CACHE["music_config"] = conn.config["plugins"]["play_music"]
            MUSIC_CACHE["music_dir"] = os.path.abspath(
                MUSIC_CACHE["music_config"].get("music_dir", "./music")  # 默认路径修改
            )
@@ -1,64 +0,0 @@
-from config.logger import setup_logging
-from plugins_func.register import register_function, ToolType, ActionResponse, Action
-from core.handle.iotHandle import get_iot_status, send_iot_conn
-import asyncio
-
-TAG = __name__
-logger = setup_logging()
-
-raise_and_lower_the_volume_function_desc = {
-    "type": "function",
-    "function": {
-        "name": "raise_and_lower_the_volume",
-        "description": "用户觉得声音过高或过低，或者用户想提高或降低音量。比如用户说太大声了，参数为：lower，比如用户说提高音量，参数为：raise",
-        "parameters": {
-            "type": "object",
-            "properties": {
-                "action": {
-                    "type": "string",
-                    "description": "动作名称，要么是raise，要么是lower"
-                }
-            },
-            "required": ["action"]
-        }
-    }
-}
-
-
-@register_function('raise_and_lower_the_volume', raise_and_lower_the_volume_function_desc, ToolType.IOT_CTL)
-def raise_and_lower_the_volume(conn, action: str):
-    """
-    获取当前设备音量
-    """
-
-    future = asyncio.run_coroutine_threadsafe(
-        _raise_and_lower_the_volume(conn, action),
-        conn.loop
-    )
-
-    try:
-        new_volume = future.result()  # 同步等待异步操作完成
-        logger.bind(tag=TAG).info(f"音量操作完成: {new_volume}")
-        response = f"音量已调整到{new_volume}"
-    except Exception as e:
-        logger.bind(tag=TAG).error(f"音量操作失败: {e}")
-        response = f"音量调整失败: {e}"
-
-    return ActionResponse(action=Action.RESPONSE, result="指令已接收", response=response)
-
-
-async def _raise_and_lower_the_volume(conn, action):
-    volume = await get_iot_status(conn, "Speaker", "volume")
-    if volume is None:
-        raise Exception("你的设备不支持音量控制")
-    if action == 'raise':
-        volume += 10
-    elif action == 'lower':
-        volume -= 10
-    # 限制音量范围在0到100之间
-    if volume < 0:
-        volume = 0
-    elif volume > 100:
-        volume = 100
-    await send_iot_conn(conn, "Speaker", "SetVolume", {"volume": volume})
-    return volume
@@ -22,6 +22,4 @@ def auto_import_modules(package_name):
        # 导入模块
        full_module_name = f"{package_name}.{module_name}"
        importlib.import_module(full_module_name)
-        #logger.bind(tag=TAG).info(f"模块 '{full_module_name}' 已加载")
-
-auto_import_modules('plugins_func.functions')
+        #logger.bind(tag=TAG).info(f"模块 '{full_module_name}' 已加载")
@@ -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