Index: .idea/sonarIssues.xml
===================================================================
diff -u -r2d3ed68f970e0de49f7291dea6453ae3a32dfa32 -rea3855e268c8ddec2ae620e3ae931f2940ff63dc
--- .idea/sonarIssues.xml (.../sonarIssues.xml) (revision 2d3ed68f970e0de49f7291dea6453ae3a32dfa32)
+++ .idea/sonarIssues.xml (.../sonarIssues.xml) (revision ea3855e268c8ddec2ae620e3ae931f2940ff63dc)
@@ -1668,6 +1668,11 @@
+
+
+
+
+
@@ -1708,11 +1713,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: .idea/webContexts.xml
===================================================================
diff -u
--- .idea/webContexts.xml (revision 0)
+++ .idea/webContexts.xml (revision ea3855e268c8ddec2ae620e3ae931f2940ff63dc)
@@ -0,0 +1,10 @@
+
+
+
+
+
+
\ No newline at end of file
Index: standard/project/web/src/main/java/egovframework/api/rivalWar/menu/controller/AdminMenuController.java
===================================================================
diff -u -r3bda0a83ee4a2f1a10e14435080f6b2ebb30ad72 -rea3855e268c8ddec2ae620e3ae931f2940ff63dc
--- standard/project/web/src/main/java/egovframework/api/rivalWar/menu/controller/AdminMenuController.java (.../AdminMenuController.java) (revision 3bda0a83ee4a2f1a10e14435080f6b2ebb30ad72)
+++ standard/project/web/src/main/java/egovframework/api/rivalWar/menu/controller/AdminMenuController.java (.../AdminMenuController.java) (revision ea3855e268c8ddec2ae620e3ae931f2940ff63dc)
@@ -45,6 +45,11 @@
* @throws JsonProcessingException
*/
@IncludedInfo(name = "RivalWar Admin Menu", listUrl = "/api/rivalWar/ROLE_ADMIN/menu/getJsTreeView.do", order = 7000, gid = 7313)
+ @RequestMapping("/getJsTreeView.do")
+ public String jsTreeSpringHibernate() {
+ return "egovframework/rivalWar/api/menu/admin/JsTreeView";
+ }
+
@ResponseBody
@RequestMapping(value = "/getChildMenu.do", method = RequestMethod.GET)
public ModelAndView getChildMenu(MenuDTO jsTreeHibernateDTO, ModelMap model, HttpServletRequest request)
Index: standard/project/web/src/main/java/egovframework/api/rivalWar/menu/controller/AnonymousMenuController.java
===================================================================
diff -u -r3bda0a83ee4a2f1a10e14435080f6b2ebb30ad72 -rea3855e268c8ddec2ae620e3ae931f2940ff63dc
--- standard/project/web/src/main/java/egovframework/api/rivalWar/menu/controller/AnonymousMenuController.java (.../AnonymousMenuController.java) (revision 3bda0a83ee4a2f1a10e14435080f6b2ebb30ad72)
+++ standard/project/web/src/main/java/egovframework/api/rivalWar/menu/controller/AnonymousMenuController.java (.../AnonymousMenuController.java) (revision ea3855e268c8ddec2ae620e3ae931f2940ff63dc)
@@ -34,6 +34,7 @@
private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
@ResponseBody
@RequestMapping(value = "/getPaginatedChildMenu.do", method = RequestMethod.GET)
public ModelAndView getPaginatedChildMenu(MenuDTO jsTreeHibernateDTO, ModelMap model, HttpServletRequest request)
@@ -74,6 +75,50 @@
return modelAndView;
}
+ @ResponseBody
+ @RequestMapping(value = "/getRootMenuCategories.do", method = RequestMethod.GET)
+ public ModelAndView getRootMenuCategories(MenuDTO jsTreeHibernateDTO, ModelMap model, HttpServletRequest request)
+ throws Exception {
+
+ long rootMenuCid = new Long(1);
+ jsTreeHibernateDTO.setC_id(rootMenuCid);
+ MenuDTO menuDTO = menuService.getMenu(jsTreeHibernateDTO);
+
+ ModelAndView modelAndView = new ModelAndView("jsonView");
+ modelAndView.addObject("result", menuDTO);
+ return modelAndView;
+ }
+
+ @ResponseBody
+ @RequestMapping(value = "/getRecentList.do", method = RequestMethod.GET)
+ public ModelAndView getRecentList(MenuDTO jsTreeHibernateDTO, ModelMap model, HttpServletRequest request)
+ throws Exception {
+
+ long rootMenuCid = new Long(2);
+ jsTreeHibernateDTO.setC_id(rootMenuCid);
+ MenuDTO menuDTO = menuService.getMenu(jsTreeHibernateDTO);
+
+ ModelAndView modelAndView = new ModelAndView("jsonView");
+ modelAndView.addObject("result", menuDTO);
+ return modelAndView;
+ }
+
+ @ResponseBody
+ @RequestMapping(value = "/getClassifiedMenu.do", method = RequestMethod.GET)
+ public ModelAndView getClassifiedMenu(MenuDTO jsTreeHibernateDTO, ModelMap model, HttpServletRequest request)
+ throws Exception {
+
+ long rootMenuCid = new Long(3);
+ jsTreeHibernateDTO.setC_id(rootMenuCid);
+ MenuDTO menuDTO = menuService.getMenu(jsTreeHibernateDTO);
+
+ ModelAndView modelAndView = new ModelAndView("jsonView");
+ modelAndView.addObject("result", menuDTO);
+ return modelAndView;
+ }
+
+
+
/**
* 노드를 검색한다.
*
@@ -170,8 +215,9 @@
@RequestMapping(value = "/alterMenu.do", method = RequestMethod.POST)
public ModelAndView alterNode(@Validated(value = AlterNode.class) MenuDTO jsTreeHibernateDTO,
BindingResult bindingResult, ModelMap model) throws Exception {
- if (bindingResult.hasErrors())
+ if (bindingResult.hasErrors()){
throw new RuntimeException();
+ }
jsTreeHibernateDTO.setC_title(Util_TitleChecker.StringReplace(jsTreeHibernateDTO.getC_title()));
Index: standard/project/web/src/main/java/egovframework/com/ext/jstree/support/security/controller/RegistrationController.java
===================================================================
diff -u -r233eb735e13c3e0f61bc26f8e18744ab290fad95 -rea3855e268c8ddec2ae620e3ae931f2940ff63dc
--- standard/project/web/src/main/java/egovframework/com/ext/jstree/support/security/controller/RegistrationController.java (.../RegistrationController.java) (revision 233eb735e13c3e0f61bc26f8e18744ab290fad95)
+++ standard/project/web/src/main/java/egovframework/com/ext/jstree/support/security/controller/RegistrationController.java (.../RegistrationController.java) (revision ea3855e268c8ddec2ae620e3ae931f2940ff63dc)
@@ -25,17 +25,20 @@
@Autowired
private UserService userService;
- @RequestMapping(value = "/signup", method = RequestMethod.GET)
+ @RequestMapping(value = "/signup", method = { RequestMethod.GET, RequestMethod.POST })
public ModelAndView signup(HttpServletRequest request, HttpServletResponse response) throws ServletException,IOException {
ModelAndView model = new ModelAndView();
model.addObject("title", "User Registration Form");
model.setViewName("egovframework/com/ext/jstree/support/security/registration");
return model;
}
- @RequestMapping(value = {"/user/register"}, method = RequestMethod.POST, consumes = "application/json", produces = "application/json")
+ @RequestMapping(value = {"/user/register"}, method = { RequestMethod.GET, RequestMethod.POST }, consumes = "application/json", produces = "application/json")
public @ResponseBody String registerUser(@RequestBody UserRegistrationForm registrationForm) throws UserAlreadyExistAuthenticationException {
+ String mailStr = registrationForm.getEmail();
+ System.out.print(mailStr);
+
if (registrationForm.getUserId() == null) {
registrationForm.setUserId(registrationForm.getUserId());
}
Index: standard/project/web/src/main/webapp/WEB-INF/jsp/egovframework/com/ext/jstree/support/security/registration.jsp
===================================================================
diff -u -r233eb735e13c3e0f61bc26f8e18744ab290fad95 -rea3855e268c8ddec2ae620e3ae931f2940ff63dc
--- standard/project/web/src/main/webapp/WEB-INF/jsp/egovframework/com/ext/jstree/support/security/registration.jsp (.../registration.jsp) (revision 233eb735e13c3e0f61bc26f8e18744ab290fad95)
+++ standard/project/web/src/main/webapp/WEB-INF/jsp/egovframework/com/ext/jstree/support/security/registration.jsp (.../registration.jsp) (revision ea3855e268c8ddec2ae620e3ae931f2940ff63dc)
@@ -1,8 +1,14 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" trimDirectiveWhitespaces="true" autoFlush="true"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="sql" uri="http://java.sun.com/jsp/jstl/sql"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@ taglib prefix="x" uri="http://java.sun.com/jsp/jstl/xml"%>
+
-
+
${title}
@@ -45,6 +51,7 @@
|
+
|
@@ -53,6 +60,12 @@