dev

src/main/java/com/its/op/controller/its/LoginController.java

@@ -69,7 +69,6 @@ public class LoginController {
     }
     @GetMapping({"/login.do"})
     public ModelAndView getLogin(HttpServletRequest request, HttpServletResponse response) {
-        //log.error("getLogin3: request, {}", request.toString());
         Authentication auth = SecurityContextHolder.getContext().getAuthentication();
         if (auth != null) {
             //log.error("getLogin3: auth, {}", auth.toString());
@@ -82,16 +81,10 @@ public class LoginController {
             //log.error("getLogin3: session, {}", session.toString());
             session.invalidate();   // session remove
         }
-        //log.error("getLogin3: forward:/application/login/login.html");
         //return new ModelAndView("forward:/application/login/login.html");
         return new ModelAndView("redirect:/application/login/login.html");
     }
 
-//    @ApiOperation(value = "로그아웃")
-//    @PostMapping(value = "/logout", produces = {"application/json; charset=utf8"})
-//    public void logout(@RequestBody @Valid final LoginDto.LogoutReqDto req) {
-//        this.service.logout(req);
-//    }
     public String getSessionUserId(HttpServletRequest request) {
         String userId = "";
         UserInfoDto userInfo = getSessionUserInfo(request);
@@ -144,19 +137,12 @@ public class LoginController {
      * @param response
      * @return
      */
-    @GetMapping({"/logout.do"})
-    public ModelAndView getLogout(HttpServletRequest request, HttpServletResponse response) {
-        return commonLogout(request, response);
-    }
-    @PostMapping({"/logout.do"})
-    public ModelAndView postLogout(HttpServletRequest request, HttpServletResponse response) {
-        return commonLogout(request, response);
-    }
-
-    public ModelAndView commonLogout(HttpServletRequest request, HttpServletResponse response) {
+    //@GetMapping({"/logout.do"})
+    @RequestMapping(value = "/logout.do", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView logout(HttpServletRequest request, HttpServletResponse response) {
         Cookie[] cookies = request.getCookies();
         for (int ii = 0; ii < cookies.length; ii++) {
-            log.error("commonLogout: {}, {}", cookies[ii].getName(), cookies[ii].getValue());
+            log.error("logout: {}, {}", cookies[ii].getName(), cookies[ii].getValue());
         }
         String encUserId = "";
         String loginHms = "";
@@ -191,7 +177,6 @@ public class LoginController {
             session.invalidate();   // session remove
         }
         new SecurityContextLogoutHandler().logout(request, response, SecurityContextHolder.getContext().getAuthentication());
-
         return new ModelAndView("redirect:/application/login/login.html");
     }