diff --git a/.classpath b/.classpath
index 3553992a4..8447f7ef3 100644
--- a/.classpath
+++ b/.classpath
@@ -17,7 +17,7 @@
-
+
diff --git a/src/main/java/com/ruoyi/framework/core/controller/BaseController.java b/src/main/java/com/ruoyi/framework/core/controller/BaseController.java
index cbd22b7fb..b6634f58d 100644
--- a/src/main/java/com/ruoyi/framework/core/controller/BaseController.java
+++ b/src/main/java/com/ruoyi/framework/core/controller/BaseController.java
@@ -3,6 +3,11 @@ package com.ruoyi.framework.core.controller;
import com.ruoyi.common.utils.security.ShiroUtils;
import com.ruoyi.project.system.user.domain.User;
+/**
+ * web层通用数据处理
+ *
+ * @author yangzz
+ */
public class BaseController
{
public User getUser()
diff --git a/src/main/java/com/ruoyi/framework/core/domain/R.java b/src/main/java/com/ruoyi/framework/core/domain/R.java
index acda8f0ef..99a63e8ef 100644
--- a/src/main/java/com/ruoyi/framework/core/domain/R.java
+++ b/src/main/java/com/ruoyi/framework/core/domain/R.java
@@ -3,6 +3,11 @@ package com.ruoyi.framework.core.domain;
import java.util.HashMap;
import java.util.Map;
+/**
+ * 返回数据通用处理
+ *
+ * @author yangzz
+ */
public class R extends HashMap
{
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/ruoyi/project/shiro/ShiroConstants.java b/src/main/java/com/ruoyi/project/shiro/ShiroConstants.java
index 67b5250c7..bd68c8c52 100644
--- a/src/main/java/com/ruoyi/project/shiro/ShiroConstants.java
+++ b/src/main/java/com/ruoyi/project/shiro/ShiroConstants.java
@@ -3,7 +3,7 @@ package com.ruoyi.project.shiro;
/**
* Shiro通用常量
*
- * @author y
+ * @author yangzz
*/
public interface ShiroConstants
{
diff --git a/src/main/java/com/ruoyi/project/shiro/common/UserConstants.java b/src/main/java/com/ruoyi/project/shiro/common/UserConstants.java
index 4d5db4ee2..c566eab54 100644
--- a/src/main/java/com/ruoyi/project/shiro/common/UserConstants.java
+++ b/src/main/java/com/ruoyi/project/shiro/common/UserConstants.java
@@ -3,7 +3,7 @@ package com.ruoyi.project.shiro.common;
/**
* 用户常量信息
*
- * @author y
+ * @author yangzz
*/
public class UserConstants
{
diff --git a/src/main/java/com/ruoyi/project/shiro/common/utils/IpUtils.java b/src/main/java/com/ruoyi/project/shiro/common/utils/IpUtils.java
index 212809e22..8f0a2785e 100644
--- a/src/main/java/com/ruoyi/project/shiro/common/utils/IpUtils.java
+++ b/src/main/java/com/ruoyi/project/shiro/common/utils/IpUtils.java
@@ -5,7 +5,7 @@ import javax.servlet.http.HttpServletRequest;
/**
* 获取IP方法
*
- * @author y
+ * @author yangzz
*/
public class IpUtils
{
diff --git a/src/main/java/com/ruoyi/project/shiro/common/utils/LogUtils.java b/src/main/java/com/ruoyi/project/shiro/common/utils/LogUtils.java
index 2ebe50a5d..66ca55e58 100644
--- a/src/main/java/com/ruoyi/project/shiro/common/utils/LogUtils.java
+++ b/src/main/java/com/ruoyi/project/shiro/common/utils/LogUtils.java
@@ -12,7 +12,7 @@ import java.util.Map;
/**
* 处理并记录日志文件
*
- * @author y
+ * @author yangzz
*/
public class LogUtils
{
diff --git a/src/main/java/com/ruoyi/project/shiro/common/utils/Md5Utils.java b/src/main/java/com/ruoyi/project/shiro/common/utils/Md5Utils.java
index f3a26f9e5..e72589fcb 100644
--- a/src/main/java/com/ruoyi/project/shiro/common/utils/Md5Utils.java
+++ b/src/main/java/com/ruoyi/project/shiro/common/utils/Md5Utils.java
@@ -7,7 +7,7 @@ import java.security.MessageDigest;
/**
* Md5加密方法
*
- * @author y
+ * @author yangzz
*/
public class Md5Utils
{
diff --git a/src/main/java/com/ruoyi/project/shiro/common/utils/SessionUtils.java b/src/main/java/com/ruoyi/project/shiro/common/utils/SessionUtils.java
index e2314af90..264fadd69 100644
--- a/src/main/java/com/ruoyi/project/shiro/common/utils/SessionUtils.java
+++ b/src/main/java/com/ruoyi/project/shiro/common/utils/SessionUtils.java
@@ -14,7 +14,7 @@ import com.ruoyi.project.system.user.domain.User;
/**
* 通用Session处理方法
*
- * @author y
+ * @author yangzz
*/
public class SessionUtils
{
diff --git a/src/main/java/com/ruoyi/project/shiro/exception/RoleBlockedException.java b/src/main/java/com/ruoyi/project/shiro/exception/RoleBlockedException.java
index 951c3f019..a7d2ab56c 100644
--- a/src/main/java/com/ruoyi/project/shiro/exception/RoleBlockedException.java
+++ b/src/main/java/com/ruoyi/project/shiro/exception/RoleBlockedException.java
@@ -3,7 +3,7 @@ package com.ruoyi.project.shiro.exception;
/**
* 角色锁定异常类
*
- * @author y
+ * @author yangzz
*/
public class RoleBlockedException extends UserException
{
diff --git a/src/main/java/com/ruoyi/project/shiro/exception/UserBlockedException.java b/src/main/java/com/ruoyi/project/shiro/exception/UserBlockedException.java
index ccd35f2f4..0011a8787 100644
--- a/src/main/java/com/ruoyi/project/shiro/exception/UserBlockedException.java
+++ b/src/main/java/com/ruoyi/project/shiro/exception/UserBlockedException.java
@@ -3,7 +3,7 @@ package com.ruoyi.project.shiro.exception;
/**
* 用户锁定异常类
*
- * @author y
+ * @author yangzz
*/
public class UserBlockedException extends UserException
{
diff --git a/src/main/java/com/ruoyi/project/shiro/exception/UserException.java b/src/main/java/com/ruoyi/project/shiro/exception/UserException.java
index 69ff1d835..85e5ca8cc 100644
--- a/src/main/java/com/ruoyi/project/shiro/exception/UserException.java
+++ b/src/main/java/com/ruoyi/project/shiro/exception/UserException.java
@@ -5,7 +5,7 @@ import com.ruoyi.project.shiro.exception.base.BaseException;
/**
* 用户信息异常类
*
- * @author y
+ * @author yangzz
*/
public class UserException extends BaseException
{
diff --git a/src/main/java/com/ruoyi/project/shiro/exception/UserNotExistsException.java b/src/main/java/com/ruoyi/project/shiro/exception/UserNotExistsException.java
index 7d62f7fce..3c8520ed0 100644
--- a/src/main/java/com/ruoyi/project/shiro/exception/UserNotExistsException.java
+++ b/src/main/java/com/ruoyi/project/shiro/exception/UserNotExistsException.java
@@ -3,7 +3,7 @@ package com.ruoyi.project.shiro.exception;
/**
* 用户不存在异常类
*
- * @author y
+ * @author yangzz
*/
public class UserNotExistsException extends UserException
{
diff --git a/src/main/java/com/ruoyi/project/shiro/exception/UserPasswordNotMatchException.java b/src/main/java/com/ruoyi/project/shiro/exception/UserPasswordNotMatchException.java
index cf52ee4a6..159b92cbc 100644
--- a/src/main/java/com/ruoyi/project/shiro/exception/UserPasswordNotMatchException.java
+++ b/src/main/java/com/ruoyi/project/shiro/exception/UserPasswordNotMatchException.java
@@ -3,7 +3,7 @@ package com.ruoyi.project.shiro.exception;
/**
* 用户密码不正确或不符合规范异常类
*
- * @author y
+ * @author yangzz
*/
public class UserPasswordNotMatchException extends UserException
{
diff --git a/src/main/java/com/ruoyi/project/shiro/exception/UserPasswordRetryLimitExceedException.java b/src/main/java/com/ruoyi/project/shiro/exception/UserPasswordRetryLimitExceedException.java
index e9d9170ac..06922f9c3 100644
--- a/src/main/java/com/ruoyi/project/shiro/exception/UserPasswordRetryLimitExceedException.java
+++ b/src/main/java/com/ruoyi/project/shiro/exception/UserPasswordRetryLimitExceedException.java
@@ -3,7 +3,7 @@ package com.ruoyi.project.shiro.exception;
/**
* 用户错误次数异常类
*
- * @author y
+ * @author yangzz
*/
public class UserPasswordRetryLimitExceedException extends UserException
{
diff --git a/src/main/java/com/ruoyi/project/shiro/exception/base/BaseException.java b/src/main/java/com/ruoyi/project/shiro/exception/base/BaseException.java
index 0a756a3fb..858e63837 100644
--- a/src/main/java/com/ruoyi/project/shiro/exception/base/BaseException.java
+++ b/src/main/java/com/ruoyi/project/shiro/exception/base/BaseException.java
@@ -7,7 +7,7 @@ import com.ruoyi.project.shiro.common.utils.MessageUtils;
/**
* 基础异常
*
- * @author y
+ * @author yangzz
*/
public class BaseException extends RuntimeException
{
diff --git a/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java b/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java
index 9302826e6..53c11b18a 100644
--- a/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java
+++ b/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java
@@ -4,9 +4,14 @@ import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.subject.Subject;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.ResponseBody;
+
import com.ruoyi.common.tools.StringTools;
+import com.ruoyi.common.utils.security.ShiroUtils;
import com.ruoyi.framework.core.controller.BaseController;
import com.ruoyi.framework.core.domain.R;
@@ -15,10 +20,19 @@ import com.ruoyi.framework.core.domain.R;
*
* @author yangzz
*/
-@RestController
+// @RestController
+@Controller
public class LoginController extends BaseController
{
- @RequestMapping("/login")
+
+ @GetMapping("/login")
+ String login()
+ {
+ return "login";
+ }
+
+ @PostMapping("/login")
+ @ResponseBody
R ajaxLogin(String username, String password)
{
UsernamePasswordToken token = new UsernamePasswordToken(username, password);
@@ -38,4 +52,11 @@ public class LoginController extends BaseController
return R.error(msg);
}
}
+
+ @GetMapping("/logout")
+ String logout()
+ {
+ ShiroUtils.logout();
+ return "redirect:/login";
+ }
}
diff --git a/src/main/java/com/ruoyi/project/system/user/controller/UserController.java b/src/main/java/com/ruoyi/project/system/user/controller/UserController.java
index 5aad662cd..03143ea1e 100644
--- a/src/main/java/com/ruoyi/project/system/user/controller/UserController.java
+++ b/src/main/java/com/ruoyi/project/system/user/controller/UserController.java
@@ -10,10 +10,16 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.utils.TableDataInfo;
+import com.ruoyi.common.utils.security.ShiroUtils;
import com.ruoyi.framework.core.controller.BaseController;
import com.ruoyi.project.system.user.domain.User;
import com.ruoyi.project.system.user.service.IUserService;
+/**
+ * 用户信息
+ *
+ * @author yangzz
+ */
@Controller
@RequestMapping("/system/user")
public class UserController extends BaseController
@@ -39,10 +45,5 @@ public class UserController extends BaseController
return prefix + "/test";
}
- @RequestMapping(value = "/login", method = RequestMethod.GET)
- public String login()
- {
- return "login";
- }
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/project/system/user/dao/IUserDao.java b/src/main/java/com/ruoyi/project/system/user/dao/IUserDao.java
index 4691e8109..aa96d9681 100644
--- a/src/main/java/com/ruoyi/project/system/user/dao/IUserDao.java
+++ b/src/main/java/com/ruoyi/project/system/user/dao/IUserDao.java
@@ -7,7 +7,7 @@ import com.ruoyi.project.system.user.domain.User;
/**
* 用户表 数据层
*
- * @author yangzongzhuan
+ * @author yangzz
*/
public interface IUserDao
{
diff --git a/src/main/java/com/ruoyi/project/system/user/dao/UserDao.java b/src/main/java/com/ruoyi/project/system/user/dao/UserDao.java
index 303c4409d..29de2adf2 100644
--- a/src/main/java/com/ruoyi/project/system/user/dao/UserDao.java
+++ b/src/main/java/com/ruoyi/project/system/user/dao/UserDao.java
@@ -11,7 +11,7 @@ import com.ruoyi.project.system.user.domain.User;
/**
* 用户 数据层处理
*
- * @author y
+ * @author yangzz
*/
@Repository("userDao")
public class UserDao extends DynamicObjectBaseDao implements IUserDao
diff --git a/src/main/java/com/ruoyi/project/system/user/service/IUserService.java b/src/main/java/com/ruoyi/project/system/user/service/IUserService.java
index 001787947..af82827ab 100644
--- a/src/main/java/com/ruoyi/project/system/user/service/IUserService.java
+++ b/src/main/java/com/ruoyi/project/system/user/service/IUserService.java
@@ -7,7 +7,7 @@ import com.ruoyi.project.system.user.domain.User;
/**
* 用户 业务层
*
- * @author y
+ * @author yangzz
*/
public interface IUserService
{
diff --git a/src/main/java/com/ruoyi/project/system/user/service/UserService.java b/src/main/java/com/ruoyi/project/system/user/service/UserService.java
index 98fa6d444..e478cef49 100644
--- a/src/main/java/com/ruoyi/project/system/user/service/UserService.java
+++ b/src/main/java/com/ruoyi/project/system/user/service/UserService.java
@@ -10,7 +10,7 @@ import com.ruoyi.project.system.user.domain.User;
/**
* 用户 业务层处理
*
- * @author y
+ * @author yangzz
*/
@Service("userService")
public class UserService implements IUserService
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index cdf51002f..13df614f6 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -85,7 +85,7 @@
diff --git a/src/main/resources/templates/main.html b/src/main/resources/templates/main.html
index 81252726f..8b9266a67 100644
--- a/src/main/resources/templates/main.html
+++ b/src/main/resources/templates/main.html
@@ -15,11 +15,10 @@