From a0bed51d966ab5d161d3fdd5423ba84f59fb60ff Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 13 一月 2022 09:58:16 +0800
Subject: [PATCH] update 格式化代码 统一间隔符
---
ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java | 105 ++++++++++++++++++++++++++--------------------------
1 files changed, 53 insertions(+), 52 deletions(-)
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java
index eb63f0b..8d5495c 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java
@@ -24,73 +24,74 @@
/**
* index controller
+ *
* @author xuxueli 2015-12-19 16:13:16
*/
@Controller
public class IndexController {
- @Resource
- private XxlJobService xxlJobService;
- @Resource
- private LoginService loginService;
+ @Resource
+ private XxlJobService xxlJobService;
+ @Resource
+ private LoginService loginService;
- @RequestMapping("/")
- public String index(Model model) {
+ @RequestMapping("/")
+ public String index(Model model) {
- Map<String, Object> dashboardMap = xxlJobService.dashboardInfo();
- model.addAllAttributes(dashboardMap);
+ Map<String, Object> dashboardMap = xxlJobService.dashboardInfo();
+ model.addAllAttributes(dashboardMap);
- return "index";
- }
+ return "index";
+ }
@RequestMapping("/chartInfo")
- @ResponseBody
- public ReturnT<Map<String, Object>> chartInfo(Date startDate, Date endDate) {
+ @ResponseBody
+ public ReturnT<Map<String, Object>> chartInfo(Date startDate, Date endDate) {
ReturnT<Map<String, Object>> chartInfo = xxlJobService.chartInfo(startDate, endDate);
return chartInfo;
}
-
- @RequestMapping("/toLogin")
- @PermissionLimit(limit=false)
- public ModelAndView toLogin(HttpServletRequest request, HttpServletResponse response,ModelAndView modelAndView) {
- if (loginService.ifLogin(request, response) != null) {
- modelAndView.setView(new RedirectView("/",true,false));
- return modelAndView;
- }
- return new ModelAndView("login");
- }
-
- @RequestMapping(value="login", method=RequestMethod.POST)
- @ResponseBody
- @PermissionLimit(limit=false)
- public ReturnT<String> loginDo(HttpServletRequest request, HttpServletResponse response, String userName, String password, String ifRemember){
- boolean ifRem = (ifRemember!=null && ifRemember.trim().length()>0 && "on".equals(ifRemember))?true:false;
- return loginService.login(request, response, userName, password, ifRem);
- }
-
- @RequestMapping(value="logout", method=RequestMethod.POST)
- @ResponseBody
- @PermissionLimit(limit=false)
- public ReturnT<String> logout(HttpServletRequest request, HttpServletResponse response){
- return loginService.logout(request, response);
- }
-
- @RequestMapping("/help")
- public String help() {
- /*if (!PermissionInterceptor.ifLogin(request)) {
- return "redirect:/toLogin";
- }*/
+ @RequestMapping("/toLogin")
+ @PermissionLimit(limit = false)
+ public ModelAndView toLogin(HttpServletRequest request, HttpServletResponse response, ModelAndView modelAndView) {
+ if (loginService.ifLogin(request, response) != null) {
+ modelAndView.setView(new RedirectView("/" , true, false));
+ return modelAndView;
+ }
+ return new ModelAndView("login");
+ }
- return "help";
- }
+ @RequestMapping(value = "login" , method = RequestMethod.POST)
+ @ResponseBody
+ @PermissionLimit(limit = false)
+ public ReturnT<String> loginDo(HttpServletRequest request, HttpServletResponse response, String userName, String password, String ifRemember) {
+ boolean ifRem = (ifRemember != null && ifRemember.trim().length() > 0 && "on".equals(ifRemember)) ? true : false;
+ return loginService.login(request, response, userName, password, ifRem);
+ }
- @InitBinder
- public void initBinder(WebDataBinder binder) {
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- dateFormat.setLenient(false);
- binder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, true));
- }
-
+ @RequestMapping(value = "logout" , method = RequestMethod.POST)
+ @ResponseBody
+ @PermissionLimit(limit = false)
+ public ReturnT<String> logout(HttpServletRequest request, HttpServletResponse response) {
+ return loginService.logout(request, response);
+ }
+
+ @RequestMapping("/help")
+ public String help() {
+
+ /*if (!PermissionInterceptor.ifLogin(request)) {
+ return "redirect:/toLogin";
+ }*/
+
+ return "help";
+ }
+
+ @InitBinder
+ public void initBinder(WebDataBinder binder) {
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ dateFormat.setLenient(false);
+ binder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, true));
+ }
+
}
--
Gitblit v1.9.3