diff --git a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/IndexController.java b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/IndexController.java index 75440380..61891e37 100644 --- a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/IndexController.java +++ b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/IndexController.java @@ -8,10 +8,7 @@ import org.springframework.beans.propertyeditors.CustomDateEditor; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.WebDataBinder; -import org.springframework.web.bind.annotation.InitBinder; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -45,10 +42,9 @@ public class IndexController { @RequestMapping("/chartInfo") @ResponseBody public ReturnT> chartInfo(Date startDate, Date endDate) { - ReturnT> chartInfo = xxlJobService.chartInfo(startDate, endDate); - return chartInfo; + return xxlJobService.chartInfo(startDate, endDate); } - + @RequestMapping("/toLogin") @PermissionLimit(limit=false) public String toLogin(HttpServletRequest request, HttpServletResponse response) { @@ -57,22 +53,24 @@ public class IndexController { } return "login"; } - - @RequestMapping(value="login", method=RequestMethod.POST) + +// @RequestMapping(value="login", method=RequestMethod.POST) + @PostMapping("login") @ResponseBody @PermissionLimit(limit=false) public ReturnT loginDo(HttpServletRequest request, HttpServletResponse response, String userName, String password, String ifRemember){ - boolean ifRem = (ifRemember!=null && ifRemember.trim().length()>0 && "on".equals(ifRemember))?true:false; + boolean ifRem = ifRemember!=null && ifRemember.trim().length()>0 && "on".equals(ifRemember); return loginService.login(request, response, userName, password, ifRem); } - - @RequestMapping(value="logout", method=RequestMethod.POST) + +// @RequestMapping(value="logout", method=RequestMethod.POST) + @PostMapping("logout") @ResponseBody @PermissionLimit(limit=false) public ReturnT logout(HttpServletRequest request, HttpServletResponse response){ return loginService.logout(request, response); } - + @RequestMapping("/help") public String help() { @@ -89,5 +87,5 @@ public class IndexController { dateFormat.setLenient(false); binder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, true)); } - + }