revert

SonicCloudOrg · Jul 1, 2022 · 43e865e · 43e865e
1 parent 5c4bb57
commit 43e865e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -70,6 +70,8 @@ services:
       - SONIC_EUREKA_PASSWORD
       - SONIC_EUREKA_HOST=sonic-server-eureka
       - SONIC_EUREKA_PORT
+      - SONIC_SERVER_HOST
+      - SONIC_SERVER_PORT
       - SECRET_KEY
       - EXPIRE_DAY
     networks:

diff --git a/docker-compose2.yml b/docker-compose2.yml
@@ -70,6 +70,8 @@ services:
       - SONIC_EUREKA_PASSWORD
       - SONIC_EUREKA_HOST=sonic-server-eureka
       - SONIC_EUREKA_PORT
+      - SONIC_SERVER_HOST
+      - SONIC_SERVER_PORT
       - SECRET_KEY
       - EXPIRE_DAY
     networks:

diff --git a/sonic-server-common/src/main/resources/application-sonic-server-folder.yml b/sonic-server-common/src/main/resources/application-sonic-server-folder.yml
@@ -5,4 +5,8 @@ spring:
   servlet:
     multipart:
       maxFileSize: -1
-      maxRequestSize: -1
+      maxRequestSize: -1
+
+# 网关的IP地址
+gateway:
+  host: http://${SONIC_SERVER_HOST:localhost}:${SONIC_SERVER_PORT:3000}/server
diff --git a/sonic-server-folder/src/main/java/org/cloud/sonic/folder/tools/FileTool.java b/sonic-server-folder/src/main/java/org/cloud/sonic/folder/tools/FileTool.java
@@ -41,6 +41,8 @@
 @RefreshScope
 public class FileTool {
     private final Logger logger = LoggerFactory.getLogger(FileTool.class);
+    @Value("${gateway.host}")
+    private String host;
 
     /**
      * @param folderName 文件夹
@@ -66,7 +68,8 @@ public String upload(String folderName, MultipartFile file) throws IOException {
         } catch (FileAlreadyExistsException e) {
             logger.error(e.getMessage());
         }
-        return "/folder/" + local.getPath().replaceAll("\\\\", "/");
+        host = host.replace(":80/", "/");
+        return host + "/api/folder/" + local.getPath().replaceAll("\\\\", "/");
     }
 
     /**
@@ -158,6 +161,7 @@ public String merge(String uuid, String fileName, int totalCount) {
         } catch (IOException e) {
             logger.error(e.getMessage());
         }
-        return "/folder/" + file.getPath();
+        host = host.replace(":80/", "/");
+        return host + "/api/folder/" + file.getPath();
     }
 }