diff --git a/docker-compose-node-01.yml b/docker-compose-node-01.yml index d177d49..0d17920 100644 --- a/docker-compose-node-01.yml +++ b/docker-compose-node-01.yml @@ -63,8 +63,9 @@ services: ports: - "26379:26379" volumes: - - ./config/redis/sentinel.conf:/usr/local/etc/redis/sentinel.conf:ro - command: redis-sentinel /usr/local/etc/redis/sentinel.conf + - sentinel_data:/data + - ./config/redis/sentinel.conf:/usr/local/etc/redis/sentinel.conf + command: sh -c "cp /usr/local/etc/redis/sentinel.conf /data/sentinel.conf && redis-sentinel /data/sentinel.conf" depends_on: redis: condition: service_healthy @@ -177,9 +178,11 @@ services: - SPRING_PROFILES_ACTIVE=ha - NACOS_HOST=nacos - NACOS_PORT=8848 + - NACOS_USERNAME=nacos + - NACOS_PASSWORD=nacos - NACOS_SERVERS=${NACOS_SERVERS:-192.168.1.101:8848,192.168.1.102:8848,192.168.1.103:8848} - - SENTINEL_HOST=sentinel - - SENTINEL_PORT=8080 + - SENTINEL_DASHBOARD_HOST=sentinel + - SENTINEL_DASHBOARD_PORT=8080 - GATEWAY_IP=${HOST_IP:-192.168.1.101} - JAVA_OPTS=-Xms256m -Xmx512m healthcheck: @@ -205,14 +208,18 @@ services: - SPRING_PROFILES_ACTIVE=ha - NACOS_HOST=nacos - NACOS_PORT=8848 + - NACOS_USERNAME=nacos + - NACOS_PASSWORD=nacos - NACOS_SERVERS=${NACOS_SERVERS:-192.168.1.101:8848,192.168.1.102:8848,192.168.1.103:8848} - MYSQL_HOST=mysql - MYSQL_PORT=3306 + - MYSQL_USERNAME=root + - MYSQL_PASSWORD=${MYSQL_ROOT_PASSWORD:-root123456} - REDIS_HOST=redis - REDIS_PORT=6379 - REDIS_PASSWORD=${REDIS_PASSWORD:-redis_HA_Cluster_2024} - - SENTINEL_HOST=sentinel - - SENTINEL_PORT=8080 + - SENTINEL_DASHBOARD_HOST=sentinel + - SENTINEL_DASHBOARD_PORT=8080 - AUTH_IP=${HOST_IP:-192.168.1.101} - JAVA_OPTS=-Xms256m -Xmx512m healthcheck: @@ -242,13 +249,17 @@ services: - SPRING_PROFILES_ACTIVE=ha - NACOS_HOST=nacos - NACOS_PORT=8848 + - NACOS_USERNAME=nacos + - NACOS_PASSWORD=nacos - MYSQL_HOST=mysql - MYSQL_PORT=3306 + - MYSQL_USERNAME=root + - MYSQL_PASSWORD=${MYSQL_ROOT_PASSWORD:-root123456} - REDIS_HOST=redis - REDIS_PORT=6379 - REDIS_PASSWORD=${REDIS_PASSWORD:-redis_HA_Cluster_2024} - - SENTINEL_HOST=sentinel - - SENTINEL_PORT=8080 + - SENTINEL_DASHBOARD_HOST=sentinel + - SENTINEL_DASHBOARD_PORT=8080 - USER_IP=${HOST_IP:-192.168.1.101} - JAVA_OPTS=-Xms256m -Xmx512m depends_on: @@ -273,8 +284,12 @@ services: - SPRING_PROFILES_ACTIVE=ha - NACOS_HOST=nacos - NACOS_PORT=8848 + - NACOS_USERNAME=nacos + - NACOS_PASSWORD=nacos - MYSQL_HOST=mysql - MYSQL_PORT=3306 + - MYSQL_USERNAME=root + - MYSQL_PASSWORD=${MYSQL_ROOT_PASSWORD:-root123456} - REDIS_HOST=redis - REDIS_PORT=6379 - REDIS_PASSWORD=${REDIS_PASSWORD:-redis_HA_Cluster_2024} @@ -285,8 +300,8 @@ services: - MINIO_ACCESS_KEY=minioadmin - MINIO_SECRET_KEY=minioadmin123 - MINIO_BUCKET=video-platform - - SENTINEL_HOST=sentinel - - SENTINEL_PORT=8080 + - SENTINEL_DASHBOARD_HOST=sentinel + - SENTINEL_DASHBOARD_PORT=8080 - CONTENT_IP=${HOST_IP:-192.168.1.101} - JAVA_OPTS=-Xms256m -Xmx512m depends_on: @@ -315,13 +330,17 @@ services: - SPRING_PROFILES_ACTIVE=ha - NACOS_HOST=nacos - NACOS_PORT=8848 + - NACOS_USERNAME=nacos + - NACOS_PASSWORD=nacos - MYSQL_HOST=mysql - MYSQL_PORT=3306 + - MYSQL_USERNAME=root + - MYSQL_PASSWORD=${MYSQL_ROOT_PASSWORD:-root123456} - REDIS_HOST=redis - REDIS_PORT=6379 - REDIS_PASSWORD=${REDIS_PASSWORD:-redis_HA_Cluster_2024} - - SENTINEL_HOST=sentinel - - SENTINEL_PORT=8080 + - SENTINEL_DASHBOARD_HOST=sentinel + - SENTINEL_DASHBOARD_PORT=8080 - COMMENT_IP=${HOST_IP:-192.168.1.101} - JAVA_OPTS=-Xms256m -Xmx512m depends_on: @@ -346,13 +365,17 @@ services: - SPRING_PROFILES_ACTIVE=ha - NACOS_HOST=nacos - NACOS_PORT=8848 + - NACOS_USERNAME=nacos + - NACOS_PASSWORD=nacos - MYSQL_HOST=mysql - MYSQL_PORT=3306 + - MYSQL_USERNAME=root + - MYSQL_PASSWORD=${MYSQL_ROOT_PASSWORD:-root123456} - REDIS_HOST=redis - REDIS_PORT=6379 - REDIS_PASSWORD=${REDIS_PASSWORD:-redis_HA_Cluster_2024} - - SENTINEL_HOST=sentinel - - SENTINEL_PORT=8080 + - SENTINEL_DASHBOARD_HOST=sentinel + - SENTINEL_DASHBOARD_PORT=8080 - RECOMMEND_IP=${HOST_IP:-192.168.1.101} - JAVA_OPTS=-Xms256m -Xmx512m depends_on: @@ -377,13 +400,17 @@ services: - SPRING_PROFILES_ACTIVE=ha - NACOS_HOST=nacos - NACOS_PORT=8848 + - NACOS_USERNAME=nacos + - NACOS_PASSWORD=nacos - MYSQL_HOST=mysql - MYSQL_PORT=3306 + - MYSQL_USERNAME=root + - MYSQL_PASSWORD=${MYSQL_ROOT_PASSWORD:-root123456} - REDIS_HOST=redis - REDIS_PORT=6379 - REDIS_PASSWORD=${REDIS_PASSWORD:-redis_HA_Cluster_2024} - - SENTINEL_HOST=sentinel - - SENTINEL_PORT=8080 + - SENTINEL_DASHBOARD_HOST=sentinel + - SENTINEL_DASHBOARD_PORT=8080 - ADMIN_IP=${HOST_IP:-192.168.1.101} - JAVA_OPTS=-Xms256m -Xmx512m depends_on: @@ -421,6 +448,7 @@ networks: volumes: mysql_data: redis_data: + sentinel_data: nacos_logs: minio_data: nginx_logs: diff --git a/docker-compose-node-02.yml b/docker-compose-node-02.yml index bf87e75..d99ddd0 100644 --- a/docker-compose-node-02.yml +++ b/docker-compose-node-02.yml @@ -63,8 +63,9 @@ services: ports: - "26379:26379" volumes: - - ./config/redis/sentinel.conf:/usr/local/etc/redis/sentinel.conf:ro - command: redis-sentinel /usr/local/etc/redis/sentinel.conf + - sentinel_data:/data + - ./config/redis/sentinel.conf:/usr/local/etc/redis/sentinel.conf + command: sh -c "cp /usr/local/etc/redis/sentinel.conf /data/sentinel.conf && redis-sentinel /data/sentinel.conf" depends_on: redis: condition: service_healthy @@ -199,9 +200,11 @@ services: - SPRING_PROFILES_ACTIVE=ha - NACOS_HOST=nacos - NACOS_PORT=8848 + - NACOS_USERNAME=nacos + - NACOS_PASSWORD=nacos - NACOS_SERVERS=${NACOS_SERVERS:-192.168.1.101:8848,192.168.1.102:8848,192.168.1.103:8848} - - SENTINEL_HOST=sentinel - - SENTINEL_PORT=8080 + - SENTINEL_DASHBOARD_HOST=sentinel + - SENTINEL_DASHBOARD_PORT=8080 - GATEWAY_IP=${HOST_IP:-192.168.1.102} - JAVA_OPTS=-Xms256m -Xmx512m depends_on: @@ -222,13 +225,17 @@ services: - SPRING_PROFILES_ACTIVE=ha - NACOS_HOST=nacos - NACOS_PORT=8848 + - NACOS_USERNAME=nacos + - NACOS_PASSWORD=nacos - MYSQL_HOST=mysql - MYSQL_PORT=3306 + - MYSQL_USERNAME=root + - MYSQL_PASSWORD=${MYSQL_ROOT_PASSWORD:-root123456} - REDIS_HOST=redis - REDIS_PORT=6379 - REDIS_PASSWORD=${REDIS_PASSWORD:-redis_HA_Cluster_2024} - - SENTINEL_HOST=sentinel - - SENTINEL_PORT=8080 + - SENTINEL_DASHBOARD_HOST=sentinel + - SENTINEL_DASHBOARD_PORT=8080 - AUTH_IP=${HOST_IP:-192.168.1.102} - JAVA_OPTS=-Xms256m -Xmx512m depends_on: @@ -253,13 +260,17 @@ services: - SPRING_PROFILES_ACTIVE=ha - NACOS_HOST=nacos - NACOS_PORT=8848 + - NACOS_USERNAME=nacos + - NACOS_PASSWORD=nacos - MYSQL_HOST=mysql - MYSQL_PORT=3306 + - MYSQL_USERNAME=root + - MYSQL_PASSWORD=${MYSQL_ROOT_PASSWORD:-root123456} - REDIS_HOST=redis - REDIS_PORT=6379 - REDIS_PASSWORD=${REDIS_PASSWORD:-redis_HA_Cluster_2024} - - SENTINEL_HOST=sentinel - - SENTINEL_PORT=8080 + - SENTINEL_DASHBOARD_HOST=sentinel + - SENTINEL_DASHBOARD_PORT=8080 - USER_IP=${HOST_IP:-192.168.1.102} - JAVA_OPTS=-Xms256m -Xmx512m depends_on: @@ -284,8 +295,12 @@ services: - SPRING_PROFILES_ACTIVE=ha - NACOS_HOST=nacos - NACOS_PORT=8848 + - NACOS_USERNAME=nacos + - NACOS_PASSWORD=nacos - MYSQL_HOST=mysql - MYSQL_PORT=3306 + - MYSQL_USERNAME=root + - MYSQL_PASSWORD=${MYSQL_ROOT_PASSWORD:-root123456} - REDIS_HOST=redis - REDIS_PORT=6379 - REDIS_PASSWORD=${REDIS_PASSWORD:-redis_HA_Cluster_2024} @@ -296,8 +311,8 @@ services: - MINIO_ACCESS_KEY=minioadmin - MINIO_SECRET_KEY=minioadmin123 - MINIO_BUCKET=video-platform - - SENTINEL_HOST=sentinel - - SENTINEL_PORT=8080 + - SENTINEL_DASHBOARD_HOST=sentinel + - SENTINEL_DASHBOARD_PORT=8080 - CONTENT_IP=${HOST_IP:-192.168.1.102} - JAVA_OPTS=-Xms256m -Xmx512m depends_on: @@ -326,13 +341,17 @@ services: - SPRING_PROFILES_ACTIVE=ha - NACOS_HOST=nacos - NACOS_PORT=8848 + - NACOS_USERNAME=nacos + - NACOS_PASSWORD=nacos - MYSQL_HOST=mysql - MYSQL_PORT=3306 + - MYSQL_USERNAME=root + - MYSQL_PASSWORD=${MYSQL_ROOT_PASSWORD:-root123456} - REDIS_HOST=redis - REDIS_PORT=6379 - REDIS_PASSWORD=${REDIS_PASSWORD:-redis_HA_Cluster_2024} - - SENTINEL_HOST=sentinel - - SENTINEL_PORT=8080 + - SENTINEL_DASHBOARD_HOST=sentinel + - SENTINEL_DASHBOARD_PORT=8080 - COMMENT_IP=${HOST_IP:-192.168.1.102} - JAVA_OPTS=-Xms256m -Xmx512m depends_on: @@ -357,13 +376,17 @@ services: - SPRING_PROFILES_ACTIVE=ha - NACOS_HOST=nacos - NACOS_PORT=8848 + - NACOS_USERNAME=nacos + - NACOS_PASSWORD=nacos - MYSQL_HOST=mysql - MYSQL_PORT=3306 + - MYSQL_USERNAME=root + - MYSQL_PASSWORD=${MYSQL_ROOT_PASSWORD:-root123456} - REDIS_HOST=redis - REDIS_PORT=6379 - REDIS_PASSWORD=${REDIS_PASSWORD:-redis_HA_Cluster_2024} - - SENTINEL_HOST=sentinel - - SENTINEL_PORT=8080 + - SENTINEL_DASHBOARD_HOST=sentinel + - SENTINEL_DASHBOARD_PORT=8080 - RECOMMEND_IP=${HOST_IP:-192.168.1.102} - JAVA_OPTS=-Xms256m -Xmx512m depends_on: @@ -388,13 +411,17 @@ services: - SPRING_PROFILES_ACTIVE=ha - NACOS_HOST=nacos - NACOS_PORT=8848 + - NACOS_USERNAME=nacos + - NACOS_PASSWORD=nacos - MYSQL_HOST=mysql - MYSQL_PORT=3306 + - MYSQL_USERNAME=root + - MYSQL_PASSWORD=${MYSQL_ROOT_PASSWORD:-root123456} - REDIS_HOST=redis - REDIS_PORT=6379 - REDIS_PASSWORD=${REDIS_PASSWORD:-redis_HA_Cluster_2024} - - SENTINEL_HOST=sentinel - - SENTINEL_PORT=8080 + - SENTINEL_DASHBOARD_HOST=sentinel + - SENTINEL_DASHBOARD_PORT=8080 - ADMIN_IP=${HOST_IP:-192.168.1.102} - JAVA_OPTS=-Xms256m -Xmx512m depends_on: @@ -414,6 +441,7 @@ networks: volumes: mysql_data: redis_data: + sentinel_data: nacos_logs: rmqbroker_logs: rmqbroker_store: diff --git a/docker-compose-node-03.yml b/docker-compose-node-03.yml index 5fd0f81..de58aa2 100644 --- a/docker-compose-node-03.yml +++ b/docker-compose-node-03.yml @@ -64,8 +64,9 @@ services: ports: - "26379:26379" volumes: - - ./config/redis/sentinel.conf:/usr/local/etc/redis/sentinel.conf:ro - command: redis-sentinel /usr/local/etc/redis/sentinel.conf + - sentinel_data:/data + - ./config/redis/sentinel.conf:/usr/local/etc/redis/sentinel.conf + command: sh -c "cp /usr/local/etc/redis/sentinel.conf /data/sentinel.conf && redis-sentinel /data/sentinel.conf" depends_on: redis: condition: service_healthy @@ -193,6 +194,7 @@ networks: volumes: mysql_data: redis_data: + sentinel_data: nacos_logs: rmqbroker_logs: rmqbroker_store: diff --git a/video-admin/src/main/resources/application.yml b/video-admin/src/main/resources/application.yml index 281305d..1b73258 100644 --- a/video-admin/src/main/resources/application.yml +++ b/video-admin/src/main/resources/application.yml @@ -15,11 +15,15 @@ spring: server-addr: ${NACOS_HOST:5.180.253.115}:${NACOS_PORT:8848} namespace: ${NACOS_NAMESPACE:public} group: ${NACOS_GROUP:DEFAULT_GROUP} + username: ${NACOS_USERNAME:nacos} + password: ${NACOS_PASSWORD:nacos} config: server-addr: ${spring.cloud.nacos.discovery.server-addr} namespace: ${spring.cloud.nacos.discovery.namespace} group: ${spring.cloud.nacos.discovery.group} file-extension: yaml + username: ${NACOS_USERNAME:nacos} + password: ${NACOS_PASSWORD:nacos} sentinel: transport: dashboard: ${SENTINEL_DASHBOARD_HOST:5.180.253.115}:${SENTINEL_DASHBOARD_PORT:8080} diff --git a/video-auth/src/main/resources/application.yml b/video-auth/src/main/resources/application.yml index 0e4bded..4829010 100644 --- a/video-auth/src/main/resources/application.yml +++ b/video-auth/src/main/resources/application.yml @@ -15,11 +15,15 @@ spring: server-addr: ${NACOS_HOST:5.180.253.115}:${NACOS_PORT:8848} namespace: ${NACOS_NAMESPACE:public} group: ${NACOS_GROUP:DEFAULT_GROUP} + username: ${NACOS_USERNAME:nacos} + password: ${NACOS_PASSWORD:nacos} config: server-addr: ${spring.cloud.nacos.discovery.server-addr} namespace: ${spring.cloud.nacos.discovery.namespace} group: ${spring.cloud.nacos.discovery.group} file-extension: yaml + username: ${NACOS_USERNAME:nacos} + password: ${NACOS_PASSWORD:nacos} sentinel: transport: dashboard: ${SENTINEL_DASHBOARD_HOST:5.180.253.115}:${SENTINEL_DASHBOARD_PORT:8080} diff --git a/video-comment/src/main/resources/application.yml b/video-comment/src/main/resources/application.yml index 0fa6c3f..384eb2f 100644 --- a/video-comment/src/main/resources/application.yml +++ b/video-comment/src/main/resources/application.yml @@ -15,11 +15,15 @@ spring: server-addr: ${NACOS_HOST:5.180.253.115}:${NACOS_PORT:8848} namespace: ${NACOS_NAMESPACE:public} group: ${NACOS_GROUP:DEFAULT_GROUP} + username: ${NACOS_USERNAME:nacos} + password: ${NACOS_PASSWORD:nacos} config: server-addr: ${spring.cloud.nacos.discovery.server-addr} namespace: ${spring.cloud.nacos.discovery.namespace} group: ${spring.cloud.nacos.discovery.group} file-extension: yaml + username: ${NACOS_USERNAME:nacos} + password: ${NACOS_PASSWORD:nacos} sentinel: transport: dashboard: ${SENTINEL_DASHBOARD_HOST:5.180.253.115}:${SENTINEL_DASHBOARD_PORT:8080} diff --git a/video-content/src/main/resources/application.yml b/video-content/src/main/resources/application.yml index e5e9568..df25e32 100644 --- a/video-content/src/main/resources/application.yml +++ b/video-content/src/main/resources/application.yml @@ -15,11 +15,15 @@ spring: server-addr: ${NACOS_HOST:5.180.253.115}:${NACOS_PORT:8848} namespace: ${NACOS_NAMESPACE:public} group: ${NACOS_GROUP:DEFAULT_GROUP} + username: ${NACOS_USERNAME:nacos} + password: ${NACOS_PASSWORD:nacos} config: server-addr: ${spring.cloud.nacos.discovery.server-addr} namespace: ${spring.cloud.nacos.discovery.namespace} group: ${spring.cloud.nacos.discovery.group} file-extension: yaml + username: ${NACOS_USERNAME:nacos} + password: ${NACOS_PASSWORD:nacos} sentinel: transport: dashboard: ${SENTINEL_DASHBOARD_HOST:5.180.253.115}:${SENTINEL_DASHBOARD_PORT:8080} diff --git a/video-gateway/src/main/resources/application.yml b/video-gateway/src/main/resources/application.yml index c7277fa..ab3cb07 100644 --- a/video-gateway/src/main/resources/application.yml +++ b/video-gateway/src/main/resources/application.yml @@ -15,11 +15,15 @@ spring: server-addr: ${NACOS_HOST:5.180.253.115}:${NACOS_PORT:8848} namespace: ${NACOS_NAMESPACE:public} group: ${NACOS_GROUP:DEFAULT_GROUP} + username: ${NACOS_USERNAME:nacos} + password: ${NACOS_PASSWORD:nacos} config: server-addr: ${spring.cloud.nacos.discovery.server-addr} namespace: ${spring.cloud.nacos.discovery.namespace} group: ${spring.cloud.nacos.discovery.group} file-extension: yaml + username: ${NACOS_USERNAME:nacos} + password: ${NACOS_PASSWORD:nacos} extension-configs: - data-id: video-gateway.yaml group: ${NACOS_GROUP:DEFAULT_GROUP} diff --git a/video-recommend/src/main/resources/application.yml b/video-recommend/src/main/resources/application.yml index 6bbea9c..d3599fd 100644 --- a/video-recommend/src/main/resources/application.yml +++ b/video-recommend/src/main/resources/application.yml @@ -15,11 +15,15 @@ spring: server-addr: ${NACOS_HOST:5.180.253.115}:${NACOS_PORT:8848} namespace: ${NACOS_NAMESPACE:public} group: ${NACOS_GROUP:DEFAULT_GROUP} + username: ${NACOS_USERNAME:nacos} + password: ${NACOS_PASSWORD:nacos} config: server-addr: ${spring.cloud.nacos.discovery.server-addr} namespace: ${spring.cloud.nacos.discovery.namespace} group: ${spring.cloud.nacos.discovery.group} file-extension: yaml + username: ${NACOS_USERNAME:nacos} + password: ${NACOS_PASSWORD:nacos} sentinel: transport: dashboard: ${SENTINEL_DASHBOARD_HOST:5.180.253.115}:${SENTINEL_DASHBOARD_PORT:8080} diff --git a/video-user/src/main/resources/application.yml b/video-user/src/main/resources/application.yml index d8ed1ed..f7e6689 100644 --- a/video-user/src/main/resources/application.yml +++ b/video-user/src/main/resources/application.yml @@ -15,11 +15,15 @@ spring: server-addr: ${NACOS_HOST:5.180.253.115}:${NACOS_PORT:8848} namespace: ${NACOS_NAMESPACE:public} group: ${NACOS_GROUP:DEFAULT_GROUP} + username: ${NACOS_USERNAME:nacos} + password: ${NACOS_PASSWORD:nacos} config: server-addr: ${spring.cloud.nacos.discovery.server-addr} namespace: ${spring.cloud.nacos.discovery.namespace} group: ${spring.cloud.nacos.discovery.group} file-extension: yaml + username: ${NACOS_USERNAME:nacos} + password: ${NACOS_PASSWORD:nacos} sentinel: transport: dashboard: ${SENTINEL_DASHBOARD_HOST:5.180.253.115}:${SENTINEL_DASHBOARD_PORT:8080}