diff --git a/src/main/java/com/no1/wms/base/AuthAspect.java b/src/main/java/com/no1/wms/base/AuthAspect.java index 9c79cb3..ed4ea3c 100644 --- a/src/main/java/com/no1/wms/base/AuthAspect.java +++ b/src/main/java/com/no1/wms/base/AuthAspect.java @@ -38,9 +38,7 @@ public class AuthAspect { HttpServletResponse response = sa.getResponse(); HttpSession session = request.getSession(); HashMap auth = (HashMap) session.getAttribute("authSession"); - if(auth == null){ - auth = test(request); - } + String targetController = joinPoint.getTarget().toString().toLowerCase(); String[] list = targetController.split("\\."); diff --git a/src/main/java/com/no1/wms/base/BaseController.java b/src/main/java/com/no1/wms/base/BaseController.java index fa6a448..7eaa866 100644 --- a/src/main/java/com/no1/wms/base/BaseController.java +++ b/src/main/java/com/no1/wms/base/BaseController.java @@ -4,26 +4,54 @@ import com.no1.wms.account.AccountDto; import com.no1.wms.account.AccountService; import com.no1.wms.authority.AuthorityDto; import com.no1.wms.authority.AuthorityService; +import com.no1.wms.in.InDto; +import com.no1.wms.in.InService; +import com.no1.wms.stock.StockService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.HashMap; +import java.util.List; +import java.util.Map; @Controller public class BaseController { + + @Autowired + StockService service; + + @Autowired + InService inService; @GetMapping("/") - public ModelAndView base(HttpServletRequest request, ModelAndView mav){ + public String mainPage(@RequestParam(name = "searchn2", defaultValue = "0") int searchn2, + @RequestParam(name = "search2", defaultValue = "") String search2, + @RequestParam(name = "p2", defaultValue = "1") int p2, Model m) { - mav.addObject("userData", request.getSession().getAttribute("userData")); + int perPage2 = 5; // 한 페이지에 보일 글의 갯수 + int startRow2 = (p2 - 1) * perPage2; - mav.setViewName("redirect:/main"); + List> dto2 = service.list2(searchn2, search2, startRow2 ,perPage2); + m.addAttribute("slist2", dto2); + System.out.println("리스트 확인 : : " + dto2); - return mav; + + Date today = new Date(); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String formattedDate = dateFormat.format(today); + + List dto = inService.inListMain(formattedDate); + m.addAttribute("inDto", dto); + + return "base/main"; } diff --git a/src/main/java/com/no1/wms/base/MainPageController.java b/src/main/java/com/no1/wms/base/MainPageController.java deleted file mode 100644 index e7afc6b..0000000 --- a/src/main/java/com/no1/wms/base/MainPageController.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.no1.wms.base; - -import com.no1.wms.in.InDto; -import com.no1.wms.in.InService; -import com.no1.wms.stock.StockService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; - -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; -import java.util.Map; - -@Controller -public class MainPageController { - - @Autowired - StockService service; - - @Autowired - InService inService; - - @GetMapping("/main") - public String mainPage(@RequestParam(name = "searchn2", defaultValue = "0") int searchn2, - @RequestParam(name = "search2", defaultValue = "") String search2, - @RequestParam(name = "p2", defaultValue = "1") int p2, Model m) { - - int perPage2 = 5; // 한 페이지에 보일 글의 갯수 - int startRow2 = (p2 - 1) * perPage2; - - List> dto2 = service.list2(searchn2, search2, startRow2 ,perPage2); - m.addAttribute("slist2", dto2); - System.out.println("리스트 확인 : : " + dto2); - - - Date today = new Date(); - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - String formattedDate = dateFormat.format(today); - - List dto = inService.inListMain(formattedDate); - m.addAttribute("inDto", dto); - - return "base/main"; - } -} diff --git a/src/main/java/com/no1/wms/login/LoginController.java b/src/main/java/com/no1/wms/login/LoginController.java index 991231a..9f90c93 100644 --- a/src/main/java/com/no1/wms/login/LoginController.java +++ b/src/main/java/com/no1/wms/login/LoginController.java @@ -49,6 +49,16 @@ public class LoginController { } + @GetMapping("/logout") + public String logout(AccountDto data, AuthorityDto authDto, Gson gson, HttpServletRequest request){ + HttpSession session = request.getSession(); + session.invalidate(); + + return "redirect:/"; + + } + + @PostMapping("/login/check_password") diff --git a/src/main/resources/static/img/mypage/profile/defaultimg.png b/src/main/resources/static/img/mypage/profile/15b68e54-b0f0-11ee-935d-0242ac110006.jpg similarity index 100% rename from src/main/resources/static/img/mypage/profile/defaultimg.png rename to src/main/resources/static/img/mypage/profile/15b68e54-b0f0-11ee-935d-0242ac110006.jpg diff --git a/src/main/resources/static/img/mypage/profile/defaultimg.jpg b/src/main/resources/static/img/mypage/profile/defaultimg.jpg new file mode 100644 index 0000000..147064e Binary files /dev/null and b/src/main/resources/static/img/mypage/profile/defaultimg.jpg differ diff --git a/src/main/webapp/WEB-INF/views/base/navigation.jsp b/src/main/webapp/WEB-INF/views/base/navigation.jsp index fee51d2..b98b51c 100644 --- a/src/main/webapp/WEB-INF/views/base/navigation.jsp +++ b/src/main/webapp/WEB-INF/views/base/navigation.jsp @@ -8,13 +8,19 @@
  • - 유저 이미지 + +

    ${userData.name}
    • +
  • + + 게시판 + +
  • @@ -99,13 +105,11 @@
    • -
  • - - 게시판 + + 로그아웃
    • -
    diff --git a/src/main/webapp/WEB-INF/views/modal/login.jsp b/src/main/webapp/WEB-INF/views/modal/login.jsp index 643cf70..013f016 100644 --- a/src/main/webapp/WEB-INF/views/modal/login.jsp +++ b/src/main/webapp/WEB-INF/views/modal/login.jsp @@ -52,7 +52,7 @@ }
    - +

    Please sign in