diff --git a/build/docker/docker-compose.yml b/build/docker/docker-compose.yml index 73850d5..8283d4f 100644 --- a/build/docker/docker-compose.yml +++ b/build/docker/docker-compose.yml @@ -1,12 +1,13 @@ services: wfc-nacos: image: nacos/nacos-server - container_name: wfc-nacos + container_name: ${NACOS_SERVER_NAME} build: context: ./nacos environment: - MODE=standalone - - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} + - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} + - NACOS_SERVER_NAME=${NACOS_SERVER_NAME} - NACOS_SERVER_IP=${NACOS_SERVER_IP} - NACOS_SERVER_PORT=${NACOS_SERVER_PORT} volumes: @@ -93,6 +94,7 @@ services: # - wfc-nacos environment: - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} + - NACOS_SERVER_NAME=${NACOS_SERVER_NAME} - NACOS_SERVER_IP=${NACOS_SERVER_IP} - NACOS_SERVER_PORT=${NACOS_SERVER_PORT} - GATEWAY_SERVER_IP=${GATEWAY_SERVER_IP} @@ -125,6 +127,7 @@ services: # - wfc-redis environment: - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} + - NACOS_SERVER_NAME=${NACOS_SERVER_NAME} - NACOS_SERVER_IP=${NACOS_SERVER_IP} - NACOS_SERVER_PORT=${NACOS_SERVER_PORT} - AUTH_SERVER_IP=${AUTH_SERVER_IP} @@ -161,7 +164,8 @@ services: # - wfc-redis # - wfc-mysql environment: - - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} + - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} + - NACOS_SERVER_NAME=${NACOS_SERVER_NAME} - NACOS_SERVER_IP=${NACOS_SERVER_IP} - NACOS_SERVER_PORT=${NACOS_SERVER_PORT} - WFC_SYSTEM_PORT=${WFC_SYSTEM_PORT} @@ -192,7 +196,8 @@ services: # - wfc-redis # - wfc-mysql environment: - - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} + - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} + - NACOS_SERVER_NAME=${NACOS_SERVER_NAME} - NACOS_SERVER_IP=${NACOS_SERVER_IP} - NACOS_SERVER_PORT=${NACOS_SERVER_PORT} - WFC_USER_PORT=${WFC_USER_PORT} @@ -220,7 +225,8 @@ services: # links: # - wfc-mysql environment: - - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} + - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} + - NACOS_SERVER_NAME=${NACOS_SERVER_NAME} - NACOS_SERVER_IP=${NACOS_SERVER_IP} - NACOS_SERVER_PORT=${NACOS_SERVER_PORT} - WFC_JOB_PORT=${WFC_JOB_PORT} @@ -253,7 +259,8 @@ services: # - wfc-redis # - wfc-mysql environment: - - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} + - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} + - NACOS_SERVER_NAME=${NACOS_SERVER_NAME} - NACOS_SERVER_IP=${NACOS_SERVER_IP} - NACOS_SERVER_PORT=${NACOS_SERVER_PORT} - WFC_PAYMENT_PORT=${WFC_PAYMENT_PORT} diff --git a/build/docker/env/default.env b/build/docker/env/default.env index 3a61429..152982f 100644 --- a/build/docker/env/default.env +++ b/build/docker/env/default.env @@ -8,6 +8,7 @@ MYSQL_USER=mysql MYSQL_PASSWORD=123456 REDIS_PORT=6379 NACOS_NAME_SPACE=wfc-prod +NACOS_SERVER_NAME=wfc-nacos WFC_SERVER_PORT=80 NACOS_SERVER_PORT=8848 GATEWAY_SERVER_PORT=8080 diff --git a/build/docker/redis/conf/redis.conf b/build/docker/redis/conf/redis.conf index d762d65..c62f4b4 100644 --- a/build/docker/redis/conf/redis.conf +++ b/build/docker/redis/conf/redis.conf @@ -1 +1,3 @@ -# requirepass 123456 \ No newline at end of file +# requirepass 123456 +dbfilename dump.rdb +dir /opt/wfc/redis/data \ No newline at end of file diff --git a/docs/03-configuration/03-wfc-quickstart.md b/docs/03-configuration/03-wfc-quickstart.md index d198b9d..5476f7b 100644 --- a/docs/03-configuration/03-wfc-quickstart.md +++ b/docs/03-configuration/03-wfc-quickstart.md @@ -121,7 +121,7 @@ docker-compose >= 1.29.2 * 修改docker环境参数 -根据实际情况修改如下环境参数配置(*IP地址已经在上面配置过程被替换): +根据实际情况修改如下环境参数配置(*WFC_SERVER_IP的地址已经在上面配置过程被替换): ```sh cd /opt/wfc/docker @@ -131,11 +131,25 @@ docker-compose >= 1.29.2 WFC_CONFIG_DATABASE=wfc_config_db WFC_SYSTEM_DATABASE=wfc_system_db WFC_USER_DATABASE=wfc_user_db + MYSQL_PORT=3306 MYSQL_USER=mysql - MYSQL_PASSWORD= + MYSQL_PASSWORD=123456 + REDIS_PORT=6379 NACOS_NAME_SPACE=wfc-prod - NACOS_SERVER_ADDR=192.168.13.128:8848 - GATEWAY_ADDR=192.168.13.128:8080 + NACOS_SERVER_NAME=wfc-nacos + WFC_SERVER_PORT=80 + NACOS_SERVER_PORT=8848 + GATEWAY_SERVER_PORT=8080 + AUTH_SERVER_PORT=8081 + WFC_JOB_PORT=9203 + WFC_PAYMENT_PORT=9204 + WFC_SYSTEM_PORT=9205 + WFC_USER_PORT=9206 + WFC_SERVER_IP=192.168.13.128 + NACOS_SERVER_IP=${WFC_SERVER_IP} + GATEWAY_SERVER_IP=${WFC_SERVER_IP} + AUTH_SERVER_IP=${WFC_SERVER_IP} + RESTART_OPTION=on-failure:5 ``` * 启动/查看/停止/版本软件