diff --git a/src/main/java/com/dbnt/faisp/config/TomcatConfiguration.java b/src/main/java/com/dbnt/faisp/config/TomcatConfiguration.java index aa5934c5..4db4f81b 100644 --- a/src/main/java/com/dbnt/faisp/config/TomcatConfiguration.java +++ b/src/main/java/com/dbnt/faisp/config/TomcatConfiguration.java @@ -7,7 +7,7 @@ import org.springframework.boot.web.servlet.server.ServletWebServerFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -//@Configuration +@Configuration public class TomcatConfiguration { @Value("${tomcat.ajp.protocol}") diff --git a/src/main/java/com/dbnt/faisp/main/faRpt/service/FaRptService.java b/src/main/java/com/dbnt/faisp/main/faRpt/service/FaRptService.java index a0057190..93f77003 100644 --- a/src/main/java/com/dbnt/faisp/main/faRpt/service/FaRptService.java +++ b/src/main/java/com/dbnt/faisp/main/faRpt/service/FaRptService.java @@ -105,7 +105,7 @@ public class FaRptService extends BaseService { int fileSeq = lastFile==null?1:(lastFile.getFileSeq()+1); for(MultipartFile file: multipartFileList){ String saveName = UUID.randomUUID().toString(); - String path = locationPath+File.separator+"faRpt"+File.separator; + String path = locationPath+File.separator+"faRpt"; saveFile(file, new File(path+File.separator+saveName)); String originalFilename = file.getOriginalFilename(); diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java index c625d1f2..4d892126 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java @@ -218,7 +218,7 @@ public class FishingBoatService extends BaseService { int fileSeq = 1; for(MultipartFile file : fileList){ String saveName = UUID.randomUUID().toString(); - String path = locationPath+ File.separator+sailorPath+File.separator; + String path = locationPath+ File.separator+sailorPath; saveFile(file, new File(path+File.separator+saveName)); String originalFilename = file.getOriginalFilename(); diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java index 591cac6c..949f8f34 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java @@ -99,7 +99,7 @@ public class AffairService extends BaseService { // 견문보고 int fileSeq = lastFileInfo==null?1:(lastFileInfo.getFileSeq()+1); for(MultipartFile file : multipartFileList){ String saveName = UUID.randomUUID().toString(); - String path = locationPath+File.separator+"affair"+File.separator; + String path = locationPath+File.separator+"affair"; saveFile(file, new File(path+File.separator+saveName)); String originalFilename = file.getOriginalFilename(); diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/service/PlanService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/service/PlanService.java index 0c8c8d3e..825569c2 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/service/PlanService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/service/PlanService.java @@ -121,7 +121,7 @@ public class PlanService extends BaseService { // 월간계획 int fileSeq = lastFileInfo==null?1:(lastFileInfo.getFileSeq()+1); for(MultipartFile file : multipartFileList){ String saveName = UUID.randomUUID().toString(); - String path = locationPath+File.separator+"monthPlan"+File.separator; + String path = locationPath+File.separator+"monthPlan"; saveFile(file, new File(path+File.separator+saveName)); String originalFilename = file.getOriginalFilename(); diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/service/ResultService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/service/ResultService.java index d9a24d58..6cdf8570 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/service/ResultService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/service/ResultService.java @@ -112,7 +112,7 @@ public class ResultService extends BaseService { // 월간계획 int fileSeq = lastFileInfo==null?1:(lastFileInfo.getFileSeq()+1); for(MultipartFile file : multipartFileList){ String saveName = UUID.randomUUID().toString(); - String path = locationPath+File.separator+"affairResult"+File.separator; + String path = locationPath+File.separator+"affairResult"; saveFile(file, new File(path+File.separator+saveName)); String originalFilename = file.getOriginalFilename(); diff --git a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/service/BoardInvestigationService.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/service/BoardInvestigationService.java index 33f7f61f..cc9cae91 100644 --- a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/service/BoardInvestigationService.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/service/BoardInvestigationService.java @@ -89,7 +89,7 @@ public class BoardInvestigationService extends BaseService { int fileSeq = lastFileInfo==null?1:(lastFileInfo.getFileSeq()+1); for(MultipartFile file : multipartFileList){ String saveName = UUID.randomUUID().toString(); - String path = locationPath+ File.separator+"ivsgt"+File.separator; + String path = locationPath+ File.separator+"ivsgt"; saveFile(file, new File(path+File.separator+saveName)); String originalFilename = file.getOriginalFilename(); diff --git a/src/main/java/com/dbnt/faisp/main/publicBoard/service/PublicBoardService.java b/src/main/java/com/dbnt/faisp/main/publicBoard/service/PublicBoardService.java index 1f5eef8e..8a46e7ae 100644 --- a/src/main/java/com/dbnt/faisp/main/publicBoard/service/PublicBoardService.java +++ b/src/main/java/com/dbnt/faisp/main/publicBoard/service/PublicBoardService.java @@ -63,7 +63,7 @@ public class PublicBoardService 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 = locationPath+File.separator+"publicFile"; 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 cdb14a38..c1b1614d 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -1,4 +1,4 @@ -#tomcat.ajp.protocol=HTTP/1.1 +tomcat.ajp.protocol=HTTP/1.1 spring.devtools.livereload.enabled=true #file upload diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index 06fddbb1..a94ca956 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -1,4 +1,4 @@ -#tomcat.ajp.protocol=AJP/1.3 +tomcat.ajp.protocol=HTTP/1.1 #file upload spring.servlet.multipart.location=/uploadFiles diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties index d3fe2942..124978a9 100644 --- a/src/main/resources/application-test.properties +++ b/src/main/resources/application-test.properties @@ -1,4 +1,4 @@ -#tomcat.ajp.protocol=HTTP/1.1 +tomcat.ajp.protocol=HTTP/1.1 #file upload spring.servlet.multipart.location=/uploadFiles diff --git a/src/main/resources/templates/publicBoard/reference/referenceEditModal.html b/src/main/resources/templates/publicBoard/reference/referenceEditModal.html index ee2f6a74..cc723187 100644 --- a/src/main/resources/templates/publicBoard/reference/referenceEditModal.html +++ b/src/main/resources/templates/publicBoard/reference/referenceEditModal.html @@ -16,22 +16,22 @@