From cb01f7b11d6f2fe2cd5cf48d1e5a2bb0379f6c31 Mon Sep 17 00:00:00 2001
From: sangkiham <sangkiham@sangkiham_PC>
Date: Thu, 31 Mar 2022 17:01:44 +0900
Subject: [PATCH] .

---
 src/main/java/com/daeucna/board/BoardApplication.java                            |  2 --
 src/main/java/com/daeucna/board/common/FileDownloadUtil.java                     |  3 +--
 src/main/java/com/daeucna/board/config/DataSourceConfig.java                     |  4 +---
 src/main/java/com/daeucna/board/config/WebMvcConfig.java                         | 12 ------------
 src/main/java/com/daeucna/board/dao/BoardDao.java                                |  5 ++---
 src/main/java/com/daeucna/board/interceptor/BaseInterceptor.java                 | 17 ++++++++---------
 src/main/java/com/daeucna/board/security/CustomAuthenticationFailureHandler.java |  1 +
 src/main/java/com/daeucna/board/security/CustomAuthenticationSuccessHandler.java |  1 +
 src/main/java/com/daeucna/board/security/CustomLoadUserByUsername.java           |  8 ++++++--
 src/main/java/com/daeucna/board/security/controller/LoginController.java         |  1 +
 src/main/java/com/daeucna/board/security/domain/UserDto.java                     |  3 ++-
 src/main/java/com/daeucna/board/security/service/LoginService.java               | 25 ++++---------------------
 src/main/resources/templates/fragment/config.html                                |  4 ++--
 src/main/resources/templates/fragment/configNoCustom.html                        |  3 +--
 src/main/resources/templates/fragment/footer.html                                |  3 +--
 src/main/resources/templates/fragment/header.html                                |  7 +++----
 src/main/resources/templates/layout/default_layout.html                          |  4 +---
 src/main/resources/templates/layout/oneDoc_layout.html                           |  4 +---
 src/main/resources/templates/page/boardDetail.html                               |  2 +-
 src/main/resources/templates/page/boardList.html                                 |  2 +-
 src/main/resources/templates/page/boardReply.html                                |  2 +-
 src/main/resources/templates/page/boardUpdate.html                               |  2 +-
 src/main/resources/templates/page/boardWrite.html                                |  2 +-
 src/main/resources/templates/page/login/join.html                                |  2 +-
 24 files changed, 42 insertions(+), 77 deletions(-)

