From ceba63b88f7f80989322d0fbc683f5d24b4c5bee Mon Sep 17 00:00:00 2001 From: TaehunPark Date: Thu, 10 Nov 2022 09:45:46 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EC=99=B8=EC=82=AC=EB=8C=80=EC=83=81?= =?UTF-8?q?=EB=AA=A9=ED=91=9C,=EC=99=B8=EC=82=AC=EC=9E=A5=EB=B9=84=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=EA=B2=BD=EB=A1=9C=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EB=B0=8F=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../faisp/main/equip/service/EquipService.java | 10 ++++++---- .../faisp/main/fipTarget/FipTargetController.java | 1 - .../main/fipTarget/service/FipTargetService.java | 15 +++++++++------ src/main/resources/application-dev.properties | 7 +++++++ 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/equip/service/EquipService.java b/src/main/java/com/dbnt/faisp/main/equip/service/EquipService.java index bbd9497b..129e82dc 100644 --- a/src/main/java/com/dbnt/faisp/main/equip/service/EquipService.java +++ b/src/main/java/com/dbnt/faisp/main/equip/service/EquipService.java @@ -36,8 +36,10 @@ import java.util.*; @Service @RequiredArgsConstructor public class EquipService { - @Value("${spring.servlet.multipart.location}") - protected String locationPath; + @Value("${file.dir}") + protected String fileDir; + @Value("${file.dir.equip}") + protected String equ; private final EquipRepository equipRepository; private final EquipFileRepository equipFileRepository; @@ -81,7 +83,7 @@ public class EquipService { public void saveFile(Equip equip, MultipartHttpServletRequest mRequest) throws Exception { try { - String path = locationPath; + String path = fileDir+equ; String FileSize; File dir = new File(path); if(!dir.exists()) dir.mkdir(); @@ -190,7 +192,7 @@ public class EquipService { public void updateFile(Equip equip,Equip equipTmp, MultipartHttpServletRequest mRequest) throws Exception { try { - String path = locationPath; + String path = fileDir+equ; String FileSize; File dir = new File(path); if(!dir.exists()) dir.mkdir(); diff --git a/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java b/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java index fcc4ff10..02fc914e 100644 --- a/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java @@ -13,7 +13,6 @@ import com.dbnt.faisp.main.fipTarget.service.FipTargetService; import com.dbnt.faisp.main.organMgt.service.OrganConfigService; import com.dbnt.faisp.main.userInfo.model.UserInfo; import com.dbnt.faisp.main.userInfo.service.UserInfoService; -import com.dbnt.faisp.util.Excel; import com.dbnt.faisp.util.ParamMap; import com.dbnt.faisp.util.Utils; diff --git a/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java b/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java index e1cb74b1..ba1d7e76 100644 --- a/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java @@ -35,14 +35,17 @@ import org.springframework.web.multipart.MultipartFile; import java.io.File; import java.text.DecimalFormat; -import java.time.LocalDateTime; import java.util.*; @Service @RequiredArgsConstructor public class FipTargetService extends BaseService { - @Value("${spring.servlet.multipart.location}") - protected String locationPath; + @Value("${file.dir}") + protected String fileDir; + @Value("${file.dir.vulnerable}") + protected String vulnerable; + @Value("${file.dir.part}") + protected String part; private final PartInfoRepository partInfoRepository; private final PartInfoFileRepository partInfoFileRepository; @@ -83,7 +86,7 @@ public class FipTargetService extends BaseService { } else { for(MultipartFile file : multipartFileList){ String saveName = UUID.randomUUID().toString(); - String path = locationPath+File.separator+"publicFile"+File.separator; + String path = fileDir+part; saveFile(file, new File(path+File.separator+saveName)); String originalFilename = file.getOriginalFilename(); @@ -251,7 +254,7 @@ public class FipTargetService extends BaseService { int fileSeq = lastFileInfo==null?1:(lastFileInfo.getFileSeq()+1); for(MultipartFile file : multipartFileList){ String saveName = UUID.randomUUID().toString(); - String path = locationPath+File.separator+"publicFile"+File.separator; + String path = fileDir+part; saveFile(file, new File(path+File.separator+saveName)); String originalFilename = file.getOriginalFilename(); @@ -351,7 +354,7 @@ public class FipTargetService extends BaseService { int fileSeq = lastFileInfo==null?1:(lastFileInfo.getFileSeq()+1); for(MultipartFile file : multipartFileList){ String saveName = UUID.randomUUID().toString(); - String path = locationPath+File.separator+"publicFile"+File.separator; + String path = fileDir+vulnerable; saveFile(file, new File(path+File.separator+saveName)); String originalFilename = file.getOriginalFilename(); diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index f55ab77c..2067d302 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -6,6 +6,13 @@ spring.servlet.multipart.location=C:\\faispUploadFiles spring.servlet.multipart.max-file-size=200MB spring.servlet.multipart.max-request-size=500MB +#file +file.dir=C:\\faispUploadFiles +file.dir.vulnerable=/vulnerable +file.dir.part=/part +file.dir.equip=/equip + + #thymeleaf spring.thymeleaf.prefix=classpath:templates/ spring.thymeleaf.check-template-location=true