update 1.5.0

Author: pengjinning

README.md

@@ -113,7 +113,7 @@ cd bytedesk/deploy/docker
 ./start.sh mysql artemis standard middleware
 ```
 
-For more startup/stop combinations (PostgreSQL, Oracle, RabbitMQ, noai, call, full stack), see `deploy/docker/readme.md`.
+For more startup/stop combinations (PostgreSQL, Oracle, RabbitMQ, noai, call, full stack), see [docker readme](deploy/docker/readme.md).
 
 ```bash
 # Please replace 127.0.0.1 with your server IP

README.zh.md

@@ -101,7 +101,7 @@ cd bytedesk/deploy/docker
 ./start.sh mysql artemis standard middleware
 ```
 
-更多启动/停止组合（PostgreSQL、Oracle、RabbitMQ、noai、call、全量启动）请参考 `deploy/docker/readme.zh.md`。
+更多启动/停止组合（PostgreSQL、Oracle、RabbitMQ、noai、call、全量启动）请参考 [docker readme](deploy/docker/readme.zh.md)。
 
 - [Docker部署](https://www.weiyuai.cn/docs/zh-CN/docs/deploy/docker)
 - [宝塔面板部署](https://www.weiyuai.cn/docs/zh-CN/docs/deploy/baota)

deploy/docker/.env.example

@@ -27,6 +27,7 @@ KINGBASE_ENABLE_CI=yes
 KINGBASE_NEED_START=yes
 
 FREESWITCH_DB_HOST=bytedesk-db
+FREESWITCH_DATABASE=bytedesk_freeswitch
 
 # =====================================
 # Middleware Credentials / 中间件凭据
@@ -62,6 +63,23 @@ COTURN_USER=bytedesk
 COTURN_PASS=please_change_coturn_password
 FREESWITCH_ESL_PASSWORD=please_change_freeswitch_esl_password
 
+# FreeSWITCH runtime overrides / FreeSWITCH 运行参数覆盖
+# 说明：以下变量会覆盖 deploy/freeswitch/conf/vars.xml 中默认值
+# XML-CURL 回源地址请填写“freeswitch 容器可访问”的应用地址
+FREESWITCH_CDR_PASSWORD=please_change_freeswitch_cdr_password
+FREESWITCH_XML_CURL_TOKEN=please_change_xml_curl_token
+FREESWITCH_XML_CURL_GATEWAY_URL=http://bytedesk-starter:9003/freeswitch/api/v1/xmlcurl
+FREESWITCH_API_BASE_URL=http://bytedesk-starter:9003
+FREESWITCH_DB_HOST=bytedesk-db
+FREESWITCH_DB_PORT=3306
+FREESWITCH_DB_NAME=bytedesk_freeswitch
+FREESWITCH_DB_USERNAME=root
+FREESWITCH_DB_PASSWORD=please_change_freeswitch_db_password
+# 推荐：在 docker 网络内使用 coturn 服务名
+FREESWITCH_STUN_SERVER=stun:bytedesk-coturn:3478
+FREESWITCH_RTP_START_PORT=16384
+FREESWITCH_RTP_END_PORT=32768
+
 # =====================================
 # Bytedesk security / 微语安全配置
 # =====================================

deploy/docker/compose-app-bytedesk.yaml

@@ -17,7 +17,7 @@ services:
       TZ: Asia/Shanghai
       SERVER_PORT: 9003
       BYTEDESK_DEBUG: "false"
-      BYTEDESK_VERSION: 1.0.0
+      BYTEDESK_VERSION: 1.5.0
       BYTEDESK_LICENSE_KEY: ${BYTEDESK_LICENSE_KEY:-}
       BYTEDESK_CUSTOM_ENABLED: "false"
       BYTEDESK_CUSTOM_NAME:

deploy/docker/compose-call-db-mysql.yaml

@@ -4,4 +4,4 @@ services:
   bytedesk-freeswitch:
     environment:
       FS_CORE_DB_MODULE: mod_mariadb
-      FS_CORE_DB_DSN: "mariadb://Server=${FREESWITCH_DB_HOST:-bytedesk-db};Port=${MYSQL_PORT:-3306};Database=${MYSQL_DATABASE:-bytedesk};Uid=${MYSQL_ROOT_USER:-root};Pwd=${MYSQL_ROOT_PASSWORD};"
+      FS_CORE_DB_DSN: "mariadb://Server=${FREESWITCH_DB_HOST:-bytedesk-db};Port=${MYSQL_PORT:-3306};Database=${FREESWITCH_DATABASE:-bytedesk_freeswitch};Uid=${MYSQL_ROOT_USER:-root};Pwd=${MYSQL_ROOT_PASSWORD};"

deploy/docker/compose-call-db-postgresql.yaml

@@ -4,4 +4,4 @@ services:
   bytedesk-freeswitch:
     environment:
       FS_CORE_DB_MODULE: mod_pgsql
-      FS_CORE_DB_DSN: "pgsql://host=${FREESWITCH_DB_HOST:-bytedesk-db} dbname=${POSTGRES_DB:-bytedesk} user=${POSTGRES_USER:-postgres} password=${POSTGRES_PASSWORD} options='-c client_min_messages=NOTICE'"
+      FS_CORE_DB_DSN: "pgsql://host=${FREESWITCH_DB_HOST:-bytedesk-db} dbname=${FREESWITCH_DATABASE:-bytedesk_freeswitch} user=${POSTGRES_USER:-postgres} password=${POSTGRES_PASSWORD} options='-c client_min_messages=NOTICE'"

deploy/docker/compose-db-mysql.yaml

@@ -11,6 +11,12 @@ services:
       - "${MYSQL_HOST_PORT:-13306}:${MYSQL_PORT:-3306}"
     volumes:
       - mysql_data:/var/lib/mysql
+    healthcheck:
+      test: ["CMD-SHELL", "mysqladmin ping -h 127.0.0.1 -uroot -p$${MYSQL_ROOT_PASSWORD} --silent"]
+      interval: 10s
+      timeout: 5s
+      retries: 20
+      start_period: 20s
     networks:
       bytedesk-network:
         aliases:

deploy/docker/compose-scenario-call.yaml

@@ -40,6 +40,7 @@ services:
       start_period: 15s
 
   # FreeSwitch 语音通话服务
+  # 本地镜像Dockerfile地址：/Users/ningjinpeng/Desktop/git/github/bytedesk-freeswitch/docker/Dockerfile
   # https://hub.docker.com/r/bytedesk/freeswitch
   # https://github.com/Bytedesk/bytedesk-freeswitch
   # 使用自定义构建的 FreeSWITCH 镜像（支持 ARM64/AMD64）
@@ -55,7 +56,26 @@ services:
     environment:
       TZ: Asia/Shanghai
       DISABLE_IPV6: "true"
+      # ESL 入站口令（与 vars.xml 的 esl_password 对应）
       FREESWITCH_ESL_PASSWORD: ${FREESWITCH_ESL_PASSWORD}
+      # xml_cdr Basic 凭据密码
+      FREESWITCH_CDR_PASSWORD: ${FREESWITCH_CDR_PASSWORD:-bytedesk123}
+      # mod_xml_curl 鉴权 token（需与应用侧配置一致）
+      FREESWITCH_XML_CURL_TOKEN: ${FREESWITCH_XML_CURL_TOKEN:-change_me_in_production}
+      # mod_xml_curl 回源地址（与 XmlCurlController 统一：/freeswitch/api/v1/xmlcurl）
+      FREESWITCH_XML_CURL_GATEWAY_URL: ${FREESWITCH_XML_CURL_GATEWAY_URL:-http://host.docker.internal:9003/freeswitch/api/v1/xmlcurl}
+      # 应用基础地址（用于 cdr_url/user_lookup_url 等派生）
+      FREESWITCH_API_BASE_URL: ${FREESWITCH_API_BASE_URL:-http://host.docker.internal:9003}
+      # FreeSWITCH 数据库连接参数
+      FREESWITCH_DB_HOST: ${FREESWITCH_DB_HOST:-bytedesk-db}
+      FREESWITCH_DB_PORT: ${FREESWITCH_DB_PORT:-3306}
+      FREESWITCH_DB_NAME: ${FREESWITCH_DB_NAME:-bytedesk_freeswitch}
+      FREESWITCH_DB_USERNAME: ${FREESWITCH_DB_USERNAME:-root}
+      FREESWITCH_DB_PASSWORD: ${FREESWITCH_DB_PASSWORD:-r8FqfdbWUaN3}
+      # WebRTC / RTP 参数（默认使用 compose 内 coturn 服务）
+      FREESWITCH_STUN_SERVER: ${FREESWITCH_STUN_SERVER:-stun:bytedesk-coturn:3478}
+      FREESWITCH_RTP_START_PORT: ${FREESWITCH_RTP_START_PORT:-16384}
+      FREESWITCH_RTP_END_PORT: ${FREESWITCH_RTP_END_PORT:-32768}
     ports:
       - "15060:5060/tcp"
       - "15060:5060/udp"
@@ -78,8 +98,11 @@ services:
       - ../freeswitch/recordings:/usr/local/freeswitch/recordings
       - ../freeswitch/etc/odbc.ini:/etc/odbc.ini:ro
       - ../freeswitch/etc/odbcinst.ini:/etc/odbcinst.ini:ro
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     depends_on:
-      - bytedesk-db
+      bytedesk-db:
+        condition: service_healthy
     networks:
       - bytedesk-network
     healthcheck:

deploy/docker/one/docker-compose-all.yaml

@@ -244,7 +244,7 @@ services:
       SERVER_PORT: 9003
       # bytedesk config
       BYTEDESK_DEBUG: "false"
-      BYTEDESK_VERSION: 1.0.0
+      BYTEDESK_VERSION: 1.5.0
       # open profile 数据源类型：mysql / postgresql / oracle / kingbase / h2
       BYTEDESK_DATASOURCE_ACTIVE: mysql
       # 申请licenseKey

deploy/docker/one/docker-compose-noai.yaml

@@ -161,7 +161,7 @@ services:
       SERVER_PORT: 9003
       # bytedesk config
       BYTEDESK_DEBUG: "false"
-      BYTEDESK_VERSION: 1.0.0
+      BYTEDESK_VERSION: 1.5.0
       # open profile 数据源类型：mysql / postgresql / oracle / kingbase / h2
       BYTEDESK_DATASOURCE_ACTIVE: mysql
       # 申请licenseKey