Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	.env
#	yj_room_agent/LLM/ai_service.py
This commit is contained in:
yujj128
2025-06-09 11:52:35 +08:00
5 changed files with 138 additions and 21 deletions

6
.env
View File

@@ -5,9 +5,9 @@ MODEL_BASE_URL=https://api.deepseek.com
#模型名称
MODEL_NAME=deepseek-chat
#放行host地址
DJANGO_ALLOWED_HOSTS=192.168.237.130,127.0.0.1,10.212.27.4
DJANGO_ALLOWED_HOSTS=192.168.237.130,127.0.0.1,172.20.10.10
#是否开启debug模式
DJANGO_DEBUG_ENABLE=False
DJANGO_DEBUG_ENABLE=True
DEFAULT_AUTH_URL = 'https://oa-dev.yced.com.cn/iuap-api-auth'
DEFAULT_GATEWAY_URL = 'https://oa-dev.yced.com.cn/iuap-api-gateway '
@@ -25,4 +25,4 @@ QUERY_MEETING_ROOM = ['GET', '/yonbip/uspace/external/access/getMeetingRoom']
QUERY_MEETINGBOOKING_INFO = ['GET', '/yonbip/uspace/external/access/getDestineInformation']
BOOK_MEETING_ROOM = ['POST', '/yonbip/uspace/destine/Meeting']
CANCEL_MEETING = ['POST', '/yonbip/uspace/cancel/Meeting']
BOOKMEETING = ['POST', '/yonbip/uspace/external/access/book']
BOOKMEETING = ['POST', '/yonbip/uspace/external/access/book']