From 8d44663208c3a7729e5831e86538c19f9e5cae19 Mon Sep 17 00:00:00 2001 From: Toyas Date: Thu, 12 Mar 2026 17:18:18 +0800 Subject: [PATCH] chore(config): Improve Redis and Nacos configuration docs --- config/redis/redis-master.conf | 3 ++- config/redis/redis-slave.conf | 3 ++- docker-compose-node-01.yml | 10 ++++++---- docker-compose-node-02.yml | 10 ++++++---- docker-compose-node-03.yml | 10 ++++++---- docs/DEBIAN12-DEPLOYMENT-GUIDE.md | 19 +++++++++++-------- 6 files changed, 33 insertions(+), 22 deletions(-) diff --git a/config/redis/redis-master.conf b/config/redis/redis-master.conf index b0a2291..d7bdf67 100644 --- a/config/redis/redis-master.conf +++ b/config/redis/redis-master.conf @@ -8,7 +8,8 @@ protected-mode no # 进程配置 daemonize no pidfile /var/run/redis/redis-server.pid -logfile /var/log/redis/redis-server.log +# 日志输出到标准输出（Docker容器标准做法） +logfile "" # 数据目录 dir /data diff --git a/config/redis/redis-slave.conf b/config/redis/redis-slave.conf index 0a03b8f..8b70a64 100644 --- a/config/redis/redis-slave.conf +++ b/config/redis/redis-slave.conf @@ -8,7 +8,8 @@ protected-mode no # 进程配置 daemonize no pidfile /var/run/redis/redis-server.pid -logfile /var/log/redis/redis-server.log +# 日志输出到标准输出（Docker容器标准做法） +logfile "" # 数据目录 dir /data diff --git a/docker-compose-node-01.yml b/docker-compose-node-01.yml index 36c8f73..d674960 100644 --- a/docker-compose-node-01.yml +++ b/docker-compose-node-01.yml @@ -84,15 +84,17 @@ services: - NACOS_SERVERS=${NACOS_SERVERS:-192.168.1.101:8848,192.168.1.102:8848,192.168.1.103:8848} - NACOS_SERVER_IP=${HOST_IP:-192.168.1.101} - NACOS_APPLICATION_PORT=8848 - - NACOS_AUTH_ENABLE=true - - NACOS_AUTH_TOKEN=SecretKey012345678901234567890123456789012345678901234567890123456789 - - NACOS_AUTH_IDENTITY_KEY=serverIdentity - - NACOS_AUTH_IDENTITY_VALUE=security + - SPRING_DATASOURCE_PLATFORM=mysql - MYSQL_SERVICE_HOST=mysql - MYSQL_SERVICE_PORT=3306 - MYSQL_SERVICE_DB_NAME=nacos_config - MYSQL_SERVICE_USER=root - MYSQL_SERVICE_PASSWORD=${MYSQL_ROOT_PASSWORD:-root123456} + - MYSQL_SERVICE_DB_PARAM=characterEncoding=utf8&connectTimeout=10000&socketTimeout=30000&autoReconnect=true&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true + - NACOS_AUTH_ENABLE=true + - NACOS_AUTH_TOKEN=SecretKey012345678901234567890123456789012345678901234567890123456789 + - NACOS_AUTH_IDENTITY_KEY=serverIdentity + - NACOS_AUTH_IDENTITY_VALUE=security - JVM_XMS=512m - JVM_XMX=512m volumes: diff --git a/docker-compose-node-02.yml b/docker-compose-node-02.yml index 7fcd82c..4cf2910 100644 --- a/docker-compose-node-02.yml +++ b/docker-compose-node-02.yml @@ -84,15 +84,17 @@ services: - NACOS_SERVERS=${NACOS_SERVERS:-192.168.1.101:8848,192.168.1.102:8848,192.168.1.103:8848} - NACOS_SERVER_IP=${HOST_IP:-192.168.1.102} - NACOS_APPLICATION_PORT=8848 - - NACOS_AUTH_ENABLE=true - - NACOS_AUTH_TOKEN=SecretKey012345678901234567890123456789012345678901234567890123456789 - - NACOS_AUTH_IDENTITY_KEY=serverIdentity - - NACOS_AUTH_IDENTITY_VALUE=security + - SPRING_DATASOURCE_PLATFORM=mysql - MYSQL_SERVICE_HOST=mysql - MYSQL_SERVICE_PORT=3306 - MYSQL_SERVICE_DB_NAME=nacos_config - MYSQL_SERVICE_USER=root - MYSQL_SERVICE_PASSWORD=${MYSQL_ROOT_PASSWORD:-root123456} + - MYSQL_SERVICE_DB_PARAM=characterEncoding=utf8&connectTimeout=10000&socketTimeout=30000&autoReconnect=true&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true + - NACOS_AUTH_ENABLE=true + - NACOS_AUTH_TOKEN=SecretKey012345678901234567890123456789012345678901234567890123456789 + - NACOS_AUTH_IDENTITY_KEY=serverIdentity + - NACOS_AUTH_IDENTITY_VALUE=security - JVM_XMS=512m - JVM_XMX=512m volumes: diff --git a/docker-compose-node-03.yml b/docker-compose-node-03.yml index 9a83c6b..7370d08 100644 --- a/docker-compose-node-03.yml +++ b/docker-compose-node-03.yml @@ -85,15 +85,17 @@ services: - NACOS_SERVERS=${NACOS_SERVERS:-192.168.1.101:8848,192.168.1.102:8848,192.168.1.103:8848} - NACOS_SERVER_IP=${HOST_IP:-192.168.1.103} - NACOS_APPLICATION_PORT=8848 - - NACOS_AUTH_ENABLE=true - - NACOS_AUTH_TOKEN=SecretKey012345678901234567890123456789012345678901234567890123456789 - - NACOS_AUTH_IDENTITY_KEY=serverIdentity - - NACOS_AUTH_IDENTITY_VALUE=security + - SPRING_DATASOURCE_PLATFORM=mysql - MYSQL_SERVICE_HOST=mysql - MYSQL_SERVICE_PORT=3306 - MYSQL_SERVICE_DB_NAME=nacos_config - MYSQL_SERVICE_USER=root - MYSQL_SERVICE_PASSWORD=${MYSQL_ROOT_PASSWORD:-root123456} + - MYSQL_SERVICE_DB_PARAM=characterEncoding=utf8&connectTimeout=10000&socketTimeout=30000&autoReconnect=true&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true + - NACOS_AUTH_ENABLE=true + - NACOS_AUTH_TOKEN=SecretKey012345678901234567890123456789012345678901234567890123456789 + - NACOS_AUTH_IDENTITY_KEY=serverIdentity + - NACOS_AUTH_IDENTITY_VALUE=security - JVM_XMS=512m - JVM_XMX=512m volumes: diff --git a/docs/DEBIAN12-DEPLOYMENT-GUIDE.md b/docs/DEBIAN12-DEPLOYMENT-GUIDE.md index 1b63d20..2208572 100644 --- a/docs/DEBIAN12-DEPLOYMENT-GUIDE.md +++ b/docs/DEBIAN12-DEPLOYMENT-GUIDE.md @@ -104,11 +104,13 @@ ssh node-03 "hostname" ### 2.1 克隆项目 +### 建议配好github账号 + ```bash # 在所有节点执行 cd /opt -git clone <项目地址> ha-ovp -cd ha-ovp +git clone <项目地址> HA-OVP +cd HA-OVP ``` ### 2.2 构建项目 @@ -117,7 +119,7 @@ cd ha-ovp # 在 Node-01 执行 (只需执行一次) # 构建所有模块 -mvn clean package -DskipTests +mvn clean install -Dmaven.test.skip=true # 构建 Sentinel 镜像 cd sentinel-dashboard @@ -131,9 +133,10 @@ ls -la video-*/target/*.jar ### 2.3 同步构建产物 ```bash +apt install rsync -y #三个节点都需要安装 # 从 Node-01 同步到其他节点 -rsync -avz --progress /opt/ha-ovp/ root@192.168.1.102:/opt/ha-ovp/ -rsync -avz --progress /opt/ha-ovp/ root@192.168.1.103:/opt/ha-ovp/ +rsync -avz --progress /opt/HA-OVP/ root@192.168.1.102:/opt/HA-OVP/ +rsync -avz --progress /opt/HA-OVP/ root@192.168.1.103:/opt/HA-OVP/ ``` ### 2.4 启动服务 @@ -141,7 +144,7 @@ rsync -avz --progress /opt/ha-ovp/ root@192.168.1.103:/opt/ha-ovp/ #### Node-01 启动 (主节点) ```bash -cd /opt/ha-ovp +cd /opt/HA-OVP # 启动所有服务 docker compose -f docker-compose-node-01.yml --env-file config/.env.node-01 up -d @@ -153,7 +156,7 @@ docker compose -f docker-compose-node-01.yml logs -f #### Node-02 启动 (从节点) ```bash -cd /opt/ha-ovp +cd /opt/HA-OVP # 等待 Node-01 完全启动后 (约3分钟) docker compose -f docker-compose-node-02.yml --env-file config/.env.node-02 up -d @@ -165,7 +168,7 @@ docker compose -f docker-compose-node-02.yml logs -f #### Node-03 启动 (备份节点) ```bash -cd /opt/ha-ovp +cd /opt/HA-OVP # 启动基础设施 docker compose -f docker-compose-node-03.yml --env-file config/.env.node-03 up -d