xiexiang 2 سال پیش
والد
کامیت
666e5faaa2

+ 0 - 6
PAS/src/main/java/cn/cslg/pas/controller/ScratchWordsController.java

@@ -75,10 +75,4 @@ public class ScratchWordsController {
         }
     }
 
-    @GetMapping("/upload")
-    public String upload(List<MultipartFile> multipartFiles,Integer sourceId) throws IOException {
-        fileManagerService.uploadFile(multipartFiles,sourceId);
-        return Response.success();
-    }
-
 }

+ 12 - 1
PAS/src/main/java/cn/cslg/pas/service/FileManagerService.java

@@ -4,6 +4,7 @@ import com.google.gson.Gson;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.*;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.web.multipart.MultipartFile;
@@ -26,6 +27,16 @@ import static cn.hutool.core.io.FileUtil.getMimeType;
 @Slf4j
 @Service
 public class FileManagerService {
+    @Value("${authorUrl}")
+    private String PCSUrl;
+    @Value("${OPSUrl}")
+    private String OPSUrl;
+    @Value("${PASUrl}")
+    private String PASUrl;
+    @Value("${RMSUrl}")
+    private String RMSUrl;
+    @Value("${FMSUrl}")
+    private String FMSUrl;
 
     public String uploadFile(List<MultipartFile> multipartFiles, Integer sourceId) throws IOException {
         List<File> files = new ArrayList<>();
@@ -50,7 +61,7 @@ public class FileManagerService {
                 .readTimeout(60, TimeUnit.SECONDS)
                 .build();
         Request request = new Request.Builder()
-                .url("http://localhost:8111" + "/fileManager/uploadSystemFile")
+                .url(FMSUrl + "/fileManager/uploadSystemFile")
                 .post(requestBody)
                 .build();
         return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();

+ 2 - 1
PAS/src/main/resources/application-dev.yml

@@ -60,4 +60,5 @@ PCSUrl: http://localhost:8871
 #OPSUrl: http://192.168.1.24:5001
 OPSUrl: http://139.224.24.90:5001
 PASUrl: http://localhost:8877
-RMSUrl: http://localhost:8872
+RMSUrl: http://localhost:8872
+FMSUrl: http://localhost:8111