Hass/xiaozhi-esp32-server
1
0
Fork 0
mirror of https://github.com/xinnan-tech/xiaozhi-esp32-server.git synced 2026-07-27 17:43:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1935 from myifeng/aliyun-internal

Browse Source 
如果配置的是ECS内网地址，则使用ws协议，默认是wss协议
This commit is contained in:
hrz
2025-07-29 08:59:34 +08:00
committed by GitHub
parent 121f1c4698 b07a8796ff
commit 67c4622ca7
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/xiaozhi-server/core/providers/asr/aliyun_stream.py
+7 -1
View File
@@ -84,7 +84,13 @@ class ASRProvider(ASRProviderBase):
self.appkey = config.get("appkey") self.appkey = config.get("appkey")
self.token = config.get("token") self.token = config.get("token")
self.host = config.get("host", "nls-gateway-cn-shanghai.aliyuncs.com") self.host = config.get("host", "nls-gateway-cn-shanghai.aliyuncs.com")
self.ws_url = f"wss://{self.host}/ws/v1" # 如果配置的是内网地址（包含-internal.aliyuncs.com），则使用ws协议，默认是wss协议
if "-internal." in self.host:
self.ws_url = f"ws://{self.host}/ws/v1"
else:
# 默认使用wss协议
self.ws_url = f"wss://{self.host}/ws/v1"
self.max_sentence_silence = config.get("max_sentence_silence") self.max_sentence_silence = config.get("max_sentence_silence")
self.output_dir = config.get("output_dir", "./audio_output") self.output_dir = config.get("output_dir", "./audio_output")
self.delete_audio_file = delete_audio_file self.delete_audio_file = delete_audio_file
main/xiaozhi-server/core/providers/tts/aliyun_stream.py
+6 -1
View File
@@ -120,7 +120,12 @@ class TTSProvider(TTSProviderBase):
# WebSocket配置 # WebSocket配置
self.host = config.get("host", "nls-gateway-cn-beijing.aliyuncs.com") self.host = config.get("host", "nls-gateway-cn-beijing.aliyuncs.com")
self.ws_url = f"wss://{self.host}/ws/v1" # 如果配置的是内网地址（包含-internal.aliyuncs.com），则使用ws协议，默认是wss协议
if "-internal." in self.host:
self.ws_url = f"ws://{self.host}/ws/v1"
else:
# 默认使用wss协议
self.ws_url = f"wss://{self.host}/ws/v1"
self.ws = None self.ws = None
self._monitor_task = None self._monitor_task = None
self.last_active_time = None self.last_active_time = None