浏览代码

feat Dockerfile部署脚本添加

2 周之前
父节点
当前提交
89732e0611

+ 1 - 1
edu-travel-adapter/edu-travel-adapter-upload/src/main/java/edu/travel/adapter/service/upload/UploadAdapter.java

@@ -42,7 +42,7 @@ public class UploadAdapter  {
         return rpcBaseResponse;
     }
     @AdapterAnnotation
-    public RPCBaseResponse uploadFile(EduFileDTO eduFile,MultipartFile file) {
+    public RPCBaseResponse uploadFile(EduFileDTO eduFile,MultipartFile file) throws IOException {
         RPCBaseResponse rpcBaseResponse = uploadRemoteController.uploadFile(eduFile,file);
         return rpcBaseResponse;
     }

+ 1 - 1
edu-travel-api/edu-travel-api-admin/src/main/java/edu/travel/controller/UploadController.java

@@ -111,7 +111,7 @@ public class UploadController  {
      */
     @PostMapping(value = "/upload")
     @PreAuthorize("permitAll()")
-    public BaseResponse uploadFile(EduFileDTO eduFile,MultipartFile file) {
+    public BaseResponse uploadFile(EduFileDTO eduFile,MultipartFile file) throws IOException {
         RPCBaseResponse rpcBaseResponse = uploadAdapter.uploadFile(eduFile,file);
         if (rpcBaseResponse != null) {
             if (rpcBaseResponse.getCode() == HttpStatus.OK.value()){

+ 1 - 1
edu-travel-remote/edu-travel-remote-upload/src/main/java/edu/travel/remote/upload/UploadRemoteController.java

@@ -56,5 +56,5 @@ public interface UploadRemoteController {
      * @return
      */
     @PostMapping(value = "/upload",headers = {"content-type=multipart/form-data"})
-    RPCBaseResponse uploadFile(EduFileDTO eduFile,MultipartFile file);
+    RPCBaseResponse uploadFile(EduFileDTO eduFile,MultipartFile file) throws IOException;
 }

+ 3 - 3
edu-travel-service/edu-travel-service-upload/src/main/java/edu/travel/upload/web/UploadController.java

@@ -114,7 +114,7 @@ public class UploadController implements UploadRemoteController {
         eduFile.setFilePath(objectUrl);
         boolean save = eduFileService.save(eduFile);
         if (save){
-            return RPCBaseResponse.success();
+            return RPCBaseResponse.success(eduFile.getId().toString());
         }
         return RPCBaseResponse.error();
     }
@@ -126,7 +126,7 @@ public class UploadController implements UploadRemoteController {
     @Override
     @PostMapping(value = "/upload",headers = {"content-type=multipart/form-data"})
     @PreAuthorize("permitAll()")
-    public RPCBaseResponse uploadFile(EduFileDTO eduFile,MultipartFile file) {
+    public RPCBaseResponse uploadFile(EduFileDTO eduFile,MultipartFile file) throws IOException {
         PutObjectResult putObjectResult = obsClient.putObject(obsProperties.getBucketName(), "/service/chunk/" + eduFile.getUploadId() + "/" + file.getOriginalFilename(), file.getInputStream());
         String objectUrl = putObjectResult.getObjectUrl();
         EduFile files = new EduFile();
@@ -134,7 +134,7 @@ public class UploadController implements UploadRemoteController {
         eduFile.setFilePath(objectUrl);
         boolean save = eduFileService.save(files);
         if (save){
-            return RPCBaseResponse.success();
+            return RPCBaseResponse.success(files.getId().toString());
         }
         return RPCBaseResponse.error();
     }