From 504646f3918a5dbaf35bf6b7a8b23b6f483c5e64 Mon Sep 17 00:00:00 2001
From: zhangsz <zhangsz@wfc.com>
Date: Sat, 11 Jan 2025 17:47:28 +0800
Subject: [PATCH] fix: deploy issue

---
 build/bin/wfcsetup.sh           | 4 ++++
 build/docker/docker-compose.yml | 4 ++--
 build/docker/nacos/dockerfile   | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/build/bin/wfcsetup.sh b/build/bin/wfcsetup.sh
index 545a3c7..29c9f2f 100755
--- a/build/bin/wfcsetup.sh
+++ b/build/bin/wfcsetup.sh
@@ -2,6 +2,7 @@
 
 wfc_work_dir=/opt/wfc
 docker_work_dir=${wfc_work_dir}/docker
+redis_work_dir=${docker_work_dir}/redis
 src_service_dir=${wfc_work_dir}/systemd/system
 dst_service_dir=/etc/systemd/system
 java_work_dir=${docker_work_dir}/java
@@ -22,6 +23,9 @@ case "$1" in
         # prepare directory
         mkdir -p ${docker_work_dir}/mysql/tmp
         chown -R root:root ${docker_work_dir}
+        if [ ! -d ${redis_work_dir}/data ]; then
+            mkdir -p ${redis_work_dir}/data
+        fi
         if [ -d ${docker_work_dir}/mysql/data ]; then
             chown -R 999:999 ${docker_work_dir}/mysql/data
         fi
diff --git a/build/docker/docker-compose.yml b/build/docker/docker-compose.yml
index bbfb391..0896930 100644
--- a/build/docker/docker-compose.yml
+++ b/build/docker/docker-compose.yml
@@ -100,7 +100,7 @@ services:
       - GATEWAY_SERVER_PORT=${GATEWAY_SERVER_PORT}
     healthcheck:
       test: ["CMD-SHELL", "curl -f http://${GATEWAY_SERVER_IP}:${GATEWAY_SERVER_PORT}/health || exit 1"]
-      interval: 30s
+      interval: 60s
       timeout: 60s
       retries: 10
     restart: ${RESTART_OPTION} 
@@ -134,7 +134,7 @@ services:
       - AUTH_SERVER_PORT=${AUTH_SERVER_PORT}
     healthcheck:
       test: ["CMD-SHELL", "curl -f http://${AUTH_SERVER_IP}:${AUTH_SERVER_PORT}/health || exit 1"]
-      interval: 30s
+      interval: 60s
       timeout: 60s
       retries: 10                
     restart: ${RESTART_OPTION}
diff --git a/build/docker/nacos/dockerfile b/build/docker/nacos/dockerfile
index 3b3f0f4..18fb1c6 100644
--- a/build/docker/nacos/dockerfile
+++ b/build/docker/nacos/dockerfile
@@ -2,4 +2,5 @@
 FROM nacos/nacos-server
 
 # 复制conf文件到路径
-COPY ./conf/application.properties /home/nacos/conf/application.properties
+# COPY ./conf/application.properties /home/nacos/conf/application.properties
+COPY ./conf/application.yml /home/nacos/conf/application.yml
\ No newline at end of file