From 35b5f1afacc955dd91ac9c93eba200f64d20d3d0 Mon Sep 17 00:00:00 2001
From: caiyuchao <caiyuchao@agrandtech.com>
Date: Mon, 18 Aug 2025 18:41:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20docker=E9=85=8D=E7=BD=AE=E5=92=8C?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml    |  1 +
 mysql/dockerfile      |  2 +-
 nginx/conf/nginx.conf |  2 +-
 start.sh              | 13 ++++++++-----
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index bf71836..2f52835 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -54,6 +54,7 @@ services:
       - "48080:48080"
     environment:
       - SPRING_PROFILES_ACTIVE=test
+      - TZ=Asia/Shanghai
     depends_on:
       - agt-redis
       - agt-mysql
diff --git a/mysql/dockerfile b/mysql/dockerfile
index 35710d3..e34e5b4 100644
--- a/mysql/dockerfile
+++ b/mysql/dockerfile
@@ -1,7 +1,7 @@
 # 基础镜像
 FROM mysql:5.7
 # author
-MAINTAINER ruoyi
+MAINTAINER agt
 
 # 执行sql脚本
 #ADD ./db/*.sql /docker-entrypoint-initdb.d/
diff --git a/nginx/conf/nginx.conf b/nginx/conf/nginx.conf
index a48b49d..2ed73ab 100644
--- a/nginx/conf/nginx.conf
+++ b/nginx/conf/nginx.conf
@@ -25,7 +25,7 @@ http {
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header REMOTE-HOST $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_pass http://192.168.9.50:48080/admin-api;
+            proxy_pass http://agt-server:48080/admin-api;
         }
 
         # 避免actuator暴露
diff --git a/start.sh b/start.sh
index 2e0de57..ef1e877 100644
--- a/start.sh
+++ b/start.sh
@@ -19,20 +19,23 @@ common(){
 # 启动程序模块（必须）
 backend(){
   echo "begin copy agt-server "
-  cp ../agt-server.jar deploy/agt/jar/
+  cp ../agt-server.jar ./agt/jar/
   sudo docker stop agt-server
   sudo docker rm agt-server
   sudo docker rmi deploy_agt-server
-  docker-compose up -d agt-server
+  sudo docker-compose up -d agt-server
 }
 
 frontend(){
   echo "begin copy agt-server "
   mkdir -p ./nginx/html/dist
   rm -rf ./nginx/html/dist/*
-  rm -rf ../dist
-  unzip dist.zip
-  cp -rf ../dist/* ./nginx/html/dist/
+  rm -rf ./dist/*
+  cd dist
+  cp ../../dist.zip ./
+  unzip ./dist.zip
+  cd ..
+  cp -rf ./dist/* ./nginx/html/dist/
 }