From 79965e30af4525ae5df96ab4f1c4904fcfb5f501 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Tue, 13 Jul 2021 13:20:08 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=90=88=E5=B9=B6=20pr=20!68=20=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E9=9B=86=E7=BE=A4=E9=83=A8=E7=BD=B2=E4=B8=8E=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/docker-compose.yml                      | 4 ++--
 ruoyi-admin/Dockerfile                         | 2 +-
 ruoyi-admin/src/main/resources/application.yml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 17291eb9..b27b61d1 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -82,7 +82,7 @@ services:
     volumes:
       # 配置文件
       - /docker/server1/logs/:/ruoyi/server/logs/
-      - /docker/server/uploadPath/:/ruoyi/server/uploadPath/
+      - /docker/ruoyi/uploadPath/:/ruoyi/server/ruoyi/uploadPath/
     privileged: true
     restart: always
     networks:
@@ -96,7 +96,7 @@ services:
     volumes:
       # 配置文件
       - /docker/server2/logs/:/ruoyi/server/logs/
-      - /docker/server/uploadPath/:/ruoyi/server/uploadPath/
+      - /docker/ruoyi/uploadPath/:/ruoyi/server/ruoyi/uploadPath/
     privileged: true
     restart: always
     networks:
diff --git a/ruoyi-admin/Dockerfile b/ruoyi-admin/Dockerfile
index 664b2806..dc484c5b 100644
--- a/ruoyi-admin/Dockerfile
+++ b/ruoyi-admin/Dockerfile
@@ -4,7 +4,7 @@ MAINTAINER Lion Li
 
 RUN mkdir -p /ruoyi/server
 RUN mkdir -p /ruoyi/server/logs
-RUN mkdir -p /ruoyi/server/uploadPath
+RUN mkdir -p /ruoyi/server/ruoyi/uploadPath
 
 WORKDIR /ruoyi/server
 
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index a7a152e4..b88929dd 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径
-  profile: ./ruoyi/server/uploadPath
+  profile: ./ruoyi/uploadPath
   # 获取ip地址开关
   addressEnabled: true