From 79965e30af4525ae5df96ab4f1c4904fcfb5f501 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 13 七月 2021 13:20:08 +0800
Subject: [PATCH] fix 合并 pr !68 业务集群部署与文件上传的问题
---
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 17291eb..b27b61d 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -82,7 +82,7 @@
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 @@
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 664b280..dc484c5 100644
--- a/ruoyi-admin/Dockerfile
+++ b/ruoyi-admin/Dockerfile
@@ -4,7 +4,7 @@
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 a7a152e..b88929d 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -9,7 +9,7 @@
# 瀹炰緥婕旂ず寮�鍏�
demoEnabled: true
# 鏂囦欢璺緞
- profile: ./ruoyi/server/uploadPath
+ profile: ./ruoyi/uploadPath
# 鑾峰彇ip鍦板潃寮�鍏�
addressEnabled: true
--
Gitblit v1.9.3