diff --git a/src/main/java/com/daeucna/board/BoardApplication.java b/src/main/java/com/daeucna/board/BoardApplication.java
index 8370c68..d07cef8 100644
--- a/src/main/java/com/daeucna/board/BoardApplication.java
+++ b/src/main/java/com/daeucna/board/BoardApplication.java
@@ -2,8 +2,6 @@ package com.daeucna.board;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
 @SpringBootApplication
 public class BoardApplication {
diff --git a/src/main/java/com/daeucna/board/common/FileDownloadUtil.java b/src/main/java/com/daeucna/board/common/FileDownloadUtil.java
index b569af1..5ca426e 100644
--- a/src/main/java/com/daeucna/board/common/FileDownloadUtil.java
+++ b/src/main/java/com/daeucna/board/common/FileDownloadUtil.java
@@ -5,11 +5,10 @@ import java.io.FileInputStream;
 import java.io.OutputStream;
 import java.net.URLEncoder;
 import java.util.Map;
- 
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.springframework.stereotype.Component;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.web.servlet.view.AbstractView;
  
diff --git a/src/main/java/com/daeucna/board/config/DataSourceConfig.java b/src/main/java/com/daeucna/board/config/DataSourceConfig.java
index eeb994f..b2f36e7 100644
--- a/src/main/java/com/daeucna/board/config/DataSourceConfig.java
+++ b/src/main/java/com/daeucna/board/config/DataSourceConfig.java
@@ -2,19 +2,17 @@ package com.daeucna.board.config;
  
 import javax.sql.DataSource;
 
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionFactoryBean;
 import org.mybatis.spring.SqlSessionTemplate;
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.jdbc.DataSourceBuilder;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.FilterType;
-import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
diff --git a/src/main/java/com/daeucna/board/config/WebMvcConfig.java b/src/main/java/com/daeucna/board/config/WebMvcConfig.java
index 55b354e..d2e7c8b 100644
--- a/src/main/java/com/daeucna/board/config/WebMvcConfig.java
+++ b/src/main/java/com/daeucna/board/config/WebMvcConfig.java
@@ -9,24 +9,12 @@ import org.springframework.context.annotation.FilterType;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.http.converter.xml.MarshallingHttpMessageConverter;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.oxm.jaxb.Jaxb2Marshaller;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Controller;
-import org.springframework.stereotype.Repository;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.ViewResolverRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.springframework.web.servlet.view.BeanNameViewResolver;
 
-import com.daeucna.board.common.FileDownloadUtil;
 import com.daeucna.board.interceptor.BaseInterceptor;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/src/main/java/com/daeucna/board/dao/BoardDao.java b/src/main/java/com/daeucna/board/dao/BoardDao.java
index dd20d74..e261115 100644
--- a/src/main/java/com/daeucna/board/dao/BoardDao.java
+++ b/src/main/java/com/daeucna/board/dao/BoardDao.java
@@ -1,11 +1,10 @@
 package com.daeucna.board.dao;
  
 import java.util.List;
- 
+
 import javax.annotation.Resource;
- 
+
 import org.apache.ibatis.session.SqlSession;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
 import com.daeucna.board.domain.BoardDto;
diff --git a/src/main/java/com/daeucna/board/interceptor/BaseInterceptor.java b/src/main/java/com/daeucna/board/interceptor/BaseInterceptor.java
index 0cbecd4..a0dd32a 100644
--- a/src/main/java/com/daeucna/board/interceptor/BaseInterceptor.java
+++ b/src/main/java/com/daeucna/board/interceptor/BaseInterceptor.java
@@ -3,23 +3,22 @@ package com.daeucna.board.interceptor;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
  
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
+
+import lombok.extern.slf4j.Slf4j;
  
+@Slf4j
 public class BaseInterceptor implements HandlerInterceptor {
  
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
- 
     @Override
     public boolean preHandle( HttpServletRequest request
                             , HttpServletResponse response
                             , Object handler ) throws Exception {
         
-         if (logger.isDebugEnabled()) {
-             logger.debug("===== ===== ===== ===== =====    START     ===== ===== ===== ===== =====");
-             logger.debug("RequestURI:[{}]", request.getRequestURI());
+         if (log.isDebugEnabled()) {
+             log.debug("===== ===== ===== ===== =====    START     ===== ===== ===== ===== =====");
+             log.debug("RequestURI:[{}]", request.getRequestURI());
          }
         
         return true;
@@ -31,8 +30,8 @@ public class BaseInterceptor implements HandlerInterceptor {
                           , Object handler
                           , ModelAndView modelAndView ) throws Exception {
         
-         if (logger.isDebugEnabled()) {
-             logger.debug("===== ===== ===== ===== =====     END     ===== ===== ===== ===== =====\n");
+         if (log.isDebugEnabled()) {
+             log.debug("===== ===== ===== ===== =====     END     ===== ===== ===== ===== =====\n");
          }
     }
  
diff --git a/src/main/java/com/daeucna/board/security/CustomAuthenticationFailureHandler.java b/src/main/java/com/daeucna/board/security/CustomAuthenticationFailureHandler.java
index c0ad193..78f37e9 100644
--- a/src/main/java/com/daeucna/board/security/CustomAuthenticationFailureHandler.java
+++ b/src/main/java/com/daeucna/board/security/CustomAuthenticationFailureHandler.java
@@ -18,6 +18,7 @@ public class CustomAuthenticationFailureHandler implements AuthenticationFailure
 
   @Override
     public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, AuthenticationException exception) throws IOException, ServletException {
+	  	log.info("Authentication Failure");
         response.sendRedirect(request.getContextPath() + "/");
     }
 
diff --git a/src/main/java/com/daeucna/board/security/CustomAuthenticationSuccessHandler.java b/src/main/java/com/daeucna/board/security/CustomAuthenticationSuccessHandler.java
index fda9f32..3260f2e 100644
--- a/src/main/java/com/daeucna/board/security/CustomAuthenticationSuccessHandler.java
+++ b/src/main/java/com/daeucna/board/security/CustomAuthenticationSuccessHandler.java
@@ -22,6 +22,7 @@ public class CustomAuthenticationSuccessHandler implements AuthenticationSuccess
         HttpSession session = request.getSession();
         session.setMaxInactiveInterval(60);
         session.setAttribute("authentication", authentication);
+        log.info("Authentication Success");
         response.sendRedirect(request.getContextPath() + "/");
     }
 
diff --git a/src/main/java/com/daeucna/board/security/CustomLoadUserByUsername.java b/src/main/java/com/daeucna/board/security/CustomLoadUserByUsername.java
index 8f64283..87489a7 100644
--- a/src/main/java/com/daeucna/board/security/CustomLoadUserByUsername.java
+++ b/src/main/java/com/daeucna/board/security/CustomLoadUserByUsername.java
@@ -27,8 +27,12 @@ public class CustomLoadUserByUsername implements UserDetailsService{
 	  	UserDto user = null;
 	  	try {
 	        user = userDao.getOne(userForm);
-	        if(user == null)     throw new UsernameNotFoundException("Not Found User");
-	  	} catch (Exception e) {	  		
+	        if(user == null) {
+	        	log.warn("Not Found User");
+	        	throw new UsernameNotFoundException("Not Found User");
+	        }
+	  	} catch (Exception e) {	
+	  		log.error("Not Found User Error");
 	  		throw new UsernameNotFoundException("Not Found User(Error)");
 	  	}
         return user;
diff --git a/src/main/java/com/daeucna/board/security/controller/LoginController.java b/src/main/java/com/daeucna/board/security/controller/LoginController.java
index c91111f..754846b 100644
--- a/src/main/java/com/daeucna/board/security/controller/LoginController.java
+++ b/src/main/java/com/daeucna/board/security/controller/LoginController.java
@@ -54,6 +54,7 @@ public class LoginController {
     return "page/login/join";
   }
 
+  @SuppressWarnings({ "rawtypes", "unchecked" })
   @PostMapping("/join_proc")
   @ResponseBody
   public ResponseEntity procJoin(HttpServletRequest request, HttpServletResponse response, UserForm userForm) {
diff --git a/src/main/java/com/daeucna/board/security/domain/UserDto.java b/src/main/java/com/daeucna/board/security/domain/UserDto.java
index 6eab4ac..e1d877d 100644
--- a/src/main/java/com/daeucna/board/security/domain/UserDto.java
+++ b/src/main/java/com/daeucna/board/security/domain/UserDto.java
@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -16,6 +15,8 @@ import lombok.ToString;
 @ToString
 public class UserDto implements UserDetails {
 
+  private static final long serialVersionUID = -8756513459420668339L;
+
   String ROLE_PREFIX = "ROLE_";
 
   private String id;
diff --git a/src/main/java/com/daeucna/board/security/service/LoginService.java b/src/main/java/com/daeucna/board/security/service/LoginService.java
index 0bf7e6b..6e0a9fd 100644
--- a/src/main/java/com/daeucna/board/security/service/LoginService.java
+++ b/src/main/java/com/daeucna/board/security/service/LoginService.java
@@ -1,38 +1,21 @@
 package com.daeucna.board.security.service;
  
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.UUID;
- 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
 
-import com.daeucna.board.common.PagingUtil;
-import com.daeucna.board.common.ResultUtil;
-import com.daeucna.board.dao.BoardDao;
-import com.daeucna.board.domain.BoardDto;
-import com.daeucna.board.domain.BoardFileForm;
-import com.daeucna.board.domain.BoardForm;
-import com.daeucna.board.domain.CommonDto;
-import com.daeucna.board.domain.CommonForm;
 import com.daeucna.board.security.dao.UserDao;
-import com.daeucna.board.security.domain.UserDto;
 import com.daeucna.board.security.domain.UserForm;
+
+import lombok.extern.slf4j.Slf4j;
  
+@Slf4j
 @Transactional(readOnly = true)
 @Service
 public class LoginService {
  
-    protected final Logger logger = LoggerFactory.getLogger(LoginService.class);
-    
     @Autowired
     private UserDao userDao;
     @Autowired
@@ -52,7 +35,7 @@ public class LoginService {
         } else {
         	userForm.setResult("FAIL");
         }
- 
+        log.info("사용자등록 완료");
         return userForm;
     }
 
diff --git a/src/main/resources/templates/fragment/config.html b/src/main/resources/templates/fragment/config.html
index 45937b3..0f40cd4 100644
--- a/src/main/resources/templates/fragment/config.html
+++ b/src/main/resources/templates/fragment/config.html
@@ -1,5 +1,5 @@
-<html lagn="ko" 
-      xmlns:th="http://www.thymeleaf.org"
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org"
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
 
     <!--configFragment 선언-->
diff --git a/src/main/resources/templates/fragment/configNoCustom.html b/src/main/resources/templates/fragment/configNoCustom.html
index 31e970f..d2eb4a6 100644
--- a/src/main/resources/templates/fragment/configNoCustom.html
+++ b/src/main/resources/templates/fragment/configNoCustom.html
@@ -1,5 +1,4 @@
-<html lagn="ko" 
-      xmlns:th="http://www.thymeleaf.org"
+<html xmlns:th="http://www.thymeleaf.org"
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
 
     <!--configFragment 선언-->
diff --git a/src/main/resources/templates/fragment/footer.html b/src/main/resources/templates/fragment/footer.html
index 6224800..cc37ed8 100644
--- a/src/main/resources/templates/fragment/footer.html
+++ b/src/main/resources/templates/fragment/footer.html
@@ -1,5 +1,4 @@
-<html lagn="ko" 
-      xmlns:th="http://www.thymeleaf.org">
+<html xmlns:th="http://www.thymeleaf.org">
       
     <!--footerFragment 선언-->
     <div th:fragment="footerFragment" style="height: 4em;text-align: center;">
diff --git a/src/main/resources/templates/fragment/header.html b/src/main/resources/templates/fragment/header.html
index 6f0df53..c4d6853 100644
--- a/src/main/resources/templates/fragment/header.html
+++ b/src/main/resources/templates/fragment/header.html
@@ -1,12 +1,11 @@
-<html lagn="ko" 
-      xmlns:th="http://www.thymeleaf.org">
+<html xmlns:th="http://www.thymeleaf.org">
        
     <!--headerFragment 선언-->
     <div th:fragment="headerFragment" style="height: 4em;text-align: center;">
     	<div class="shadow-sm p-3 mb-5 bg-body rounded" style="height: 3.4rem;">
 			<div style="text-align: left; float: left;">
-			  <button type="button" class="btn btn-outline-dark"><a th:href="@{/board/boardList?boardName=maintenance}">유지보수</a></button>
-			  <button type="button" class="btn btn-outline-dark"><a th:href="@{/board/boardList?boardName=etc}">기타</a></button>
+			  <a th:href="@{/board/boardList?boardName=maintenance}"><button type="button" class="btn btn-outline-dark">유지보수</button></a>
+			  <a th:href="@{/board/boardList?boardName=etc}"><button type="button" class="btn btn-outline-dark">기타</button></a>
 			</div>
 			<div style="text-align: right; float: right;">
 			    <form class="d-flex" th:action="@{/logout}">
diff --git a/src/main/resources/templates/layout/default_layout.html b/src/main/resources/templates/layout/default_layout.html
index 3f4cab9..88f7f5a 100644
--- a/src/main/resources/templates/layout/default_layout.html
+++ b/src/main/resources/templates/layout/default_layout.html
@@ -1,7 +1,5 @@
 <!DOCTYPE html>
-
-<html lagn="ko" 
-      xmlns:th="http://www.thymeleaf.org"
+<html xmlns:th="http://www.thymeleaf.org"
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
 
     <head>
diff --git a/src/main/resources/templates/layout/oneDoc_layout.html b/src/main/resources/templates/layout/oneDoc_layout.html
index 8f6f5be..191a41f 100644
--- a/src/main/resources/templates/layout/oneDoc_layout.html
+++ b/src/main/resources/templates/layout/oneDoc_layout.html
@@ -1,7 +1,5 @@
 <!DOCTYPE html>
-
-<html lagn="ko" 
-      xmlns:th="http://www.thymeleaf.org"
+<html xmlns:th="http://www.thymeleaf.org"
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
 
     <head>
diff --git a/src/main/resources/templates/page/boardDetail.html b/src/main/resources/templates/page/boardDetail.html
index 4e256f6..ad863ca 100644
--- a/src/main/resources/templates/page/boardDetail.html
+++ b/src/main/resources/templates/page/boardDetail.html
@@ -219,7 +219,7 @@
 		        <div class="inner">    
 		            <h2>상세내역</h2>
 		            <form id="boardForm" name="boardForm">        
-		                <table width="100%" class="table01">
+		                <table style="width: 100%" class="table01">
 		                    <colgroup>
 		                        <col width="15%">
 		                        <col width="35%">
diff --git a/src/main/resources/templates/page/boardList.html b/src/main/resources/templates/page/boardList.html
index 6e89bb0..c519287 100644
--- a/src/main/resources/templates/page/boardList.html
+++ b/src/main/resources/templates/page/boardList.html
@@ -148,7 +148,7 @@
 		                    <span class="total_count"><strong>전체</strong> : <span id="total_count" class="t_red">0</span>개</span>
 		                </div>
 		                
-		                <table width="100%" class="table01">
+		                <table style="width: 100%" class="table01">
 		                    <colgroup>
 		                        <col width="7%" />
 		                        <col width="25%" />
diff --git a/src/main/resources/templates/page/boardReply.html b/src/main/resources/templates/page/boardReply.html
index b4923a2..5f8c1d8 100644
--- a/src/main/resources/templates/page/boardReply.html
+++ b/src/main/resources/templates/page/boardReply.html
@@ -87,7 +87,7 @@
 		            <h2>신규작성</h2>
 		            <form id="boardForm" name="boardForm">
 		                <input type="hidden" id="board_parent_seq"    name="board_parent_seq"    th:value="${#request.getParameter('boardSeq')}"/> <!-- 부모 게시글 번호 -->
-		                <table width="100%" class="table02">
+		                <table style="width: 100%" class="table02">
 		                <caption><strong><span class="t_red">*</span> 표시는 필수입력 항목입니다.</strong></caption>
 		                    <colgroup>
 		                        <col width="20%">
diff --git a/src/main/resources/templates/page/boardUpdate.html b/src/main/resources/templates/page/boardUpdate.html
index a416788..60ca68b 100644
--- a/src/main/resources/templates/page/boardUpdate.html
+++ b/src/main/resources/templates/page/boardUpdate.html
@@ -209,7 +209,7 @@
 		        <div class="inner">    
 		            <h2>상세내역</h2>
 		            <form id="boardForm" name="boardForm" action="/board/updateBoard" enctype="multipart/form-data" method="post" onsubmit="return false;">    
-		                <table width="100%" class="table02">
+		                <table style="width: 100%" class="table02">
 		                <caption><strong><span class="t_red">*</span> 표시는 필수입력 항목입니다.</strong></caption>
 		                    <colgroup>
 		                         <col width="20%">
diff --git a/src/main/resources/templates/page/boardWrite.html b/src/main/resources/templates/page/boardWrite.html
index 909c2b3..d7abf2e 100644
--- a/src/main/resources/templates/page/boardWrite.html
+++ b/src/main/resources/templates/page/boardWrite.html
@@ -90,7 +90,7 @@
 		        <div class="inner">        
 		            <h2>신규작성</h2>
 		            <form id="boardForm" name="boardForm" action="[[@{/}]]board/insertBoard" enctype="multipart/form-data" method="post" onsubmit="return false;">
-		                <table width="100%" class="table02">
+		                <table style="width: 100%" class="table02">
 		                <caption><strong><span class="t_red">*</span> 표시는 필수입력 항목입니다.</strong></caption>
 		                    <colgroup>
 		                        <col width="20%">
diff --git a/src/main/resources/templates/page/login/join.html b/src/main/resources/templates/page/login/join.html
index d03a74d..70906d5 100644
--- a/src/main/resources/templates/page/login/join.html
+++ b/src/main/resources/templates/page/login/join.html
@@ -128,7 +128,7 @@
                             <input type="checkbox" class="custom-control-input" id="aggrement" required />
                             <label class="custom-control-label" for="aggrement">개인정보 수집 및 이용에 동의합니다.</label>
                         </div>
-                        <div class="mb-4" />
+                        <hr class="mb-4" />
                         <button class="form-control btn btn-primary btn-lg btn-block" id="btnJoin">가입 완료</button>
                     </form>
                 </div>
--
libgit2 0.21.4