diff --git a/src/main/java/cokr/xit/fims/MainController.java b/src/main/java/cokr/xit/fims/MainController.java index 8024cd79..fefbf5a7 100644 --- a/src/main/java/cokr/xit/fims/MainController.java +++ b/src/main/java/cokr/xit/fims/MainController.java @@ -34,7 +34,7 @@ public class MainController extends AbstractController { return "login"; } - @GetMapping(name="회원가입 페이지", value="/error/signupPage.do") + @GetMapping(name="회원가입 페이지", value="/signupPage.do") public ModelAndView signupPage(String institute) { ModelAndView mav = new ModelAndView("fims/user/user-info"); @@ -51,7 +51,7 @@ public class MainController extends AbstractController { return mav; } - @RequestMapping(name="회원가입", value="/error/signup.do") + @RequestMapping(name="회원가입", value="/signup.do") public ModelAndView signup(ManagedUser user) { ModelAndView mav = new ModelAndView("jsonView"); @@ -61,14 +61,14 @@ public class MainController extends AbstractController { return mav; } - @RequestMapping(name="중복 확인", value="/error/duplicate.do") + @RequestMapping(name="중복 확인", value="/duplicate.do") public ModelAndView isDuplicate(String account, String institute) { ManagedUser user = userService.getUser(account, institute); return new ModelAndView("jsonView") .addObject("duplicate", user != null); } - @RequestMapping(name="기관 목록", value="/error/instList.do") + @RequestMapping(name="기관 목록", value="/instList.do") public ModelAndView instList(String account, String institute) { List instList = factionMapper.selectAllInstList(); return new ModelAndView("jsonView") diff --git a/src/main/webapp/WEB-INF/jsp/fims/user/user-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/user/user-info.jsp index 54f19103..a20f8aca 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/user/user-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/user/user-info.jsp @@ -310,7 +310,7 @@ function save(info){ var create = isEmpty(info.id) ajax.post({ - url:!create ? userControl.urls.update : wctx.url("/error/signup.do"), + url:!create ? userControl.urls.update : wctx.url("/signup.do"), data:info, success: (resp) => { if(resp.saved){ @@ -342,7 +342,7 @@ $("#btnDuplicate").on("click", function(){ } ajax.get({ - url : wctx.url("/error/duplicate.do"), + url : wctx.url("/duplicate.do"), data : { account : $("#user-form").find("[name='account']").val(), institute : $("#user-form").find("[name='institute']").val() diff --git a/src/main/webapp/WEB-INF/jsp/login.jsp b/src/main/webapp/WEB-INF/jsp/login.jsp index 93e77023..67de7a48 100644 --- a/src/main/webapp/WEB-INF/jsp/login.jsp +++ b/src/main/webapp/WEB-INF/jsp/login.jsp @@ -151,7 +151,7 @@ function fnOpenSignup(){ } dialog.close("selectInstDialog"); - window.open(wctx.url("/error/signupPage.do")+"?institute="+$("#selectInst").val(), + window.open(wctx.url("/signupPage.do")+"?institute="+$("#selectInst").val(), "regAccount", "width=950, height=500"); }, @@ -181,7 +181,7 @@ $(function(){ $("#password").focus(); ajax.get({ - url : wctx.url("/error/instList.do"), + url : wctx.url("/instList.do"), data : { }, success : (resp) => { INST_LIST = resp.instList;