Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT

wubb 8 years ago
parent
commit
a952375b3b

+ 9 - 9
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -31,31 +31,31 @@ public class WebpageController extends BaseController {
 
 	@RequestMapping(value = "/user/account/index", method = RequestMethod.GET)
 	public ModelAndView index(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/portal/search/subscriberOrg");
+		modelview.setViewName("/user/account/index");
 		return modelview;
 	}
 
 	@RequestMapping(value = "/user/account/evaluateInfo", method = RequestMethod.GET)
 	public ModelAndView evaluateInfo(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/portal/search/subscriberOrg");
+		modelview.setViewName("/user/account/evaluateInfo");
 		return modelview;
 	}
 
 	@RequestMapping(value = "/user/account/set", method = RequestMethod.GET)
 	public ModelAndView userSet(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/portal/search/subscriberOrg");
+		modelview.setViewName("/user/account/set");
 		return modelview;
 	}
 
 	@RequestMapping(value = "/user/account/achievement", method = RequestMethod.GET)
 	public ModelAndView userAchievement(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/portal/search/subscriberOrg");
+		modelview.setViewName("/user/account/achievement");
 		return modelview;
 	}
 
 	@RequestMapping(value = "/user/account/demand", method = RequestMethod.GET)
 	public ModelAndView userDemand(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/portal/search/subscriberOrg");
+		modelview.setViewName("/user/account/demand");
 		return modelview;
 	}
 
@@ -77,19 +77,19 @@ public class WebpageController extends BaseController {
 
 	@RequestMapping(value = "/user/certify", method = RequestMethod.GET)
 	public ModelAndView userCertify(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/portal/search/subscriberOrg");
+		modelview.setViewName("/user/certify");
 		return modelview;
 	}
 
 	@RequestMapping(value = "/user/groupCertify", method = RequestMethod.GET)
 	public ModelAndView userGroupCertify(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/portal/search/subscriberOrg");
+		modelview.setViewName("/user/groupCertify");
 		return modelview;
 	}
 
 	@RequestMapping(value = "/user/index", method = RequestMethod.GET)
 	public ModelAndView userIndex(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/portal/search/subscriberOrg");
+		modelview.setViewName("/user/index");
 		return modelview;
 	}
 
@@ -100,7 +100,7 @@ public class WebpageController extends BaseController {
 
 	@RequestMapping(value = "/user/account/services", method = RequestMethod.GET)
 	public ModelAndView userServices(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/portal/search/subscriberOrg");
+		modelview.setViewName("/user/account/services");
 		return modelview;
 	}