From f25aaa3c690a1b16fc5999ea0674f355589ac5d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Mon, 6 Dec 2021 17:37:46 +0900
Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EC=83=81?=
 =?UTF-8?q?=ED=83=9C=20=EA=B4=80=EB=A6=AC=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/dbnt/kcgfilemanager/model/UserInfo.java     | 4 +++-
 .../com/dbnt/kcgfilemanager/service/UserInfoService.java | 3 +--
 src/main/resources/mybatisMapper/UserInfoMapper.xml      | 3 ++-
 src/main/resources/static/js/admin/userMgt.js            | 2 +-
 src/main/resources/templates/admin/userInfo.html         | 9 +++++++++
 src/main/resources/templates/admin/userMgt.html          | 2 ++
 src/main/resources/templates/login.html                  | 2 +-
 src/main/resources/templates/login/denied.html           | 4 ++--
 8 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/dbnt/kcgfilemanager/model/UserInfo.java b/src/main/java/com/dbnt/kcgfilemanager/model/UserInfo.java
index 6a5d636..b4ca676 100644
--- a/src/main/java/com/dbnt/kcgfilemanager/model/UserInfo.java
+++ b/src/main/java/com/dbnt/kcgfilemanager/model/UserInfo.java
@@ -41,6 +41,8 @@ public class UserInfo extends BaseModel implements UserDetails{
   private String userRole;
   @Column(name = "CREATE_DATE", updatable = false)
   private LocalDateTime createDate;
+  @Column(name = "USER_STATUS")
+  private String userStatus;
 
   @Transient
   private String positionName;
@@ -78,6 +80,6 @@ public class UserInfo extends BaseModel implements UserDetails{
 
   @Override
   public boolean isEnabled() {
-      return true;
+      return userStatus.equals("T");
   }
 }
diff --git a/src/main/java/com/dbnt/kcgfilemanager/service/UserInfoService.java b/src/main/java/com/dbnt/kcgfilemanager/service/UserInfoService.java
index a749bd7..17595a2 100644
--- a/src/main/java/com/dbnt/kcgfilemanager/service/UserInfoService.java
+++ b/src/main/java/com/dbnt/kcgfilemanager/service/UserInfoService.java
@@ -4,7 +4,6 @@ import com.dbnt.kcgfilemanager.mapper.UserInfoMapper;
 import com.dbnt.kcgfilemanager.model.UserInfo;
 import com.dbnt.kcgfilemanager.repository.UserInfoRepository;
 import lombok.RequiredArgsConstructor;
-import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
@@ -13,7 +12,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.Optional;
 
 @Service
 @RequiredArgsConstructor
@@ -37,6 +35,7 @@ public class UserInfoService implements UserDetailsService {
     targetUserInfo.setPosition(userInfo.getPosition());
     targetUserInfo.setDepartment(userInfo.getDepartment());
     targetUserInfo.setUserRole(userInfo.getUserRole());
+    targetUserInfo.setUserStatus(userInfo.getUserStatus());
     return targetUserInfo.getUserId();
   }
 
diff --git a/src/main/resources/mybatisMapper/UserInfoMapper.xml b/src/main/resources/mybatisMapper/UserInfoMapper.xml
index 9da4e08..125ea67 100644
--- a/src/main/resources/mybatisMapper/UserInfoMapper.xml
+++ b/src/main/resources/mybatisMapper/UserInfoMapper.xml
@@ -13,7 +13,8 @@
       A.DEPARTMENT AS department,
       C.VALUE AS departmentName,
       A.USER_ROLE AS userRole,
-      A.CREATE_DATE AS createDate
+      A.CREATE_DATE AS createDate,
+      A.USER_STATUS AS userStatus
     FROM USER_INFO A
       INNER JOIN COMMON_CODE B
         ON A.POSITION = B.CODE_SQ
diff --git a/src/main/resources/static/js/admin/userMgt.js b/src/main/resources/static/js/admin/userMgt.js
index eab3e3d..41a2285 100644
--- a/src/main/resources/static/js/admin/userMgt.js
+++ b/src/main/resources/static/js/admin/userMgt.js
@@ -77,7 +77,7 @@ $(document).on('click', '#updateBtn', function (){
         contentType: false,
         success : function(data) {
           alert("저장되었습니다.")
-          $(".userInfoCheckBox:checked").click();
+          $("#searchBtn").click();
         },
         error : function(xhr, status) {
 
diff --git a/src/main/resources/templates/admin/userInfo.html b/src/main/resources/templates/admin/userInfo.html
index c9ebc1c..8e80d34 100644
--- a/src/main/resources/templates/admin/userInfo.html
+++ b/src/main/resources/templates/admin/userInfo.html
@@ -56,6 +56,15 @@
       </select>
     </div>
   </div>
+  <div class="mb-3 row">
+    <label for="userStatus" class="col-sm-4 col-form-label">사용여부</label>
+    <div class="col-sm-6">
+      <select class="form-select" id="userStatus" name="userStatus">
+        <option value="T" th:selected="${userInfo.userStatus=='T'}">활성화</option>
+        <option value="F" th:selected="${userInfo.userStatus=='F'}">비활성화</option>
+      </select>
+    </div>
+  </div>
   <div class="mb-3 row">
     <div class="col-sm-4"></div>
     <div class="col-sm-auto form-check ms-3">
diff --git a/src/main/resources/templates/admin/userMgt.html b/src/main/resources/templates/admin/userMgt.html
index 80e6add..152b53c 100644
--- a/src/main/resources/templates/admin/userMgt.html
+++ b/src/main/resources/templates/admin/userMgt.html
@@ -73,6 +73,7 @@
                     <th>부서</th>
                     <th>직급</th>
                     <th>생성일</th>
+                    <th>상태</th>
                   </tr>
                   </thead>
                   <tbody>
@@ -85,6 +86,7 @@
                     <td th:text="${userInfo.positionName}"></td>
                     <td th:text="${userInfo.departmentName}"></td>
                     <td th:text="${#temporals.format(userInfo.createDate, 'yyyy-MM-dd')}"></td>
+                    <td th:text="${#strings.contains(userInfo.userStatus,'T')?'활성화':'비활성화'}"></td>
                   </tr>
                   </tbody>
                 </table>
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
index d8650e2..e7caa6c 100644
--- a/src/main/resources/templates/login.html
+++ b/src/main/resources/templates/login.html
@@ -11,7 +11,7 @@
       <!-- Spring Security가 적용되면 POST 방식으로 보내는 모든 데이터는 csrf 토큰 값이 필요 -->
       <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
       <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
-      <p th:if="${loginError}" class="error">Wrong user or password</p>
+      <p th:if="${loginError}" class="error text-danger">로그인에 실패하였습니다.</p>
       <!-- 로그인 시 아이디의 name 애트리뷰트 값은 username -->
       <!-- 파라미터명을 변경하고 싶을 경우 config class formlogin()에서 .usernameParameter("") 명시 -->
 
diff --git a/src/main/resources/templates/login/denied.html b/src/main/resources/templates/login/denied.html
index 739b366..10f5768 100644
--- a/src/main/resources/templates/login/denied.html
+++ b/src/main/resources/templates/login/denied.html
@@ -4,8 +4,8 @@
       xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity5"
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
       layout:decorate="~{layout/layout}">
-  <div layout:fragment="content">
-    <h1>This is denied Page.</h1>
+  <div layout:fragment="content" class="p-5">
+    <h1>권한 부족으로 접근이 거부되었습니다.</h1>
     <hr />
   </div>
 </html>
\ No newline at end of file