From 0743bcc5fb11eef419a40e59f94ccc3d208db47e Mon Sep 17 00:00:00 2001
From: KNKIM <KNKIM@DESKTOP-P57VL4M>
Date: Fri, 30 Jul 2021 13:09:50 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A4=91=EA=B0=84=EB=B0=B1=EC=97=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/dataxml/uac.service.board.qna_GET.xml         |  3 ++-
 src/main/java/nlib/bbs/web/BoardController.java    | 14 +++++++++-----
 .../java/nlib/security/SpringSecurityConfig.java   |  1 +
 .../WEB-INF/jsp/nlib/board/updateQnAForm.jsp       |  3 +--
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/data/dataxml/uac.service.board.qna_GET.xml b/data/dataxml/uac.service.board.qna_GET.xml
index 2e5c2b22..29ffb998 100644
--- a/data/dataxml/uac.service.board.qna_GET.xml
+++ b/data/dataxml/uac.service.board.qna_GET.xml
@@ -6,7 +6,8 @@
 	<articleType>101</articleType>
 	<articleTypeName>Q&amp;A</articleTypeName>
 	<title>공지사항 테스트</title>
-	<articlePassword>9uCh4qxBlFqap/+KiqoM68EqO8yYGpKa1c+BCgkOEa4=</articlePassword><!-- 111 -->
+	<articlePassword>9uCh4qxBlFqap/+KiqoM68EqO8yYGpKa1c+BCgkOEa4=</articlePassword>        <!-- 111 -->
+	<!-- <articlePassword>kac/2AarLABcE7TcGRMKiE6Qneo/ctRuMCZv4aH1iNg=</articlePassword> --> <!-- 555 -->
 	<readCount>15</readCount>
 	<regDate>2021-07-19</regDate>
 	<regUserName>김아무</regUserName>
diff --git a/src/main/java/nlib/bbs/web/BoardController.java b/src/main/java/nlib/bbs/web/BoardController.java
index e288ec97..0e152ddc 100644
--- a/src/main/java/nlib/bbs/web/BoardController.java
+++ b/src/main/java/nlib/bbs/web/BoardController.java
@@ -292,7 +292,9 @@ public class BoardController extends NlibCommonController
 		log.debug("updateQnAForm > articlePassword = " + articlePassword);
 		
 		if(StringUtil.isEmpty(articlePassword)) {
-			model.addAttribute("message", "비밀빈호가 올바르지 않습니다.(1)");
+			model.addAttribute("message", "비밀빈호가 올바르지 않습니다.(U1)");
+			
+			addParamsToModel(paramMap, model, null, "pageIndex,pageSize,searchKeyword,articleNo");
 			return "redirect:/board/selectQnA.do";
 		}
 
@@ -315,7 +317,8 @@ public class BoardController extends NlibCommonController
     	log.debug("updateQnAForm > 입력받은 비밀번호를 SHA256 암호화한 값 : " + shaArticlePassword);
     	
     	if(!shaArticlePassword.equals(article.get("articlePassword"))) {
-			model.addAttribute("message", "비밀번호가 올바르지 않습니다.(1)");
+			model.addAttribute("message", "비밀번호가 올바르지 않습니다.(U2)");
+			addParamsToModel(paramMap, model, null, "pageIndex,pageSize,searchKeyword,articleNo");
 			return "redirect:/board/selectQnA.do";
     	}
     	
@@ -379,7 +382,6 @@ public class BoardController extends NlibCommonController
     		return "redirect:/alert/showError.do";
     	}
 
-
     	// 새 글비밀번호가 존재하지 않는 경우, 기존 비밀번호 설정 처리 
 		if(StringUtil.isEmpty(articlePassword)) {
 			articlePassword = checkArticlePassword;
@@ -453,7 +455,8 @@ public class BoardController extends NlibCommonController
 		log.debug("deleteQnA > articlePassword = " + articlePassword);
 		
 		if(StringUtil.isEmpty(articlePassword)) {
-			model.addAttribute("message", "비밀빈호가 올바르지 않습니다.(D1)");
+			model.addAttribute("message", "글비밀빈호가 올바르지 않습니다.(D1)");
+			addParamsToModel(paramMap, model, null, "pageIndex,pageSize,searchKeyword,articleNo");
 			return "redirect:/board/selectQnA.do";
 		}
 
@@ -476,7 +479,8 @@ public class BoardController extends NlibCommonController
     	log.debug("updateQnAForm > 입력받은 비밀번호를 SHA256 암호화한 값 : " + shaArticlePassword);
     	
     	if(!shaArticlePassword.equals(article.get("articlePassword"))) {
-			model.addAttribute("message", "비밀번호가 올바르지 않습니다.(D2)");
+			model.addAttribute("message", "글비밀번호가 올바르지 않습니다.(D2)");
+			addParamsToModel(paramMap, model, null, "pageIndex,pageSize,searchKeyword,articleNo");
 			return "redirect:/board/selectQnA.do";
     	}
     	
diff --git a/src/main/java/nlib/security/SpringSecurityConfig.java b/src/main/java/nlib/security/SpringSecurityConfig.java
index ab8149fd..fd86b76d 100644
--- a/src/main/java/nlib/security/SpringSecurityConfig.java
+++ b/src/main/java/nlib/security/SpringSecurityConfig.java
@@ -55,6 +55,7 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter {
 			.antMatchers("/*/*Ajax.do")
 			.antMatchers("/board/**")
 			.antMatchers("/inform/**")
+			.antMatchers("/alert/**")
 		;
 	}
 	
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/board/updateQnAForm.jsp b/src/main/webapp/WEB-INF/jsp/nlib/board/updateQnAForm.jsp
index cf7f280b..92a05edb 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/board/updateQnAForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/board/updateQnAForm.jsp
@@ -87,7 +87,6 @@ function fn_update() {
     <input type="text" name="pageSize"        id="pageSize"        title="목록에 보여줄 글 개수" value="${pageSize}"       readonly />
     <input type="text" name="searchKeyword"   id="searchKeyword"   title="검색어"           value="${searchKeyword}"   readonly />
     <input type="text" name="articleNo"       id="articleNo"       title="선택글번호"        value="${articleNo}"       readonly />
-    <input type="text" name="articlePassword" id="articlePassword" title="글비밀번호"        value="${articlePassword}" readonly />
 
 	&nbsp;<br/>
 	&nbsp;<br/>
@@ -111,7 +110,7 @@ function fn_update() {
         </tr>
         <tr>
             <th>비밀번호<br/>(변경시 입력)</th>
-            <td><input type="text" name="articlePassword" id="articlePassword" title="비밀번호" value="${article.articlePassword}" size="100" maxlength="200" required /><br/>
+            <td><input type="text" name="articlePassword" id="articlePassword" title="비밀번호" value="" size="100" maxlength="200" /><br/>
                 * 비밀번호 : SHA-256 암호화 처리 후, DB에 저장되며, 웹 화면에 표출될 때는 Aria로 AuthKey를 Salt값으로 하여 재암호화처리하고 BASE64로 다시한번 인코딩하여 표출함 
             </td>
         </tr>