Skip to content

Commit 5fb7fbe

Browse files
authored
Merge branch 'main' into py_test_Memory_powermem
2 parents 42b495d + 73f8a09 commit 5fb7fbe

File tree

103 files changed

+21864
-310
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+21864
-310
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
-- 删除无用业务表ai_voiceprint
2+
DROP TABLE IF EXISTS ai_voiceprint;

main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -522,3 +522,10 @@ databaseChangeLog:
522522
- sqlFile:
523523
encoding: utf8
524524
path: classpath:db/changelog/202602051017.sql
525+
- changeSet:
526+
id: 202602051125
527+
author: DaGou12138
528+
changes:
529+
- sqlFile:
530+
encoding: utf8
531+
path: classpath:db/changelog/202602051125.sql

main/manager-web/src/i18n/de.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -836,6 +836,7 @@ export default {
836836
'modelConfig.unknown': 'Unbekannt',
837837
'modelConfig.isEnabled': 'Aktiviert',
838838
'modelConfig.isDefault': 'Standard',
839+
'modelConfig.defaultModelCannotDisable': 'Standardmodellkonfiguration kann nicht deaktiviert werden',
839840
'modelConfig.action': 'Aktion',
840841
'modelConfig.voiceManagement': 'Stimmverwaltung',
841842
'modelConfig.edit': 'Bearbeiten',

main/manager-web/src/i18n/en.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -836,6 +836,7 @@ export default {
836836
'modelConfig.unknown': 'Unknown',
837837
'modelConfig.isEnabled': 'Enabled',
838838
'modelConfig.isDefault': 'Default',
839+
'modelConfig.defaultModelCannotDisable': 'Default model configuration cannot be disabled',
839840
'modelConfig.action': 'Action',
840841
'modelConfig.voiceManagement': 'Voice Management',
841842
'modelConfig.edit': 'Edit',

main/manager-web/src/i18n/vi.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -836,6 +836,7 @@ export default {
836836
'modelConfig.unknown': 'Không xác định',
837837
'modelConfig.isEnabled': 'Đã bật',
838838
'modelConfig.isDefault': 'Mặc định',
839+
'modelConfig.defaultModelCannotDisable': 'Cấu hình mô hình mặc định không thể tắt',
839840
'modelConfig.action': 'Hành động',
840841
'modelConfig.voiceManagement': 'Quản lý giọng nói',
841842
'modelConfig.edit': 'Chỉnh sửa',

main/manager-web/src/i18n/zh_CN.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -836,6 +836,7 @@ export default {
836836
'modelConfig.unknown': '未知',
837837
'modelConfig.isEnabled': '是否启用',
838838
'modelConfig.isDefault': '是否默认',
839+
'modelConfig.defaultModelCannotDisable': '默认模型配置不允许关闭',
839840
'modelConfig.action': '操作',
840841
'modelConfig.voiceManagement': '音色管理',
841842
'modelConfig.edit': '修改',

main/manager-web/src/i18n/zh_TW.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -836,6 +836,7 @@ export default {
836836
'modelConfig.unknown': '未知',
837837
'modelConfig.isEnabled': '是否啟用',
838838
'modelConfig.isDefault': '是否默認',
839+
'modelConfig.defaultModelCannotDisable': '預設模型配置不允許關閉',
839840
'modelConfig.action': '操作',
840841
'modelConfig.voiceManagement': '音色管理',
841842
'modelConfig.edit': '修改',

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,23 @@
9797
</el-table-column>
9898
<el-table-column :label="$t('modelConfig.isEnabled')" align="center">
9999
<template slot-scope="scope">
100+
<el-tooltip
101+
v-if="scope.row.isDefault === 1 && scope.row.isEnabled === 1"
102+
:content="$t('modelConfig.defaultModelCannotDisable')"
103+
placement="top"
104+
effect="light"
105+
>
106+
<el-switch
107+
v-model="scope.row.isEnabled"
108+
class="custom-switch"
109+
:active-value="1"
110+
:inactive-value="0"
111+
disabled
112+
@change="handleStatusChange(scope.row)"
113+
/>
114+
</el-tooltip>
100115
<el-switch
116+
v-else
101117
v-model="scope.row.isEnabled"
102118
class="custom-switch"
103119
:active-value="1"

main/xiaozhi-server/core/api/vision_handler.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,15 @@ def _create_error_response(self, message: str) -> dict:
2929

3030
def _verify_auth_token(self, request) -> Tuple[bool, Optional[str]]:
3131
"""验证认证token"""
32+
# 测试模式:允许特定测试令牌或跳过验证
3233
auth_header = request.headers.get("Authorization", "")
34+
client_id = request.headers.get("Client-Id", "")
35+
36+
# 允许测试客户端跳过认证
37+
if client_id == "web_test_client":
38+
device_id = request.headers.get("Device-Id", "test_device")
39+
return True, device_id
40+
3341
if not auth_header.startswith("Bearer "):
3442
return False, None
3543

main/xiaozhi-server/core/connection.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def __init__(
7878

7979
self.read_config_from_api = self.config.get("read_config_from_api", False)
8080

81-
self.websocket = None
81+
self.websocket: websockets.ServerConnection | None = None
8282
self.headers = None
8383
self.device_id = None
8484
self.client_ip = None
@@ -169,7 +169,7 @@ def __init__(
169169
# 初始化提示词管理器
170170
self.prompt_manager = PromptManager(self.config, self.logger)
171171

172-
async def handle_connection(self, ws):
172+
async def handle_connection(self, ws: websockets.ServerConnection):
173173
try:
174174
# 获取运行中的事件循环(必须在异步上下文中)
175175
self.loop = asyncio.get_running_loop()

0 commit comments

Comments
 (0)