From 05e67fd157ffcd90d817f3b438f724c86671e8af Mon Sep 17 00:00:00 2001
From: kimjhjjang <kimjhjjang@gmail.com>
Date: Thu, 1 Dec 2022 16:50:40 +0900
Subject: [PATCH] =?UTF-8?q?back=EB=8B=A8=20:=20=EA=B3=B5=EC=A7=80=EC=82=AC?=
 =?UTF-8?q?=ED=95=AD=20=EC=BB=A8=ED=8A=B8=EB=A1=A4=EB=9F=AC=20=ED=8C=8C?=
 =?UTF-8?q?=EB=9D=BC=EB=AF=B8=ED=84=B0=20=EA=B2=80=EC=82=AC=EA=B8=B0?=
 =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80,=20=EC=97=85=EB=A1=9C=EB=93=9C?=
 =?UTF-8?q?=20=ED=8C=8C=EC=9D=BC=20=EC=82=AC=EC=9D=B4=EC=A6=88=20150MB=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=20front=EB=8B=A8=20:=20=EA=B3=B5=EC=A7=80?=
 =?UTF-8?q?=EC=82=AC=ED=95=AD=20=EC=97=85=EB=A1=9C=EB=93=9C=20zip=20?=
 =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=B6=94=EA=B0=80=20=EA=B0=80=EB=8A=A5?=
 =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/homeMgt/components/NoticePop.vue  |  4 +--
 .../homeMgt/components/NoticeUpdatePop.vue    |  4 +--
 .../ez/api/homeMgt/HomeMgtController.java     | 30 ++++++++++++++-----
 src/main/resources/application.yml            |  4 +--
 4 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/frontend/src/modules/homeMgt/components/NoticePop.vue b/frontend/src/modules/homeMgt/components/NoticePop.vue
index 300a4f5..a3774a7 100644
--- a/frontend/src/modules/homeMgt/components/NoticePop.vue
+++ b/frontend/src/modules/homeMgt/components/NoticePop.vue
@@ -71,12 +71,12 @@
               <tr>
                 <th style="width: 10%">첨부파일</th>
                 <td class="sender" colspan="5">
-                  <p class="file" style="width: 100%; margin-bottom: 15px">파일형식 : jpg, png, pdf, tiff (최대 5MB)</p>
+                  <p class="file" style="width: 100%; margin-bottom: 15px">파일형식 : jpg, png, pdf, tiff, zip</p>
                   <div class="btn plus">
                     파일 추가
                     <input
                       type="file"
-                      accept=".jpg,.png,.pdf,.tiff"
+                      accept=".jpg,.png,.pdf,.tiff,.zip"
                       multiple="multiple"
                       ref="imageUploader"
                       @change="onFileChange"
diff --git a/frontend/src/modules/homeMgt/components/NoticeUpdatePop.vue b/frontend/src/modules/homeMgt/components/NoticeUpdatePop.vue
index aa39c19..27f48a3 100644
--- a/frontend/src/modules/homeMgt/components/NoticeUpdatePop.vue
+++ b/frontend/src/modules/homeMgt/components/NoticeUpdatePop.vue
@@ -71,12 +71,12 @@
               <tr>
                 <th style="width: 10%">첨부파일</th>
                 <td class="sender" colspan="5">
-                  <p class="file" style="width: 100%; margin-bottom: 15px">파일형식 : jpg, png, pdf, tiff (최대 5MB)</p>
+                  <p class="file" style="width: 100%; margin-bottom: 15px">파일형식 : jpg, png, pdf, tiff, zip</p>
                   <div class="btn plus">
                     파일 추가
                     <input
                       type="file"
-                      accept=".jpg,.png,.pdf,.tiff"
+                      accept=".jpg,.png,.pdf,.tiff,.zip"
                       multiple="multiple"
                       ref="imageUploader"
                       @change="onFileChange"
