From e5b4dc75d7d6353aaa34b031b5095630aceaca0b Mon Sep 17 00:00:00 2001
From: shanshanzhong <shanshanzhong147@gmail.com>
Date: Tue, 5 Aug 2025 10:12:29 -0700
Subject: [PATCH] =?UTF-8?q?fix(deploy):=20=E6=9B=B4=E6=96=B0docker-compose?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=92=8C=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在docker-compose中添加时区环境变量
- 将MySQL和Redis连接地址从localhost改为服务名
- 更新Makefile中的docker compose命令语法
---
 Makefile                           | 2 +-
 deploy/project/docker-compose.yaml | 2 ++
 etc/ppanel.yaml                    | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index d3c7e57..f753010 100644
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,7 @@ publish-docker: # Publish docker image | 发布 docker 镜像
 docker-run: # Publish docker image | 发布 docker 镜像
 	docker rm -f ${API_CONTAINER_NAME}
 	@echo "pwd: $(pwd)"
-	docker-compose -p ${DOCKER_PROJECT_NAME} -f ${DOCKER_COMPOSE_FILE} up -d
+	docker compose -p ${DOCKER_PROJECT_NAME} -f ${DOCKER_COMPOSE_FILE} up -d
 	@echo "docker run successfully"
 
 
diff --git a/deploy/project/docker-compose.yaml b/deploy/project/docker-compose.yaml
index 5ed9759..ae3a60a 100644
--- a/deploy/project/docker-compose.yaml
+++ b/deploy/project/docker-compose.yaml
@@ -8,6 +8,8 @@ services:
       - ${API_EXTERNAL_PORT}:${API_INNER_PORT}
     volumes:
       - ${API_LOG_DIR}:/app/logs
+    environment:
+      - TZ=Asia/Shanghai
 
 networks:
   default:
diff --git a/etc/ppanel.yaml b/etc/ppanel.yaml
index c87acf4..cb4004a 100644
--- a/etc/ppanel.yaml
+++ b/etc/ppanel.yaml
@@ -25,7 +25,7 @@ Logger:
     Rotation: daily
     FileTimeFormat: 2006-01-02T15:04:05.000Z07:00
 MySQL:
-    Addr: localhost:3306
+    Addr: mysql:3306
     Username: root
     Password: 123456
     Dbname: ppanel
@@ -34,6 +34,6 @@ MySQL:
     MaxOpenConns: 10
     SlowThreshold: 1000
 Redis:
-    Host: localhost:6379
+    Host: redis:6379
     Pass: 
     DB: 0