mirror of
https://github.com/xinnan-tech/xiaozhi-esp32-server.git
synced 2026-07-26 09:03:54 +08:00
update:单Server部署时,docker-compose开放8002端口
This commit is contained in:
@@ -888,7 +888,7 @@ class ConnectionHandler:
|
|||||||
|
|
||||||
def clear_queues(self):
|
def clear_queues(self):
|
||||||
# 清空所有任务队列
|
# 清空所有任务队列
|
||||||
self.logger.bind(tag=TAG).info(
|
self.logger.bind(tag=TAG).debug(
|
||||||
f"开始清理: TTS队列大小={self.tts_queue.qsize()}, 音频队列大小={self.audio_play_queue.qsize()}"
|
f"开始清理: TTS队列大小={self.tts_queue.qsize()}, 音频队列大小={self.audio_play_queue.qsize()}"
|
||||||
)
|
)
|
||||||
for q in [self.tts_queue, self.audio_play_queue]:
|
for q in [self.tts_queue, self.audio_play_queue]:
|
||||||
@@ -902,7 +902,7 @@ class ConnectionHandler:
|
|||||||
q.queue.clear()
|
q.queue.clear()
|
||||||
# 添加毒丸信号到队列,确保线程退出
|
# 添加毒丸信号到队列,确保线程退出
|
||||||
# q.queue.put(None)
|
# q.queue.put(None)
|
||||||
self.logger.bind(tag=TAG).info(
|
self.logger.bind(tag=TAG).debug(
|
||||||
f"清理结束: TTS队列大小={self.tts_queue.qsize()}, 音频队列大小={self.audio_play_queue.qsize()}"
|
f"清理结束: TTS队列大小={self.tts_queue.qsize()}, 音频队列大小={self.audio_play_queue.qsize()}"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,8 @@ services:
|
|||||||
ports:
|
ports:
|
||||||
# ws服务端
|
# ws服务端
|
||||||
- "8000:8000"
|
- "8000:8000"
|
||||||
|
# ota服务端
|
||||||
|
- "8002:8002"
|
||||||
volumes:
|
volumes:
|
||||||
# 配置文件目录
|
# 配置文件目录
|
||||||
- ./data:/opt/xiaozhi-esp32-server/data
|
- ./data:/opt/xiaozhi-esp32-server/data
|
||||||
|
|||||||
@@ -446,7 +446,7 @@
|
|||||||
<h2>
|
<h2>
|
||||||
设备配置
|
设备配置
|
||||||
<span class="device-info">
|
<span class="device-info">
|
||||||
<span>MAC: <strong id="displayMac">00:11:22:33:44:55</strong></span>
|
<span>MAC: <strong id="displayMac"></strong></span>
|
||||||
<span>客户端: <strong id="displayClient">web_test_client</strong></span>
|
<span>客户端: <strong id="displayClient">web_test_client</strong></span>
|
||||||
</span>
|
</span>
|
||||||
<button class="toggle-button" id="toggleConfig">编辑</button>
|
<button class="toggle-button" id="toggleConfig">编辑</button>
|
||||||
@@ -455,7 +455,7 @@
|
|||||||
<div class="control-panel">
|
<div class="control-panel">
|
||||||
<div class="config-item">
|
<div class="config-item">
|
||||||
<label for="deviceMac">设备MAC:</label>
|
<label for="deviceMac">设备MAC:</label>
|
||||||
<input type="text" id="deviceMac" value="00:11:22:33:44:55" placeholder="设备MAC地址">
|
<input type="text" id="deviceMac" placeholder="设备MAC地址">
|
||||||
</div>
|
</div>
|
||||||
<div class="config-item">
|
<div class="config-item">
|
||||||
<label for="deviceName">设备名称:</label>
|
<label for="deviceName">设备名称:</label>
|
||||||
@@ -1582,6 +1582,19 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 生成随机MAC地址
|
||||||
|
function generateRandomMac() {
|
||||||
|
const hexDigits = '0123456789ABCDEF';
|
||||||
|
let mac = '';
|
||||||
|
for (let i = 0; i < 6; i++) {
|
||||||
|
if (i > 0) mac += ':';
|
||||||
|
for (let j = 0; j < 2; j++) {
|
||||||
|
mac += hexDigits.charAt(Math.floor(Math.random() * 16));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return mac;
|
||||||
|
}
|
||||||
|
|
||||||
// 初始化事件监听器
|
// 初始化事件监听器
|
||||||
function initEventListeners() {
|
function initEventListeners() {
|
||||||
connectButton.addEventListener('click', connectToServer);
|
connectButton.addEventListener('click', connectToServer);
|
||||||
@@ -1595,10 +1608,22 @@
|
|||||||
const displayMac = document.getElementById('displayMac');
|
const displayMac = document.getElementById('displayMac');
|
||||||
const displayClient = document.getElementById('displayClient');
|
const displayClient = document.getElementById('displayClient');
|
||||||
|
|
||||||
|
// 从localStorage加载MAC地址,如果没有则生成新的
|
||||||
|
let savedMac = localStorage.getItem('deviceMac');
|
||||||
|
if (!savedMac) {
|
||||||
|
savedMac = generateRandomMac();
|
||||||
|
localStorage.setItem('deviceMac', savedMac);
|
||||||
|
}
|
||||||
|
deviceMacInput.value = savedMac;
|
||||||
|
displayMac.textContent = savedMac;
|
||||||
|
|
||||||
// 更新显示的值
|
// 更新显示的值
|
||||||
function updateDisplayValues() {
|
function updateDisplayValues() {
|
||||||
displayMac.textContent = deviceMacInput.value;
|
const newMac = deviceMacInput.value;
|
||||||
|
displayMac.textContent = newMac;
|
||||||
displayClient.textContent = clientIdInput.value;
|
displayClient.textContent = clientIdInput.value;
|
||||||
|
// 保存MAC地址到localStorage
|
||||||
|
localStorage.setItem('deviceMac', newMac);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 监听输入变化
|
// 监听输入变化
|
||||||
|
|||||||
Reference in New Issue
Block a user