diff --git a/src/main/java/kr/co/uplus/ez/api/homeMgt/HomeMgtController.java b/src/main/java/kr/co/uplus/ez/api/homeMgt/HomeMgtController.java
index 325be67..9d561e0 100644
--- a/src/main/java/kr/co/uplus/ez/api/homeMgt/HomeMgtController.java
+++ b/src/main/java/kr/co/uplus/ez/api/homeMgt/HomeMgtController.java
@@ -86,8 +86,12 @@ public class HomeMgtController {
 	@RequestMapping(value = "/insertNotice", method = { RequestMethod.POST })
 	@ResponseBody
 	public InsertNoticeResDto insertNotice(@RequestPart(value = "key") InsertNoticeReqDto insertNoticeReqDto,
-			MultipartHttpServletRequest multipartRequest) {
-
+			BindingResult bindingResult, MultipartHttpServletRequest multipartRequest) {
+		
+		if (validComponents.validParameter(bindingResult)) {
+			return new InsertNoticeResDto(ApiResponseCode.CM_PARAMETER_ERROR);
+		}
+		
 		return homeService.insertNotice(insertNoticeReqDto, multipartRequest);
 	}
 
@@ -102,8 +106,12 @@ public class HomeMgtController {
 	@RequestMapping(value = "/updateNotice", method = { RequestMethod.POST })
 	@ResponseBody
 	public UpdateNoticeResDto updateNotice(@RequestPart(value = "key") UpdateNoticeReqDto updateNoticeReqDto,
-			MultipartHttpServletRequest multipartRequest) {
-
+			BindingResult bindingResult, MultipartHttpServletRequest multipartRequest) {
+		
+		if (validComponents.validParameter(bindingResult)) {
+			return new UpdateNoticeResDto(ApiResponseCode.CM_PARAMETER_ERROR);
+		}
+		
 		return homeService.updateNotice(updateNoticeReqDto, multipartRequest);
 	}
 	
@@ -118,7 +126,9 @@ public class HomeMgtController {
 	@ApiResponses({ @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") })
 	@RequestMapping(value = "/deleteNotice", method = { RequestMethod.POST })
 	@ResponseBody
-	public DeleteNoticeResDto deleteNotice(@RequestBody @Valid DeleteNoticeReqDto deleteNoticeReqDto, BindingResult bindingResult) {
+	public DeleteNoticeResDto deleteNotice(@RequestBody @Valid DeleteNoticeReqDto deleteNoticeReqDto,
+			BindingResult bindingResult) {
+		
 		if (validComponents.validParameter(bindingResult)) {
 			return new DeleteNoticeResDto(ApiResponseCode.CM_PARAMETER_ERROR);
 		}
@@ -136,7 +146,12 @@ public class HomeMgtController {
 	@ApiResponses({ @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") })
 	@RequestMapping(value = "/getImageUrl", method = { RequestMethod.POST })
 	@ResponseBody
-	public FileResDto fileResDto(MultipartHttpServletRequest multipartRequest) {
+	public FileResDto fileResDto(MultipartHttpServletRequest multipartRequest
+			,BindingResult bindingResult) {
+		
+		if (validComponents.validParameter(bindingResult)) {
+			return new FileResDto(ApiResponseCode.CM_PARAMETER_ERROR);
+		}
 		
 		return homeService.fileResDto(multipartRequest);
 	}
@@ -231,8 +246,6 @@ public class HomeMgtController {
 	@ResponseBody
 	public InsertFaqResDto insertFaq(@RequestBody @Valid InsertFaqReqDto insertFaqReqDto, BindingResult bindingResult) {
 		
-		System.out.println("insertFaqReqDto ::::" + insertFaqReqDto);
-		
 		if (validComponents.validParameter(bindingResult)) {
 			return new InsertFaqResDto(ApiResponseCode.CM_PARAMETER_ERROR);
 		}
@@ -272,6 +285,7 @@ public class HomeMgtController {
 	@RequestMapping(value = "/deleteFaq", method = { RequestMethod.POST })
 	@ResponseBody
 	public DeleteFaqResDto deleteFaq(@RequestBody @Valid DeleteFaqReqDto deleteFaqReqDto, BindingResult bindingResult) {
+		
 		if (validComponents.validParameter(bindingResult)) {
 			return new DeleteFaqResDto(ApiResponseCode.CM_PARAMETER_ERROR);
 		}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 45d117d..0554d7f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,8 +8,8 @@ spring:
     name: mhez-admin
   servlet:
     multipart:
-      max-file-size: 15MB 
-      max-request-size: 15MB
+      max-file-size: 150MB 
+      max-request-size: 150MB
   main:
     banner-mode: log