diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/LoginController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/LoginController.java index a29410ae6..1eedf5e35 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/LoginController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/LoginController.java @@ -1,6 +1,5 @@ package com.accompany.admin.controller.system; - import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.stp.StpUtil; import com.accompany.admin.common.AdminConstants; @@ -43,19 +42,6 @@ public class LoginController extends BaseController { @Autowired private JedisService jedisService; - /** - * 登录页面 - * - * @return - */ - @RequestMapping({"/login", "/index"}) - public String toLogin(Model model) { - Boolean loginSmsCodeSwitch = adminUserService.getLoginSmsCodeSwitch(); - logger.info("loginSmsCodeSwitch:{}", loginSmsCodeSwitch); - model.addAttribute("smsSwitch", loginSmsCodeSwitch); - return "login"; - } - /** * 后台登录验证 * @@ -63,7 +49,7 @@ public class LoginController extends BaseController { * @param password MD5加密后的密码 * @param authCode MD5加密后的验证码 */ - @PostMapping("/login/login") + @PostMapping({"/login", "/login/login"}) @ResponseBody public void login(String account, String password, String authCode, HttpServletRequest request) { String ipAddress = IPUtils.getRealIpAddress(request); @@ -107,7 +93,8 @@ public class LoginController extends BaseController { * @return */ @RequestMapping("/login/logout") - public String logout(Model model) { + @ResponseBody + public void logout(Model model) { Boolean loginSmsCodeSwitch = adminUserService.getLoginSmsCodeSwitch(); logger.info("loginSmsCodeSwitch:{}", loginSmsCodeSwitch); model.addAttribute("smsSwitch", loginSmsCodeSwitch); @@ -118,8 +105,7 @@ public class LoginController extends BaseController { } catch (NotLoginException ignore) { } - - return "login"; + writeJson(true, null); } //////////////////////////////////////////////////////////////////////////////////