diff --git a/docker-compose-node-01.yml b/docker-compose-node-01.yml index 10079bb..e1969ad 100644 --- a/docker-compose-node-01.yml +++ b/docker-compose-node-01.yml @@ -174,6 +174,7 @@ services: restart: always ports: - "9000:9000" + - "8719:8719" environment: - SPRING_PROFILES_ACTIVE=ha - NACOS_HOST=nacos @@ -186,9 +187,10 @@ services: - SPRING_CLOUD_NACOS_CONFIG_PASSWORD=nacos - SPRING_CLOUD_NACOS_DISCOVERY_IP=${HOST_IP:-192.168.1.101} - NACOS_SERVERS=${NACOS_SERVERS:-192.168.1.101:8848,192.168.1.102:8848,192.168.1.103:8848} - - SENTINEL_DASHBOARD_HOST=sentinel - - SENTINEL_DASHBOARD_PORT=8080 - - SPRING_CLOUD_SENTINEL_CLIENT_IP=${HOST_IP:-192.168.1.101} + - SENTINEL_DASHBOARD_HOST=${HOST_IP:-192.168.1.101} + - SENTINEL_DASHBOARD_PORT=8880 + - SPRING_CLOUD_SENTINEL_TRANSPORT_CLIENT_IP=${HOST_IP:-192.168.1.101} + - SPRING_CLOUD_SENTINEL_TRANSPORT_PORT=8719 - GATEWAY_IP=${HOST_IP:-192.168.1.101} - JAVA_OPTS=-Xms256m -Xmx512m healthcheck: @@ -210,6 +212,7 @@ services: restart: always ports: - "9001:9001" + - "8720:8720" environment: - SPRING_PROFILES_ACTIVE=ha - NACOS_HOST=nacos @@ -229,9 +232,10 @@ services: - REDIS_HOST=redis - REDIS_PORT=6379 - REDIS_PASSWORD=${REDIS_PASSWORD:-redis_HA_Cluster_2024} - - SENTINEL_DASHBOARD_HOST=sentinel - - SENTINEL_DASHBOARD_PORT=8080 - - SPRING_CLOUD_SENTINEL_CLIENT_IP=${HOST_IP:-192.168.1.101} + - SENTINEL_DASHBOARD_HOST=${HOST_IP:-192.168.1.101} + - SENTINEL_DASHBOARD_PORT=8880 + - SPRING_CLOUD_SENTINEL_TRANSPORT_CLIENT_IP=${HOST_IP:-192.168.1.101} + - SPRING_CLOUD_SENTINEL_TRANSPORT_PORT=8720 - AUTH_IP=${HOST_IP:-192.168.1.101} - JAVA_OPTS=-Xms256m -Xmx512m healthcheck: @@ -257,6 +261,7 @@ services: restart: always ports: - "9002:9002" + - "8721:8721" environment: - SPRING_PROFILES_ACTIVE=ha - NACOS_HOST=nacos @@ -275,9 +280,10 @@ services: - REDIS_HOST=redis - REDIS_PORT=6379 - REDIS_PASSWORD=${REDIS_PASSWORD:-redis_HA_Cluster_2024} - - SENTINEL_DASHBOARD_HOST=sentinel - - SENTINEL_DASHBOARD_PORT=8080 - - SPRING_CLOUD_SENTINEL_CLIENT_IP=${HOST_IP:-192.168.1.101} + - SENTINEL_DASHBOARD_HOST=${HOST_IP:-192.168.1.101} + - SENTINEL_DASHBOARD_PORT=8880 + - SPRING_CLOUD_SENTINEL_TRANSPORT_CLIENT_IP=${HOST_IP:-192.168.1.101} + - SPRING_CLOUD_SENTINEL_TRANSPORT_PORT=8721 - USER_IP=${HOST_IP:-192.168.1.101} - JAVA_OPTS=-Xms256m -Xmx512m depends_on: @@ -298,6 +304,7 @@ services: restart: always ports: - "9003:9003" + - "8722:8722" environment: - SPRING_PROFILES_ACTIVE=ha - NACOS_HOST=nacos @@ -323,9 +330,10 @@ services: - MINIO_ACCESS_KEY=minioadmin - MINIO_SECRET_KEY=minioadmin123 - MINIO_BUCKET=video-platform - - SENTINEL_DASHBOARD_HOST=sentinel - - SENTINEL_DASHBOARD_PORT=8080 - - SPRING_CLOUD_SENTINEL_CLIENT_IP=${HOST_IP:-192.168.1.101} + - SENTINEL_DASHBOARD_HOST=${HOST_IP:-192.168.1.101} + - SENTINEL_DASHBOARD_PORT=8880 + - SPRING_CLOUD_SENTINEL_TRANSPORT_CLIENT_IP=${HOST_IP:-192.168.1.101} + - SPRING_CLOUD_SENTINEL_TRANSPORT_PORT=8722 - CONTENT_IP=${HOST_IP:-192.168.1.101} - JAVA_OPTS=-Xms256m -Xmx512m depends_on: @@ -350,6 +358,7 @@ services: restart: always ports: - "9004:9004" + - "8723:8723" environment: - SPRING_PROFILES_ACTIVE=ha - NACOS_HOST=nacos @@ -368,9 +377,10 @@ services: - REDIS_HOST=redis - REDIS_PORT=6379 - REDIS_PASSWORD=${REDIS_PASSWORD:-redis_HA_Cluster_2024} - - SENTINEL_DASHBOARD_HOST=sentinel - - SENTINEL_DASHBOARD_PORT=8080 - - SPRING_CLOUD_SENTINEL_CLIENT_IP=${HOST_IP:-192.168.1.101} + - SENTINEL_DASHBOARD_HOST=${HOST_IP:-192.168.1.101} + - SENTINEL_DASHBOARD_PORT=8880 + - SPRING_CLOUD_SENTINEL_TRANSPORT_CLIENT_IP=${HOST_IP:-192.168.1.101} + - SPRING_CLOUD_SENTINEL_TRANSPORT_PORT=8723 - COMMENT_IP=${HOST_IP:-192.168.1.101} - JAVA_OPTS=-Xms256m -Xmx512m depends_on: @@ -391,6 +401,7 @@ services: restart: always ports: - "9005:9005" + - "8724:8724" environment: - SPRING_PROFILES_ACTIVE=ha - NACOS_HOST=nacos @@ -409,9 +420,10 @@ services: - REDIS_HOST=redis - REDIS_PORT=6379 - REDIS_PASSWORD=${REDIS_PASSWORD:-redis_HA_Cluster_2024} - - SENTINEL_DASHBOARD_HOST=sentinel - - SENTINEL_DASHBOARD_PORT=8080 - - SPRING_CLOUD_SENTINEL_CLIENT_IP=${HOST_IP:-192.168.1.101} + - SENTINEL_DASHBOARD_HOST=${HOST_IP:-192.168.1.101} + - SENTINEL_DASHBOARD_PORT=8880 + - SPRING_CLOUD_SENTINEL_TRANSPORT_CLIENT_IP=${HOST_IP:-192.168.1.101} + - SPRING_CLOUD_SENTINEL_TRANSPORT_PORT=8724 - RECOMMEND_IP=${HOST_IP:-192.168.1.101} - JAVA_OPTS=-Xms256m -Xmx512m depends_on: @@ -432,6 +444,7 @@ services: restart: always ports: - "9006:9006" + - "8725:8725" environment: - SPRING_PROFILES_ACTIVE=ha - NACOS_HOST=nacos @@ -450,9 +463,10 @@ services: - REDIS_HOST=redis - REDIS_PORT=6379 - REDIS_PASSWORD=${REDIS_PASSWORD:-redis_HA_Cluster_2024} - - SENTINEL_DASHBOARD_HOST=sentinel - - SENTINEL_DASHBOARD_PORT=8080 - - SPRING_CLOUD_SENTINEL_CLIENT_IP=${HOST_IP:-192.168.1.101} + - SENTINEL_DASHBOARD_HOST=${HOST_IP:-192.168.1.101} + - SENTINEL_DASHBOARD_PORT=8880 + - SPRING_CLOUD_SENTINEL_TRANSPORT_CLIENT_IP=${HOST_IP:-192.168.1.101} + - SPRING_CLOUD_SENTINEL_TRANSPORT_PORT=8725 - ADMIN_IP=${HOST_IP:-192.168.1.101} - JAVA_OPTS=-Xms256m -Xmx512m depends_on: diff --git a/docker-compose-node-02.yml b/docker-compose-node-02.yml index 90e1143..474a8cc 100644 --- a/docker-compose-node-02.yml +++ b/docker-compose-node-02.yml @@ -173,20 +173,6 @@ services: networks: - ha-network - sentinel: - image: sentinel-dashboard:1.8.6 - container_name: sentinel - restart: always - ports: - - "8880:8080" - environment: - - JAVA_OPTS=-Xms128m -Xmx256m - - SERVER_PORT=8080 - - DASHBOARD_SERVER=localhost:8080 - - PROJECT_NAME=sentinel-dashboard - networks: - - ha-network - # ==================== 微服务 ==================== video-gateway: @@ -197,6 +183,7 @@ services: restart: always ports: - "9000:9000" + - "8739:8739" environment: - SPRING_PROFILES_ACTIVE=ha - NACOS_HOST=nacos @@ -209,9 +196,10 @@ services: - SPRING_CLOUD_NACOS_CONFIG_PASSWORD=nacos - SPRING_CLOUD_NACOS_DISCOVERY_IP=${HOST_IP:-192.168.1.102} - NACOS_SERVERS=${NACOS_SERVERS:-192.168.1.101:8848,192.168.1.102:8848,192.168.1.103:8848} - - SENTINEL_DASHBOARD_HOST=sentinel - - SENTINEL_DASHBOARD_PORT=8080 - - SPRING_CLOUD_SENTINEL_CLIENT_IP=${HOST_IP:-192.168.1.102} + - SENTINEL_DASHBOARD_HOST=192.168.1.101 + - SENTINEL_DASHBOARD_PORT=8880 + - SPRING_CLOUD_SENTINEL_TRANSPORT_CLIENT_IP=${HOST_IP:-192.168.1.102} + - SPRING_CLOUD_SENTINEL_TRANSPORT_PORT=8739 - GATEWAY_IP=${HOST_IP:-192.168.1.102} - JAVA_OPTS=-Xms256m -Xmx512m depends_on: @@ -228,6 +216,7 @@ services: restart: always ports: - "9001:9001" + - "8740:8740" environment: - SPRING_PROFILES_ACTIVE=ha - NACOS_HOST=nacos @@ -246,9 +235,10 @@ services: - REDIS_HOST=redis - REDIS_PORT=6379 - REDIS_PASSWORD=${REDIS_PASSWORD:-redis_HA_Cluster_2024} - - SENTINEL_DASHBOARD_HOST=sentinel - - SENTINEL_DASHBOARD_PORT=8080 - - SPRING_CLOUD_SENTINEL_CLIENT_IP=${HOST_IP:-192.168.1.102} + - SENTINEL_DASHBOARD_HOST=192.168.1.101 + - SENTINEL_DASHBOARD_PORT=8880 + - SPRING_CLOUD_SENTINEL_TRANSPORT_CLIENT_IP=${HOST_IP:-192.168.1.102} + - SPRING_CLOUD_SENTINEL_TRANSPORT_PORT=8740 - AUTH_IP=${HOST_IP:-192.168.1.102} - JAVA_OPTS=-Xms256m -Xmx512m depends_on: @@ -269,6 +259,7 @@ services: restart: always ports: - "9002:9002" + - "8741:8741" environment: - SPRING_PROFILES_ACTIVE=ha - NACOS_HOST=nacos @@ -287,9 +278,10 @@ services: - REDIS_HOST=redis - REDIS_PORT=6379 - REDIS_PASSWORD=${REDIS_PASSWORD:-redis_HA_Cluster_2024} - - SENTINEL_DASHBOARD_HOST=sentinel - - SENTINEL_DASHBOARD_PORT=8080 - - SPRING_CLOUD_SENTINEL_CLIENT_IP=${HOST_IP:-192.168.1.102} + - SENTINEL_DASHBOARD_HOST=192.168.1.101 + - SENTINEL_DASHBOARD_PORT=8880 + - SPRING_CLOUD_SENTINEL_TRANSPORT_CLIENT_IP=${HOST_IP:-192.168.1.102} + - SPRING_CLOUD_SENTINEL_TRANSPORT_PORT=8741 - USER_IP=${HOST_IP:-192.168.1.102} - JAVA_OPTS=-Xms256m -Xmx512m depends_on: @@ -310,6 +302,7 @@ services: restart: always ports: - "9003:9003" + - "8742:8742" environment: - SPRING_PROFILES_ACTIVE=ha - NACOS_HOST=nacos @@ -335,9 +328,10 @@ services: - MINIO_ACCESS_KEY=minioadmin - MINIO_SECRET_KEY=minioadmin123 - MINIO_BUCKET=video-platform - - SENTINEL_DASHBOARD_HOST=sentinel - - SENTINEL_DASHBOARD_PORT=8080 - - SPRING_CLOUD_SENTINEL_CLIENT_IP=${HOST_IP:-192.168.1.102} + - SENTINEL_DASHBOARD_HOST=192.168.1.101 + - SENTINEL_DASHBOARD_PORT=8880 + - SPRING_CLOUD_SENTINEL_TRANSPORT_CLIENT_IP=${HOST_IP:-192.168.1.102} + - SPRING_CLOUD_SENTINEL_TRANSPORT_PORT=8742 - CONTENT_IP=${HOST_IP:-192.168.1.102} - JAVA_OPTS=-Xms256m -Xmx512m depends_on: @@ -362,6 +356,7 @@ services: restart: always ports: - "9004:9004" + - "8743:8743" environment: - SPRING_PROFILES_ACTIVE=ha - NACOS_HOST=nacos @@ -380,9 +375,10 @@ services: - REDIS_HOST=redis - REDIS_PORT=6379 - REDIS_PASSWORD=${REDIS_PASSWORD:-redis_HA_Cluster_2024} - - SENTINEL_DASHBOARD_HOST=sentinel - - SENTINEL_DASHBOARD_PORT=8080 - - SPRING_CLOUD_SENTINEL_CLIENT_IP=${HOST_IP:-192.168.1.102} + - SENTINEL_DASHBOARD_HOST=192.168.1.101 + - SENTINEL_DASHBOARD_PORT=8880 + - SPRING_CLOUD_SENTINEL_TRANSPORT_CLIENT_IP=${HOST_IP:-192.168.1.102} + - SPRING_CLOUD_SENTINEL_TRANSPORT_PORT=8743 - COMMENT_IP=${HOST_IP:-192.168.1.102} - JAVA_OPTS=-Xms256m -Xmx512m depends_on: @@ -403,6 +399,7 @@ services: restart: always ports: - "9005:9005" + - "8744:8744" environment: - SPRING_PROFILES_ACTIVE=ha - NACOS_HOST=nacos @@ -421,9 +418,10 @@ services: - REDIS_HOST=redis - REDIS_PORT=6379 - REDIS_PASSWORD=${REDIS_PASSWORD:-redis_HA_Cluster_2024} - - SENTINEL_DASHBOARD_HOST=sentinel - - SENTINEL_DASHBOARD_PORT=8080 - - SPRING_CLOUD_SENTINEL_CLIENT_IP=${HOST_IP:-192.168.1.102} + - SENTINEL_DASHBOARD_HOST=192.168.1.101 + - SENTINEL_DASHBOARD_PORT=8880 + - SPRING_CLOUD_SENTINEL_TRANSPORT_CLIENT_IP=${HOST_IP:-192.168.1.102} + - SPRING_CLOUD_SENTINEL_TRANSPORT_PORT=8744 - RECOMMEND_IP=${HOST_IP:-192.168.1.102} - JAVA_OPTS=-Xms256m -Xmx512m depends_on: @@ -444,6 +442,7 @@ services: restart: always ports: - "9006:9006" + - "8745:8745" environment: - SPRING_PROFILES_ACTIVE=ha - NACOS_HOST=nacos @@ -462,9 +461,10 @@ services: - REDIS_HOST=redis - REDIS_PORT=6379 - REDIS_PASSWORD=${REDIS_PASSWORD:-redis_HA_Cluster_2024} - - SENTINEL_DASHBOARD_HOST=sentinel - - SENTINEL_DASHBOARD_PORT=8080 - - SPRING_CLOUD_SENTINEL_CLIENT_IP=${HOST_IP:-192.168.1.102} + - SENTINEL_DASHBOARD_HOST=192.168.1.101 + - SENTINEL_DASHBOARD_PORT=8880 + - SPRING_CLOUD_SENTINEL_TRANSPORT_CLIENT_IP=${HOST_IP:-192.168.1.102} + - SPRING_CLOUD_SENTINEL_TRANSPORT_PORT=8745 - ADMIN_IP=${HOST_IP:-192.168.1.102} - JAVA_OPTS=-Xms256m -Xmx512m depends_on: diff --git a/docs/DEBIAN12-DEPLOYMENT-GUIDE.md b/docs/DEBIAN12-DEPLOYMENT-GUIDE.md index a8a8f70..27c2f79 100644 --- a/docs/DEBIAN12-DEPLOYMENT-GUIDE.md +++ b/docs/DEBIAN12-DEPLOYMENT-GUIDE.md @@ -682,18 +682,54 @@ video-gateway: **原因**:与 Nacos 问题类似,Sentinel 客户端使用容器内部 IP 注册到 Dashboard,导致跨节点无法通信。 -**解决方案**:在 docker-compose 中添加 `SPRING_CLOUD_SENTINEL_CLIENT_IP` 环境变量: +**解决方案**:在 docker-compose 中添加 `SPRING_CLOUD_SENTINEL_TRANSPORT_CLIENT_IP` 环境变量: ```yaml # Node-01 (192.168.1.101) video-gateway: environment: - - SPRING_CLOUD_SENTINEL_CLIENT_IP=${HOST_IP:-192.168.1.101} + - SPRING_CLOUD_SENTINEL_TRANSPORT_CLIENT_IP=${HOST_IP:-192.168.1.101} # Node-02 (192.168.1.102) video-gateway: environment: - - SPRING_CLOUD_SENTINEL_CLIENT_IP=${HOST_IP:-192.168.1.102} + - SPRING_CLOUD_SENTINEL_TRANSPORT_CLIENT_IP=${HOST_IP:-192.168.1.102} +``` + +**注意**:环境变量名必须是 `SPRING_CLOUD_SENTINEL_TRANSPORT_CLIENT_IP`,对应 Spring 属性 `spring.cloud.sentinel.transport.client-ip`。 + +**重要**:还需要配置以下两项: + +1. **端口映射**:每个微服务需要映射 Sentinel 通信端口(默认从 8719 开始) +2. **端口指定**:通过 `SPRING_CLOUD_SENTINEL_TRANSPORT_PORT` 指定固定端口 + +```yaml +# Node-01 微服务 Sentinel 端口分配 +video-gateway: + ports: + - "9000:9000" + - "8719:8719" # Sentinel 端口 + environment: + - SPRING_CLOUD_SENTINEL_TRANSPORT_PORT=8719 + +video-auth: + ports: + - "9001:9001" + - "8720:8720" # Sentinel 端口 + environment: + - SPRING_CLOUD_SENTINEL_TRANSPORT_PORT=8720 + +# 以此类推: user=8721, content=8722, comment=8723, recommend=8724, admin=8725 + +# Node-02 微服务使用不同端口避免冲突: 8739-8745 +``` + +3. **Dashboard 统一地址**:Node-02 及其他节点的微服务必须连接 Node-01 的 Sentinel Dashboard: +```yaml +# Node-02 微服务 +environment: + - SENTINEL_DASHBOARD_HOST=192.168.1.101 # 指向 Node-01 + - SENTINEL_DASHBOARD_PORT=8880 # Dashboard 宿主机端口 ``` **验证**:重启微服务后,Sentinel 控制台应显示真实宿主机 IP,且所有实例状态为"健康" diff --git a/video-admin/src/main/resources/application.yml b/video-admin/src/main/resources/application.yml index b06f6d9..4c5ca73 100644 --- a/video-admin/src/main/resources/application.yml +++ b/video-admin/src/main/resources/application.yml @@ -17,6 +17,7 @@ spring: group: ${NACOS_GROUP:DEFAULT_GROUP} username: ${NACOS_USERNAME:nacos} password: ${NACOS_PASSWORD:nacos} + ip: ${SPRING_CLOUD_NACOS_DISCOVERY_IP:} config: server-addr: ${spring.cloud.nacos.discovery.server-addr} namespace: ${spring.cloud.nacos.discovery.namespace} @@ -27,7 +28,8 @@ spring: sentinel: transport: dashboard: ${SENTINEL_DASHBOARD_HOST:5.180.253.115}:${SENTINEL_DASHBOARD_PORT:8080} - port: 8725 + port: ${SPRING_CLOUD_SENTINEL_TRANSPORT_PORT:8725} + client-ip: ${SPRING_CLOUD_SENTINEL_TRANSPORT_CLIENT_IP:} eager: true datasource: diff --git a/video-auth/src/main/resources/application.yml b/video-auth/src/main/resources/application.yml index ba29003..5007021 100644 --- a/video-auth/src/main/resources/application.yml +++ b/video-auth/src/main/resources/application.yml @@ -17,6 +17,7 @@ spring: group: ${NACOS_GROUP:DEFAULT_GROUP} username: ${NACOS_USERNAME:nacos} password: ${NACOS_PASSWORD:nacos} + ip: ${SPRING_CLOUD_NACOS_DISCOVERY_IP:} config: server-addr: ${spring.cloud.nacos.discovery.server-addr} namespace: ${spring.cloud.nacos.discovery.namespace} @@ -27,7 +28,8 @@ spring: sentinel: transport: dashboard: ${SENTINEL_DASHBOARD_HOST:5.180.253.115}:${SENTINEL_DASHBOARD_PORT:8080} - port: 8720 + port: ${SPRING_CLOUD_SENTINEL_TRANSPORT_PORT:8720} + client-ip: ${SPRING_CLOUD_SENTINEL_TRANSPORT_CLIENT_IP:} eager: true datasource: diff --git a/video-comment/src/main/resources/application.yml b/video-comment/src/main/resources/application.yml index 2cbc29e..790abcc 100644 --- a/video-comment/src/main/resources/application.yml +++ b/video-comment/src/main/resources/application.yml @@ -17,6 +17,7 @@ spring: group: ${NACOS_GROUP:DEFAULT_GROUP} username: ${NACOS_USERNAME:nacos} password: ${NACOS_PASSWORD:nacos} + ip: ${SPRING_CLOUD_NACOS_DISCOVERY_IP:} config: server-addr: ${spring.cloud.nacos.discovery.server-addr} namespace: ${spring.cloud.nacos.discovery.namespace} @@ -27,7 +28,8 @@ spring: sentinel: transport: dashboard: ${SENTINEL_DASHBOARD_HOST:5.180.253.115}:${SENTINEL_DASHBOARD_PORT:8080} - port: 8723 + port: ${SPRING_CLOUD_SENTINEL_TRANSPORT_PORT:8723} + client-ip: ${SPRING_CLOUD_SENTINEL_TRANSPORT_CLIENT_IP:} eager: true datasource: diff --git a/video-content/src/main/resources/application.yml b/video-content/src/main/resources/application.yml index 945bc6d..e11435f 100644 --- a/video-content/src/main/resources/application.yml +++ b/video-content/src/main/resources/application.yml @@ -17,6 +17,7 @@ spring: group: ${NACOS_GROUP:DEFAULT_GROUP} username: ${NACOS_USERNAME:nacos} password: ${NACOS_PASSWORD:nacos} + ip: ${SPRING_CLOUD_NACOS_DISCOVERY_IP:} config: server-addr: ${spring.cloud.nacos.discovery.server-addr} namespace: ${spring.cloud.nacos.discovery.namespace} @@ -27,7 +28,8 @@ spring: sentinel: transport: dashboard: ${SENTINEL_DASHBOARD_HOST:5.180.253.115}:${SENTINEL_DASHBOARD_PORT:8080} - port: 8722 + port: ${SPRING_CLOUD_SENTINEL_TRANSPORT_PORT:8722} + client-ip: ${SPRING_CLOUD_SENTINEL_TRANSPORT_CLIENT_IP:} eager: true datasource: diff --git a/video-gateway/src/main/resources/application.yml b/video-gateway/src/main/resources/application.yml index b8d4a5f..b56e712 100644 --- a/video-gateway/src/main/resources/application.yml +++ b/video-gateway/src/main/resources/application.yml @@ -17,6 +17,7 @@ spring: group: ${NACOS_GROUP:DEFAULT_GROUP} username: ${NACOS_USERNAME:nacos} password: ${NACOS_PASSWORD:nacos} + ip: ${SPRING_CLOUD_NACOS_DISCOVERY_IP:} config: server-addr: ${spring.cloud.nacos.discovery.server-addr} namespace: ${spring.cloud.nacos.discovery.namespace} @@ -67,7 +68,8 @@ spring: sentinel: transport: dashboard: ${SENTINEL_DASHBOARD_HOST:5.180.253.115}:${SENTINEL_DASHBOARD_PORT:8080} - port: 8719 + port: ${SPRING_CLOUD_SENTINEL_TRANSPORT_PORT:8719} + client-ip: ${SPRING_CLOUD_SENTINEL_TRANSPORT_CLIENT_IP:} eager: true scg: fallback: diff --git a/video-recommend/src/main/resources/application.yml b/video-recommend/src/main/resources/application.yml index 3770f78..396cce5 100644 --- a/video-recommend/src/main/resources/application.yml +++ b/video-recommend/src/main/resources/application.yml @@ -17,6 +17,7 @@ spring: group: ${NACOS_GROUP:DEFAULT_GROUP} username: ${NACOS_USERNAME:nacos} password: ${NACOS_PASSWORD:nacos} + ip: ${SPRING_CLOUD_NACOS_DISCOVERY_IP:} config: server-addr: ${spring.cloud.nacos.discovery.server-addr} namespace: ${spring.cloud.nacos.discovery.namespace} @@ -27,7 +28,8 @@ spring: sentinel: transport: dashboard: ${SENTINEL_DASHBOARD_HOST:5.180.253.115}:${SENTINEL_DASHBOARD_PORT:8080} - port: 8724 + port: ${SPRING_CLOUD_SENTINEL_TRANSPORT_PORT:8724} + client-ip: ${SPRING_CLOUD_SENTINEL_TRANSPORT_CLIENT_IP:} eager: true datasource: diff --git a/video-user/src/main/resources/application.yml b/video-user/src/main/resources/application.yml index 0d455eb..1988dbb 100644 --- a/video-user/src/main/resources/application.yml +++ b/video-user/src/main/resources/application.yml @@ -17,6 +17,7 @@ spring: group: ${NACOS_GROUP:DEFAULT_GROUP} username: ${NACOS_USERNAME:nacos} password: ${NACOS_PASSWORD:nacos} + ip: ${SPRING_CLOUD_NACOS_DISCOVERY_IP:} config: server-addr: ${spring.cloud.nacos.discovery.server-addr} namespace: ${spring.cloud.nacos.discovery.namespace} @@ -27,7 +28,8 @@ spring: sentinel: transport: dashboard: ${SENTINEL_DASHBOARD_HOST:5.180.253.115}:${SENTINEL_DASHBOARD_PORT:8080} - port: 8721 + port: ${SPRING_CLOUD_SENTINEL_TRANSPORT_PORT:8721} + client-ip: ${SPRING_CLOUD_SENTINEL_TRANSPORT_CLIENT_IP:} eager: true datasource: