debug

Author: ZhouYixun

docker-compose.yml

@@ -70,8 +70,6 @@ services:
       - SONIC_EUREKA_PASSWORD
       - SONIC_EUREKA_HOST=sonic-server-eureka
       - SONIC_EUREKA_PORT
-      - SONIC_SERVER_HOST
-      - SONIC_SERVER_PORT
       - SECRET_KEY
       - EXPIRE_DAY
     networks:

docker-compose2.yml

@@ -70,8 +70,6 @@ services:
       - SONIC_EUREKA_PASSWORD
       - SONIC_EUREKA_HOST=sonic-server-eureka
       - SONIC_EUREKA_PORT
-      - SONIC_SERVER_HOST
-      - SONIC_SERVER_PORT
       - SECRET_KEY
       - EXPIRE_DAY
     networks:

sonic-server-common/src/main/resources/application-sonic-server-folder.yml

@@ -5,8 +5,4 @@ spring:
   servlet:
     multipart:
       maxFileSize: -1
-      maxRequestSize: -1
-
-# 网关的IP地址
-gateway:
-  host: http://${SONIC_SERVER_HOST:localhost}:${SONIC_SERVER_PORT:3000}/server
+      maxRequestSize: -1

sonic-server-controller/src/main/java/org/cloud/sonic/controller/controller/ExchangeController.java

@@ -37,7 +37,7 @@
 import javax.websocket.Session;
 
 
-@Api(tags = "设备管理相关")
+@Api(tags = "调度相关")
 @RestController
 @RequestMapping("/exchange")
 @Slf4j

sonic-server-folder/src/main/java/org/cloud/sonic/folder/tools/FileTool.java

@@ -41,8 +41,6 @@
 @RefreshScope
 public class FileTool {
     private final Logger logger = LoggerFactory.getLogger(FileTool.class);
-    @Value("${gateway.host}")
-    private String host;
 
     /**
      * @param folderName 文件夹
@@ -68,8 +66,7 @@ public String upload(String folderName, MultipartFile file) throws IOException {
         } catch (FileAlreadyExistsException e) {
             logger.error(e.getMessage());
         }
-        host = host.replace(":80/", "/");
-        return host + "/api/folder/" + local.getPath().replaceAll("\\\\", "/");
+        return "/folder/" + local.getPath().replaceAll("\\\\", "/");
     }
 
     /**
@@ -161,7 +158,6 @@ public String merge(String uuid, String fileName, int totalCount) {
         } catch (IOException e) {
             logger.error(e.getMessage());
         }
-        host = host.replace(":80/", "/");
-        return host + "/api/folder/" + file.getPath();
+        return "/folder/" + file.getPath();
     }
 }