diff --git a/src/main/java/com/ruoyi/framework/constant/CommonConstant.java b/src/main/java/com/ruoyi/common/constant/CommonConstant.java similarity index 86% rename from src/main/java/com/ruoyi/framework/constant/CommonConstant.java rename to src/main/java/com/ruoyi/common/constant/CommonConstant.java index 7f938c2eb..84e95d92e 100644 --- a/src/main/java/com/ruoyi/framework/constant/CommonConstant.java +++ b/src/main/java/com/ruoyi/common/constant/CommonConstant.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.constant; +package com.ruoyi.common.constant; /** * 通用常量信息 diff --git a/src/main/java/com/ruoyi/project/shiro/ShiroConstants.java b/src/main/java/com/ruoyi/common/constant/ShiroConstants.java similarity index 90% rename from src/main/java/com/ruoyi/project/shiro/ShiroConstants.java rename to src/main/java/com/ruoyi/common/constant/ShiroConstants.java index c4465789e..421cb5a35 100644 --- a/src/main/java/com/ruoyi/project/shiro/ShiroConstants.java +++ b/src/main/java/com/ruoyi/common/constant/ShiroConstants.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.shiro; +package com.ruoyi.common.constant; /** * Shiro通用常量 diff --git a/src/main/java/com/ruoyi/project/shiro/common/Constants.java b/src/main/java/com/ruoyi/common/constant/UserConstants.java similarity index 89% rename from src/main/java/com/ruoyi/project/shiro/common/Constants.java rename to src/main/java/com/ruoyi/common/constant/UserConstants.java index 306a1ed68..8daf65b79 100644 --- a/src/main/java/com/ruoyi/project/shiro/common/Constants.java +++ b/src/main/java/com/ruoyi/common/constant/UserConstants.java @@ -1,11 +1,11 @@ -package com.ruoyi.project.shiro.common; +package com.ruoyi.common.constant; /** * 用户常量信息 * * @author yangzz */ -public class Constants +public class UserConstants { /** 用户正常状态 */ public static final String USER_NORMAL = "0"; diff --git a/src/main/java/com/ruoyi/project/shiro/exception/JCaptchaException.java b/src/main/java/com/ruoyi/common/exception/JCaptchaException.java similarity index 67% rename from src/main/java/com/ruoyi/project/shiro/exception/JCaptchaException.java rename to src/main/java/com/ruoyi/common/exception/JCaptchaException.java index e82fd7b5b..57300eecf 100644 --- a/src/main/java/com/ruoyi/project/shiro/exception/JCaptchaException.java +++ b/src/main/java/com/ruoyi/common/exception/JCaptchaException.java @@ -1,6 +1,6 @@ -package com.ruoyi.project.shiro.exception; +package com.ruoyi.common.exception; -import com.ruoyi.project.shiro.exception.user.UserException; +import com.ruoyi.common.exception.user.UserException; /** * 验证码错误异常类 diff --git a/src/main/java/com/ruoyi/project/shiro/exception/base/BaseException.java b/src/main/java/com/ruoyi/common/exception/base/BaseException.java similarity index 90% rename from src/main/java/com/ruoyi/project/shiro/exception/base/BaseException.java rename to src/main/java/com/ruoyi/common/exception/base/BaseException.java index 39607b473..a5312aefa 100644 --- a/src/main/java/com/ruoyi/project/shiro/exception/base/BaseException.java +++ b/src/main/java/com/ruoyi/common/exception/base/BaseException.java @@ -1,8 +1,8 @@ -package com.ruoyi.project.shiro.exception.base; +package com.ruoyi.common.exception.base; import org.springframework.util.StringUtils; -import com.ruoyi.project.shiro.common.utils.MessageUtils; +import com.ruoyi.common.utils.MessageUtils; /** * 基础异常 diff --git a/src/main/java/com/ruoyi/project/shiro/exception/base/DaoException.java b/src/main/java/com/ruoyi/common/exception/base/DaoException.java similarity index 87% rename from src/main/java/com/ruoyi/project/shiro/exception/base/DaoException.java rename to src/main/java/com/ruoyi/common/exception/base/DaoException.java index 13e8ac34e..1a0f60fc5 100644 --- a/src/main/java/com/ruoyi/project/shiro/exception/base/DaoException.java +++ b/src/main/java/com/ruoyi/common/exception/base/DaoException.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.shiro.exception.base; +package com.ruoyi.common.exception.base; /** * Dao异常 diff --git a/src/main/java/com/ruoyi/project/shiro/exception/user/RoleBlockedException.java b/src/main/java/com/ruoyi/common/exception/user/RoleBlockedException.java similarity index 81% rename from src/main/java/com/ruoyi/project/shiro/exception/user/RoleBlockedException.java rename to src/main/java/com/ruoyi/common/exception/user/RoleBlockedException.java index 442685749..49855623a 100644 --- a/src/main/java/com/ruoyi/project/shiro/exception/user/RoleBlockedException.java +++ b/src/main/java/com/ruoyi/common/exception/user/RoleBlockedException.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.shiro.exception.user; +package com.ruoyi.common.exception.user; /** * 角色锁定异常类 diff --git a/src/main/java/com/ruoyi/project/shiro/exception/user/UserBlockedException.java b/src/main/java/com/ruoyi/common/exception/user/UserBlockedException.java similarity index 81% rename from src/main/java/com/ruoyi/project/shiro/exception/user/UserBlockedException.java rename to src/main/java/com/ruoyi/common/exception/user/UserBlockedException.java index 4f1751dd4..bea31b187 100644 --- a/src/main/java/com/ruoyi/project/shiro/exception/user/UserBlockedException.java +++ b/src/main/java/com/ruoyi/common/exception/user/UserBlockedException.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.shiro.exception.user; +package com.ruoyi.common.exception.user; /** * 用户锁定异常类 diff --git a/src/main/java/com/ruoyi/project/shiro/exception/user/UserException.java b/src/main/java/com/ruoyi/common/exception/user/UserException.java similarity index 67% rename from src/main/java/com/ruoyi/project/shiro/exception/user/UserException.java rename to src/main/java/com/ruoyi/common/exception/user/UserException.java index 91450000f..78f07c03d 100644 --- a/src/main/java/com/ruoyi/project/shiro/exception/user/UserException.java +++ b/src/main/java/com/ruoyi/common/exception/user/UserException.java @@ -1,6 +1,6 @@ -package com.ruoyi.project.shiro.exception.user; +package com.ruoyi.common.exception.user; -import com.ruoyi.project.shiro.exception.base.BaseException; +import com.ruoyi.common.exception.base.BaseException; /** * 用户信息异常类 diff --git a/src/main/java/com/ruoyi/project/shiro/exception/user/UserNotExistsException.java b/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java similarity index 80% rename from src/main/java/com/ruoyi/project/shiro/exception/user/UserNotExistsException.java rename to src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java index 4c4d1747c..33cad57a2 100644 --- a/src/main/java/com/ruoyi/project/shiro/exception/user/UserNotExistsException.java +++ b/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.shiro.exception.user; +package com.ruoyi.common.exception.user; /** * 用户不存在异常类 diff --git a/src/main/java/com/ruoyi/project/shiro/exception/user/UserPasswordNotMatchException.java b/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java similarity index 82% rename from src/main/java/com/ruoyi/project/shiro/exception/user/UserPasswordNotMatchException.java rename to src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java index fae005dc0..f53221d4d 100644 --- a/src/main/java/com/ruoyi/project/shiro/exception/user/UserPasswordNotMatchException.java +++ b/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.shiro.exception.user; +package com.ruoyi.common.exception.user; /** * 用户密码不正确或不符合规范异常类 diff --git a/src/main/java/com/ruoyi/project/shiro/exception/user/UserPasswordRetryLimitCountException.java b/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitCountException.java similarity index 85% rename from src/main/java/com/ruoyi/project/shiro/exception/user/UserPasswordRetryLimitCountException.java rename to src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitCountException.java index 86efe08dc..362e9e818 100644 --- a/src/main/java/com/ruoyi/project/shiro/exception/user/UserPasswordRetryLimitCountException.java +++ b/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitCountException.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.shiro.exception.user; +package com.ruoyi.common.exception.user; /** * 用户错误记数异常类 diff --git a/src/main/java/com/ruoyi/project/shiro/exception/user/UserPasswordRetryLimitExceedException.java b/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java similarity index 85% rename from src/main/java/com/ruoyi/project/shiro/exception/user/UserPasswordRetryLimitExceedException.java rename to src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java index 21bf4dd33..d1f18021a 100644 --- a/src/main/java/com/ruoyi/project/shiro/exception/user/UserPasswordRetryLimitExceedException.java +++ b/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.shiro.exception.user; +package com.ruoyi.common.exception.user; /** * 用户错误最大次数异常类 diff --git a/src/main/java/com/ruoyi/common/tools/DateTools.java b/src/main/java/com/ruoyi/common/utils/DateUtils.java similarity index 91% rename from src/main/java/com/ruoyi/common/tools/DateTools.java rename to src/main/java/com/ruoyi/common/utils/DateUtils.java index d9f5ee21f..378febaf1 100644 --- a/src/main/java/com/ruoyi/common/tools/DateTools.java +++ b/src/main/java/com/ruoyi/common/utils/DateUtils.java @@ -1,10 +1,10 @@ -package com.ruoyi.common.tools; +package com.ruoyi.common.utils; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; -public class DateTools +public class DateUtils { public static final String DEFAULT_YYYYMMDD = "yyyyMMddHHmmss"; diff --git a/src/main/java/com/ruoyi/project/util/HttpContextUtils.java b/src/main/java/com/ruoyi/common/utils/HttpContextUtils.java similarity index 90% rename from src/main/java/com/ruoyi/project/util/HttpContextUtils.java rename to src/main/java/com/ruoyi/common/utils/HttpContextUtils.java index 2ffa044c0..36884056e 100644 --- a/src/main/java/com/ruoyi/project/util/HttpContextUtils.java +++ b/src/main/java/com/ruoyi/common/utils/HttpContextUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.util; +package com.ruoyi.common.utils; import javax.servlet.http.HttpServletRequest; import org.springframework.web.context.request.RequestContextHolder; diff --git a/src/main/java/com/ruoyi/project/shiro/common/utils/IpUtils.java b/src/main/java/com/ruoyi/common/utils/IpUtils.java similarity index 92% rename from src/main/java/com/ruoyi/project/shiro/common/utils/IpUtils.java rename to src/main/java/com/ruoyi/common/utils/IpUtils.java index 8f0a2785e..3a7c35be3 100644 --- a/src/main/java/com/ruoyi/project/shiro/common/utils/IpUtils.java +++ b/src/main/java/com/ruoyi/common/utils/IpUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.shiro.common.utils; +package com.ruoyi.common.utils; import javax.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/ruoyi/project/shiro/common/utils/LogUtils.java b/src/main/java/com/ruoyi/common/utils/LogUtils.java similarity index 95% rename from src/main/java/com/ruoyi/project/shiro/common/utils/LogUtils.java rename to src/main/java/com/ruoyi/common/utils/LogUtils.java index 66ca55e58..1ab36ba4e 100644 --- a/src/main/java/com/ruoyi/project/shiro/common/utils/LogUtils.java +++ b/src/main/java/com/ruoyi/common/utils/LogUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.shiro.common.utils; +package com.ruoyi.common.utils; import com.alibaba.fastjson.JSON; import org.apache.shiro.SecurityUtils; diff --git a/src/main/java/com/ruoyi/project/shiro/common/utils/Md5Utils.java b/src/main/java/com/ruoyi/common/utils/Md5Utils.java similarity index 92% rename from src/main/java/com/ruoyi/project/shiro/common/utils/Md5Utils.java rename to src/main/java/com/ruoyi/common/utils/Md5Utils.java index 4cbac99e6..96d5873ff 100644 --- a/src/main/java/com/ruoyi/project/shiro/common/utils/Md5Utils.java +++ b/src/main/java/com/ruoyi/common/utils/Md5Utils.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.shiro.common.utils; +package com.ruoyi.common.utils; import lombok.extern.slf4j.Slf4j; import java.security.MessageDigest; diff --git a/src/main/java/com/ruoyi/project/shiro/common/utils/MessageUtils.java b/src/main/java/com/ruoyi/common/utils/MessageUtils.java similarity index 88% rename from src/main/java/com/ruoyi/project/shiro/common/utils/MessageUtils.java rename to src/main/java/com/ruoyi/common/utils/MessageUtils.java index 8c9689672..0d50e23c0 100644 --- a/src/main/java/com/ruoyi/project/shiro/common/utils/MessageUtils.java +++ b/src/main/java/com/ruoyi/common/utils/MessageUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.shiro.common.utils; +package com.ruoyi.common.utils; import org.springframework.context.MessageSource; import com.ruoyi.common.utils.spring.SpringUtils; diff --git a/src/main/java/com/ruoyi/common/tools/StringTools.java b/src/main/java/com/ruoyi/common/utils/StringUtils.java similarity index 94% rename from src/main/java/com/ruoyi/common/tools/StringTools.java rename to src/main/java/com/ruoyi/common/utils/StringUtils.java index 5ab69fabd..53335dab9 100644 --- a/src/main/java/com/ruoyi/common/tools/StringTools.java +++ b/src/main/java/com/ruoyi/common/utils/StringUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.tools; +package com.ruoyi.common.utils; import java.util.Collection; import java.util.Map; @@ -8,7 +8,7 @@ import java.util.Map; * * @author yangzz */ -public class StringTools +public class StringUtils { /** 空字符串 */ private static final String NULLSTR = ""; diff --git a/src/main/java/com/ruoyi/project/util/SystemLogUtils.java b/src/main/java/com/ruoyi/common/utils/SystemLogUtils.java similarity index 91% rename from src/main/java/com/ruoyi/project/util/SystemLogUtils.java rename to src/main/java/com/ruoyi/common/utils/SystemLogUtils.java index d328204e2..0241eaa90 100644 --- a/src/main/java/com/ruoyi/project/util/SystemLogUtils.java +++ b/src/main/java/com/ruoyi/common/utils/SystemLogUtils.java @@ -1,11 +1,11 @@ -package com.ruoyi.project.util; +package com.ruoyi.common.utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + +import com.ruoyi.common.constant.CommonConstant; import com.ruoyi.common.utils.security.ShiroUtils; import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.framework.constant.CommonConstant; -import com.ruoyi.project.shiro.common.utils.LogUtils; import com.ruoyi.project.system.logininfor.domain.Logininfor; import com.ruoyi.project.system.logininfor.service.LogininforServiceImpl; import eu.bitwalker.useragentutils.UserAgent; diff --git a/src/main/java/com/ruoyi/project/util/TreeUtil.java b/src/main/java/com/ruoyi/common/utils/TreeUtils.java similarity index 94% rename from src/main/java/com/ruoyi/project/util/TreeUtil.java rename to src/main/java/com/ruoyi/common/utils/TreeUtils.java index 2483504c5..7f16ac705 100644 --- a/src/main/java/com/ruoyi/project/util/TreeUtil.java +++ b/src/main/java/com/ruoyi/common/utils/TreeUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.util; +package com.ruoyi.common.utils; import java.util.ArrayList; import java.util.Iterator; @@ -11,7 +11,7 @@ import com.ruoyi.project.system.menu.domain.Menu; * * @author y */ -public class TreeUtil +public class TreeUtils { /** @@ -176,7 +176,7 @@ public class TreeUtil permList.add(perm4); permList.add(perm5); - List ns = TreeUtil.getChildPerms(permList, 0); + List ns = TreeUtils.getChildPerms(permList, 0); for (Menu m : ns) { System.out.println(m.getMenuName()); diff --git a/src/main/java/com/ruoyi/framework/config/ShiroConfig.java b/src/main/java/com/ruoyi/framework/config/ShiroConfig.java index 204f3aa68..a9a55e3a0 100644 --- a/src/main/java/com/ruoyi/framework/config/ShiroConfig.java +++ b/src/main/java/com/ruoyi/framework/config/ShiroConfig.java @@ -15,13 +15,14 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.ruoyi.project.shiro.realm.UserRealm; -import com.ruoyi.project.shiro.session.OnlineSessionDAO; -import com.ruoyi.project.shiro.session.OnlineSessionFactory; -import com.ruoyi.project.shiro.web.filter.online.OnlineSessionFilter; -import com.ruoyi.project.shiro.web.filter.sync.SyncOnlineSessionFilter; -import com.ruoyi.project.shiro.web.session.OnlineWebSessionManager; -import com.ruoyi.project.shiro.web.session.SpringSessionValidationScheduler; + +import com.ruoyi.framework.shiro.realm.UserRealm; +import com.ruoyi.framework.shiro.session.OnlineSessionDAO; +import com.ruoyi.framework.shiro.session.OnlineSessionFactory; +import com.ruoyi.framework.shiro.web.filter.online.OnlineSessionFilter; +import com.ruoyi.framework.shiro.web.filter.sync.SyncOnlineSessionFilter; +import com.ruoyi.framework.shiro.web.session.OnlineWebSessionManager; +import com.ruoyi.framework.shiro.web.session.SpringSessionValidationScheduler; import com.ruoyi.project.system.menu.service.IMenuService; import at.pollux.thymeleaf.shiro.dialect.ShiroDialect; diff --git a/src/main/java/com/ruoyi/framework/core/dao/DynamicObjectBaseDao.java b/src/main/java/com/ruoyi/framework/core/dao/DynamicObjectBaseDao.java index 3df130d04..127a2f90b 100644 --- a/src/main/java/com/ruoyi/framework/core/dao/DynamicObjectBaseDao.java +++ b/src/main/java/com/ruoyi/framework/core/dao/DynamicObjectBaseDao.java @@ -6,7 +6,9 @@ import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; import org.mybatis.spring.SqlSessionTemplate; -import com.ruoyi.project.shiro.exception.base.DaoException; + +import com.ruoyi.common.exception.base.DaoException; + import lombok.extern.slf4j.Slf4j; /** diff --git a/src/main/java/com/ruoyi/common/utils/PageUtilEntity.java b/src/main/java/com/ruoyi/framework/page/PageUtilEntity.java similarity index 89% rename from src/main/java/com/ruoyi/common/utils/PageUtilEntity.java rename to src/main/java/com/ruoyi/framework/page/PageUtilEntity.java index 937b8157e..4adf0cb24 100644 --- a/src/main/java/com/ruoyi/common/utils/PageUtilEntity.java +++ b/src/main/java/com/ruoyi/framework/page/PageUtilEntity.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.utils; +package com.ruoyi.framework.page; import java.util.Map; -import com.ruoyi.common.tools.StringTools; +import com.ruoyi.common.utils.StringUtils; /** * 表格请求参数封装 @@ -102,7 +102,7 @@ public class PageUtilEntity public String getOrderCond() { String orderCond = ""; - if (StringTools.isNotNull(orderByColumn) && StringTools.isNotNull(isAsc)) + if (StringUtils.isNotNull(orderByColumn) && StringUtils.isNotNull(isAsc)) { orderCond = "ORDER BY " + this.orderByColumn + " " + this.isAsc; } diff --git a/src/main/java/com/ruoyi/common/utils/TableDataInfo.java b/src/main/java/com/ruoyi/framework/page/TableDataInfo.java similarity index 91% rename from src/main/java/com/ruoyi/common/utils/TableDataInfo.java rename to src/main/java/com/ruoyi/framework/page/TableDataInfo.java index 10e88aa98..1f1d9256c 100644 --- a/src/main/java/com/ruoyi/common/utils/TableDataInfo.java +++ b/src/main/java/com/ruoyi/framework/page/TableDataInfo.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.ruoyi.framework.page; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/ruoyi/project/shiro/realm/UserRealm.java b/src/main/java/com/ruoyi/framework/shiro/realm/UserRealm.java similarity index 85% rename from src/main/java/com/ruoyi/project/shiro/realm/UserRealm.java rename to src/main/java/com/ruoyi/framework/shiro/realm/UserRealm.java index d711f1a0b..0091290bb 100644 --- a/src/main/java/com/ruoyi/project/shiro/realm/UserRealm.java +++ b/src/main/java/com/ruoyi/framework/shiro/realm/UserRealm.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.shiro.realm; +package com.ruoyi.framework.shiro.realm; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationInfo; @@ -15,13 +15,14 @@ import org.apache.shiro.realm.AuthorizingRealm; import org.apache.shiro.subject.PrincipalCollection; import org.springframework.beans.factory.annotation.Autowired; +import com.ruoyi.common.exception.JCaptchaException; +import com.ruoyi.common.exception.user.RoleBlockedException; +import com.ruoyi.common.exception.user.UserBlockedException; +import com.ruoyi.common.exception.user.UserNotExistsException; +import com.ruoyi.common.exception.user.UserPasswordNotMatchException; +import com.ruoyi.common.exception.user.UserPasswordRetryLimitExceedException; import com.ruoyi.common.utils.security.ShiroUtils; -import com.ruoyi.project.shiro.exception.JCaptchaException; -import com.ruoyi.project.shiro.exception.user.RoleBlockedException; -import com.ruoyi.project.shiro.exception.user.UserBlockedException; -import com.ruoyi.project.shiro.exception.user.UserNotExistsException; -import com.ruoyi.project.shiro.exception.user.UserPasswordNotMatchException; -import com.ruoyi.project.shiro.exception.user.UserPasswordRetryLimitExceedException; +import com.ruoyi.framework.shiro.service.LoginService; import com.ruoyi.project.system.menu.service.IMenuService; import com.ruoyi.project.system.role.service.IRoleService; import com.ruoyi.project.system.user.domain.User; diff --git a/src/main/java/com/ruoyi/project/shiro/realm/LoginService.java b/src/main/java/com/ruoyi/framework/shiro/service/LoginService.java similarity index 67% rename from src/main/java/com/ruoyi/project/shiro/realm/LoginService.java rename to src/main/java/com/ruoyi/framework/shiro/service/LoginService.java index f4a220f57..416f58b9e 100644 --- a/src/main/java/com/ruoyi/project/shiro/realm/LoginService.java +++ b/src/main/java/com/ruoyi/framework/shiro/service/LoginService.java @@ -1,19 +1,17 @@ -package com.ruoyi.project.shiro.realm; +package com.ruoyi.framework.shiro.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; -import com.ruoyi.framework.constant.CommonConstant; -import com.ruoyi.project.shiro.common.Constants; -import com.ruoyi.project.shiro.common.utils.MessageUtils; -import com.ruoyi.project.shiro.exception.user.RoleBlockedException; -import com.ruoyi.project.shiro.exception.user.UserBlockedException; -import com.ruoyi.project.shiro.exception.user.UserNotExistsException; -import com.ruoyi.project.shiro.exception.user.UserPasswordNotMatchException; -import com.ruoyi.project.shiro.service.PasswordService; +import com.ruoyi.common.constant.CommonConstant; +import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.exception.user.UserBlockedException; +import com.ruoyi.common.exception.user.UserNotExistsException; +import com.ruoyi.common.exception.user.UserPasswordNotMatchException; +import com.ruoyi.common.utils.MessageUtils; +import com.ruoyi.common.utils.SystemLogUtils; import com.ruoyi.project.system.user.domain.User; import com.ruoyi.project.system.user.service.IUserService; -import com.ruoyi.project.util.SystemLogUtils; /** * 登录校验方法 @@ -41,16 +39,16 @@ public class LoginService throw new UserNotExistsException(); } // 密码如果不在指定范围内 错误 - if (password.length() < Constants.PASSWORD_MIN_LENGTH - || password.length() > Constants.PASSWORD_MAX_LENGTH) + if (password.length() < UserConstants.PASSWORD_MIN_LENGTH + || password.length() > UserConstants.PASSWORD_MAX_LENGTH) { SystemLogUtils.log(username, CommonConstant.LOGIN_FAIL, MessageUtils.message("user.password.not.match")); throw new UserPasswordNotMatchException(); } // 用户名不在指定范围内 错误 - if (username.length() < Constants.USERNAME_MIN_LENGTH - || username.length() > Constants.USERNAME_MAX_LENGTH) + if (username.length() < UserConstants.USERNAME_MIN_LENGTH + || username.length() > UserConstants.USERNAME_MAX_LENGTH) { SystemLogUtils.log(username, CommonConstant.LOGIN_FAIL, MessageUtils.message("user.password.not.match")); throw new UserPasswordNotMatchException(); @@ -67,7 +65,7 @@ public class LoginService passwordService.validate(user, password); - if (Constants.USER_BLOCKED.equals(user.getStatus())) + if (UserConstants.USER_BLOCKED.equals(user.getStatus())) { SystemLogUtils.log(username, CommonConstant.LOGIN_FAIL, MessageUtils.message("user.blocked", user.getRefuseDes())); throw new UserBlockedException(user.getRefuseDes()); diff --git a/src/main/java/com/ruoyi/project/shiro/service/PasswordService.java b/src/main/java/com/ruoyi/framework/shiro/service/PasswordService.java similarity index 83% rename from src/main/java/com/ruoyi/project/shiro/service/PasswordService.java rename to src/main/java/com/ruoyi/framework/shiro/service/PasswordService.java index 4a09650bf..7fa3b912d 100644 --- a/src/main/java/com/ruoyi/project/shiro/service/PasswordService.java +++ b/src/main/java/com/ruoyi/framework/shiro/service/PasswordService.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.shiro.service; +package com.ruoyi.framework.shiro.service; import java.util.concurrent.atomic.AtomicInteger; import javax.annotation.PostConstruct; @@ -7,13 +7,14 @@ import org.apache.shiro.cache.CacheManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import com.ruoyi.framework.constant.CommonConstant; -import com.ruoyi.project.shiro.common.utils.Md5Utils; -import com.ruoyi.project.shiro.common.utils.MessageUtils; -import com.ruoyi.project.shiro.exception.user.UserPasswordNotMatchException; -import com.ruoyi.project.shiro.exception.user.UserPasswordRetryLimitExceedException; + +import com.ruoyi.common.constant.CommonConstant; +import com.ruoyi.common.exception.user.UserPasswordNotMatchException; +import com.ruoyi.common.exception.user.UserPasswordRetryLimitExceedException; +import com.ruoyi.common.utils.Md5Utils; +import com.ruoyi.common.utils.MessageUtils; +import com.ruoyi.common.utils.SystemLogUtils; import com.ruoyi.project.system.user.domain.User; -import com.ruoyi.project.util.SystemLogUtils; /** * 登录密码方法 diff --git a/src/main/java/com/ruoyi/project/shiro/session/OnlineSessionDAO.java b/src/main/java/com/ruoyi/framework/shiro/session/OnlineSessionDAO.java similarity index 92% rename from src/main/java/com/ruoyi/project/shiro/session/OnlineSessionDAO.java rename to src/main/java/com/ruoyi/framework/shiro/session/OnlineSessionDAO.java index a588ed586..5dbd012b2 100644 --- a/src/main/java/com/ruoyi/project/shiro/session/OnlineSessionDAO.java +++ b/src/main/java/com/ruoyi/framework/shiro/session/OnlineSessionDAO.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.shiro.session; +package com.ruoyi.framework.shiro.session; import java.io.Serializable; import java.util.Date; @@ -9,10 +9,11 @@ import org.apache.shiro.session.Session; import org.apache.shiro.session.mgt.eis.EnterpriseCacheSessionDAO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import com.ruoyi.project.system.online.domain.OnlineSession; -import com.ruoyi.project.system.online.domain.UserOnline; -import com.ruoyi.project.system.online.service.IUserOnlineService; -import com.ruoyi.project.util.HttpContextUtils; + +import com.ruoyi.common.utils.HttpContextUtils; +import com.ruoyi.project.monitor.online.domain.OnlineSession; +import com.ruoyi.project.monitor.online.domain.UserOnline; +import com.ruoyi.project.monitor.online.service.IUserOnlineService; /** * 针对自定义的ShiroSession的db操作 diff --git a/src/main/java/com/ruoyi/project/shiro/session/OnlineSessionFactory.java b/src/main/java/com/ruoyi/framework/shiro/session/OnlineSessionFactory.java similarity index 81% rename from src/main/java/com/ruoyi/project/shiro/session/OnlineSessionFactory.java rename to src/main/java/com/ruoyi/framework/shiro/session/OnlineSessionFactory.java index 5eca126de..843ede578 100644 --- a/src/main/java/com/ruoyi/project/shiro/session/OnlineSessionFactory.java +++ b/src/main/java/com/ruoyi/framework/shiro/session/OnlineSessionFactory.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.shiro.session; +package com.ruoyi.framework.shiro.session; import javax.servlet.http.HttpServletRequest; import org.apache.shiro.session.Session; @@ -6,12 +6,12 @@ import org.apache.shiro.session.mgt.SessionContext; import org.apache.shiro.session.mgt.SessionFactory; import org.apache.shiro.web.session.mgt.WebSessionContext; import org.springframework.stereotype.Component; +import com.ruoyi.common.utils.HttpContextUtils; +import com.ruoyi.common.utils.IpUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.project.monitor.online.domain.OnlineSession; +import com.ruoyi.project.monitor.online.domain.UserOnline; -import com.ruoyi.common.tools.StringTools; -import com.ruoyi.project.shiro.common.utils.IpUtils; -import com.ruoyi.project.system.online.domain.OnlineSession; -import com.ruoyi.project.system.online.domain.UserOnline; -import com.ruoyi.project.util.HttpContextUtils; import eu.bitwalker.useragentutils.UserAgent; /** @@ -25,7 +25,7 @@ public class OnlineSessionFactory implements SessionFactory public Session createSession(UserOnline userOnline) { OnlineSession onlineSession = userOnline.getSession(); - if (StringTools.isNotNull(onlineSession) && onlineSession.getId() == null) + if (StringUtils.isNotNull(onlineSession) && onlineSession.getId() == null) { onlineSession.setId(userOnline.getSessionId()); } diff --git a/src/main/java/com/ruoyi/project/shiro/web/filter/online/OnlineSessionFilter.java b/src/main/java/com/ruoyi/framework/shiro/web/filter/online/OnlineSessionFilter.java similarity index 90% rename from src/main/java/com/ruoyi/project/shiro/web/filter/online/OnlineSessionFilter.java rename to src/main/java/com/ruoyi/framework/shiro/web/filter/online/OnlineSessionFilter.java index 92e3f121f..6baf559e1 100644 --- a/src/main/java/com/ruoyi/project/shiro/web/filter/online/OnlineSessionFilter.java +++ b/src/main/java/com/ruoyi/framework/shiro/web/filter/online/OnlineSessionFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.shiro.web.filter.online; +package com.ruoyi.framework.shiro.web.filter.online; import java.io.IOException; import javax.servlet.ServletRequest; @@ -9,10 +9,11 @@ import org.apache.shiro.web.filter.AccessControlFilter; import org.apache.shiro.web.util.WebUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; + +import com.ruoyi.common.constant.ShiroConstants; import com.ruoyi.common.utils.security.ShiroUtils; -import com.ruoyi.project.shiro.ShiroConstants; -import com.ruoyi.project.shiro.session.OnlineSessionDAO; -import com.ruoyi.project.system.online.domain.OnlineSession; +import com.ruoyi.framework.shiro.session.OnlineSessionDAO; +import com.ruoyi.project.monitor.online.domain.OnlineSession; import com.ruoyi.project.system.user.domain.User; /** diff --git a/src/main/java/com/ruoyi/project/shiro/web/filter/sync/SyncOnlineSessionFilter.java b/src/main/java/com/ruoyi/framework/shiro/web/filter/sync/SyncOnlineSessionFilter.java similarity index 81% rename from src/main/java/com/ruoyi/project/shiro/web/filter/sync/SyncOnlineSessionFilter.java rename to src/main/java/com/ruoyi/framework/shiro/web/filter/sync/SyncOnlineSessionFilter.java index 0b4a0f17d..85501df3d 100644 --- a/src/main/java/com/ruoyi/project/shiro/web/filter/sync/SyncOnlineSessionFilter.java +++ b/src/main/java/com/ruoyi/framework/shiro/web/filter/sync/SyncOnlineSessionFilter.java @@ -1,12 +1,13 @@ -package com.ruoyi.project.shiro.web.filter.sync; +package com.ruoyi.framework.shiro.web.filter.sync; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import org.apache.shiro.web.filter.PathMatchingFilter; import org.springframework.beans.factory.annotation.Autowired; -import com.ruoyi.project.shiro.ShiroConstants; -import com.ruoyi.project.shiro.session.OnlineSessionDAO; -import com.ruoyi.project.system.online.domain.OnlineSession; + +import com.ruoyi.common.constant.ShiroConstants; +import com.ruoyi.framework.shiro.session.OnlineSessionDAO; +import com.ruoyi.project.monitor.online.domain.OnlineSession; /** * 同步Session数据到Db diff --git a/src/main/java/com/ruoyi/project/shiro/web/session/OnlineWebSessionManager.java b/src/main/java/com/ruoyi/framework/shiro/web/session/OnlineWebSessionManager.java similarity index 91% rename from src/main/java/com/ruoyi/project/shiro/web/session/OnlineWebSessionManager.java rename to src/main/java/com/ruoyi/framework/shiro/web/session/OnlineWebSessionManager.java index 1b17cdf22..563b4bebf 100644 --- a/src/main/java/com/ruoyi/project/shiro/web/session/OnlineWebSessionManager.java +++ b/src/main/java/com/ruoyi/framework/shiro/web/session/OnlineWebSessionManager.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.shiro.web.session; +package com.ruoyi.framework.shiro.web.session; import java.util.ArrayList; import java.util.Collection; @@ -11,11 +11,13 @@ import org.apache.shiro.session.Session; import org.apache.shiro.session.mgt.DefaultSessionKey; import org.apache.shiro.session.mgt.SessionKey; import org.apache.shiro.web.session.mgt.DefaultWebSessionManager; + +import com.ruoyi.common.constant.ShiroConstants; import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.project.shiro.ShiroConstants; -import com.ruoyi.project.system.online.domain.OnlineSession; -import com.ruoyi.project.system.online.domain.UserOnline; -import com.ruoyi.project.system.online.service.UserOnlineServiceImpl; +import com.ruoyi.project.monitor.online.domain.OnlineSession; +import com.ruoyi.project.monitor.online.domain.UserOnline; +import com.ruoyi.project.monitor.online.service.UserOnlineServiceImpl; + import lombok.extern.slf4j.Slf4j; /** diff --git a/src/main/java/com/ruoyi/project/shiro/web/session/SpringSessionValidationScheduler.java b/src/main/java/com/ruoyi/framework/shiro/web/session/SpringSessionValidationScheduler.java similarity index 95% rename from src/main/java/com/ruoyi/project/shiro/web/session/SpringSessionValidationScheduler.java rename to src/main/java/com/ruoyi/framework/shiro/web/session/SpringSessionValidationScheduler.java index b68260d92..485cd8cf3 100644 --- a/src/main/java/com/ruoyi/project/shiro/web/session/SpringSessionValidationScheduler.java +++ b/src/main/java/com/ruoyi/framework/shiro/web/session/SpringSessionValidationScheduler.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.shiro.web.session; +package com.ruoyi.framework.shiro.web.session; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; diff --git a/src/main/java/com/ruoyi/project/system/online/controller/UserOnlineController.java b/src/main/java/com/ruoyi/project/monitor/online/controller/UserOnlineController.java similarity index 84% rename from src/main/java/com/ruoyi/project/system/online/controller/UserOnlineController.java rename to src/main/java/com/ruoyi/project/monitor/online/controller/UserOnlineController.java index 1b4ebaae1..c0315af15 100644 --- a/src/main/java/com/ruoyi/project/system/online/controller/UserOnlineController.java +++ b/src/main/java/com/ruoyi/project/monitor/online/controller/UserOnlineController.java @@ -1,7 +1,6 @@ -package com.ruoyi.project.system.online.controller; +package com.ruoyi.project.monitor.online.controller; import java.util.List; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -10,14 +9,13 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; - -import com.ruoyi.common.tools.StringTools; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.framework.core.controller.BaseController; import com.ruoyi.framework.core.domain.R; -import com.ruoyi.project.shiro.session.OnlineSessionDAO; -import com.ruoyi.project.system.online.domain.OnlineSession; -import com.ruoyi.project.system.online.domain.UserOnline; -import com.ruoyi.project.system.online.service.IUserOnlineService; +import com.ruoyi.framework.shiro.session.OnlineSessionDAO; +import com.ruoyi.project.monitor.online.domain.OnlineSession; +import com.ruoyi.project.monitor.online.domain.UserOnline; +import com.ruoyi.project.monitor.online.service.IUserOnlineService; @Controller @RequestMapping("/monitor/online") @@ -66,7 +64,7 @@ public class UserOnlineController extends BaseController catch (Exception e) { String msg = "未知错误"; - if (StringTools.isNotEmpty(e.getMessage())) + if (StringUtils.isNotEmpty(e.getMessage())) { msg = e.getMessage(); } diff --git a/src/main/java/com/ruoyi/project/system/online/dao/IUserOnlineDao.java b/src/main/java/com/ruoyi/project/monitor/online/dao/IUserOnlineDao.java similarity index 85% rename from src/main/java/com/ruoyi/project/system/online/dao/IUserOnlineDao.java rename to src/main/java/com/ruoyi/project/monitor/online/dao/IUserOnlineDao.java index 4c739a917..023b615d0 100644 --- a/src/main/java/com/ruoyi/project/system/online/dao/IUserOnlineDao.java +++ b/src/main/java/com/ruoyi/project/monitor/online/dao/IUserOnlineDao.java @@ -1,7 +1,8 @@ -package com.ruoyi.project.system.online.dao; +package com.ruoyi.project.monitor.online.dao; import java.util.List; -import com.ruoyi.project.system.online.domain.UserOnline; + +import com.ruoyi.project.monitor.online.domain.UserOnline; public interface IUserOnlineDao { diff --git a/src/main/java/com/ruoyi/project/system/online/dao/UserOnlineDaoImpl.java b/src/main/java/com/ruoyi/project/monitor/online/dao/UserOnlineDaoImpl.java similarity index 91% rename from src/main/java/com/ruoyi/project/system/online/dao/UserOnlineDaoImpl.java rename to src/main/java/com/ruoyi/project/monitor/online/dao/UserOnlineDaoImpl.java index 8e48be6d0..907942010 100644 --- a/src/main/java/com/ruoyi/project/system/online/dao/UserOnlineDaoImpl.java +++ b/src/main/java/com/ruoyi/project/monitor/online/dao/UserOnlineDaoImpl.java @@ -1,9 +1,9 @@ -package com.ruoyi.project.system.online.dao; +package com.ruoyi.project.monitor.online.dao; import java.util.List; import org.springframework.stereotype.Repository; import com.ruoyi.framework.core.dao.DynamicObjectBaseDao; -import com.ruoyi.project.system.online.domain.UserOnline; +import com.ruoyi.project.monitor.online.domain.UserOnline; @Repository("userOnlineDao") public class UserOnlineDaoImpl extends DynamicObjectBaseDao implements IUserOnlineDao diff --git a/src/main/java/com/ruoyi/project/system/online/domain/OnlineSession.java b/src/main/java/com/ruoyi/project/monitor/online/domain/OnlineSession.java similarity index 92% rename from src/main/java/com/ruoyi/project/system/online/domain/OnlineSession.java rename to src/main/java/com/ruoyi/project/monitor/online/domain/OnlineSession.java index f20e85034..364329cbf 100644 --- a/src/main/java/com/ruoyi/project/system/online/domain/OnlineSession.java +++ b/src/main/java/com/ruoyi/project/monitor/online/domain/OnlineSession.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.online.domain; +package com.ruoyi.project.monitor.online.domain; import org.apache.shiro.session.mgt.SimpleSession; diff --git a/src/main/java/com/ruoyi/project/system/online/domain/UserOnline.java b/src/main/java/com/ruoyi/project/monitor/online/domain/UserOnline.java similarity index 88% rename from src/main/java/com/ruoyi/project/system/online/domain/UserOnline.java rename to src/main/java/com/ruoyi/project/monitor/online/domain/UserOnline.java index ef8ed703e..1737bdf65 100644 --- a/src/main/java/com/ruoyi/project/system/online/domain/UserOnline.java +++ b/src/main/java/com/ruoyi/project/monitor/online/domain/UserOnline.java @@ -1,8 +1,10 @@ -package com.ruoyi.project.system.online.domain; +package com.ruoyi.project.monitor.online.domain; import java.util.Date; + +import com.ruoyi.project.monitor.online.domain.OnlineSession.OnlineStatus; + import lombok.Data; -import com.ruoyi.project.system.online.domain.OnlineSession.OnlineStatus; /** * 当前在线会话 sys_user_online diff --git a/src/main/java/com/ruoyi/project/system/online/service/IUserOnlineService.java b/src/main/java/com/ruoyi/project/monitor/online/service/IUserOnlineService.java similarity index 87% rename from src/main/java/com/ruoyi/project/system/online/service/IUserOnlineService.java rename to src/main/java/com/ruoyi/project/monitor/online/service/IUserOnlineService.java index e9922d236..c262dce86 100644 --- a/src/main/java/com/ruoyi/project/system/online/service/IUserOnlineService.java +++ b/src/main/java/com/ruoyi/project/monitor/online/service/IUserOnlineService.java @@ -1,8 +1,9 @@ -package com.ruoyi.project.system.online.service; +package com.ruoyi.project.monitor.online.service; import java.util.Date; import java.util.List; -import com.ruoyi.project.system.online.domain.UserOnline; + +import com.ruoyi.project.monitor.online.domain.UserOnline; public interface IUserOnlineService { diff --git a/src/main/java/com/ruoyi/project/system/online/service/UserOnlineServiceImpl.java b/src/main/java/com/ruoyi/project/monitor/online/service/UserOnlineServiceImpl.java similarity index 85% rename from src/main/java/com/ruoyi/project/system/online/service/UserOnlineServiceImpl.java rename to src/main/java/com/ruoyi/project/monitor/online/service/UserOnlineServiceImpl.java index 16cc8cd23..2e7219a93 100644 --- a/src/main/java/com/ruoyi/project/system/online/service/UserOnlineServiceImpl.java +++ b/src/main/java/com/ruoyi/project/monitor/online/service/UserOnlineServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.online.service; +package com.ruoyi.project.monitor.online.service; import java.util.Date; import java.util.List; @@ -7,10 +7,10 @@ import org.apache.shiro.session.Session; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.tools.DateTools; -import com.ruoyi.project.shiro.session.OnlineSessionDAO; -import com.ruoyi.project.system.online.dao.IUserOnlineDao; -import com.ruoyi.project.system.online.domain.UserOnline; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.framework.shiro.session.OnlineSessionDAO; +import com.ruoyi.project.monitor.online.dao.IUserOnlineDao; +import com.ruoyi.project.monitor.online.domain.UserOnline; @Service("userOnlineService") public class UserOnlineServiceImpl implements IUserOnlineService @@ -115,7 +115,7 @@ public class UserOnlineServiceImpl implements IUserOnlineService @Override public List selectByOnlineExpired(Date expiredDate) { - String lastAccessTime = DateTools.dateTime("yyyy-MM-dd HH:mm:ss", expiredDate); + String lastAccessTime = DateUtils.dateTime("yyyy-MM-dd HH:mm:ss", expiredDate); return userOnlineDao.selectByOnlineExpired(lastAccessTime); } } 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 deleted file mode 100644 index 264fadd69..000000000 --- a/src/main/java/com/ruoyi/project/shiro/common/utils/SessionUtils.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.ruoyi.project.shiro.common.utils; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.shiro.SecurityUtils; -import org.apache.shiro.session.Session; -import org.apache.shiro.subject.Subject; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - -import com.ruoyi.project.shiro.ShiroConstants; -import com.ruoyi.project.system.user.domain.User; - -/** - * 通用Session处理方法 - * - * @author yangzz - */ -public class SessionUtils -{ - /** - * 得到session用户对象 - */ - public static User getCurrentUser() - { - Subject currentUser = SecurityUtils.getSubject(); - Session session = currentUser.getSession(); - User user = (User) session.getAttribute(ShiroConstants.CURRENT_USER); - return user; - } - - /** - * 获取request信息 - */ - public static Object getRequestAttribute(String key) - { - HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()) - .getRequest(); - return request.getAttribute(key); - } - - /** - * 得到session obj对象 - */ - public static Session getSession() - { - Subject currentUser = SecurityUtils.getSubject(); - return currentUser.getSession(); - } -} diff --git a/src/main/java/com/ruoyi/project/system/menu/service/MenuServiceImpl.java b/src/main/java/com/ruoyi/project/system/menu/service/MenuServiceImpl.java index c1f7d316e..877a06847 100644 --- a/src/main/java/com/ruoyi/project/system/menu/service/MenuServiceImpl.java +++ b/src/main/java/com/ruoyi/project/system/menu/service/MenuServiceImpl.java @@ -6,15 +6,12 @@ import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; import java.util.Set; - -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - -import com.ruoyi.common.tools.StringTools; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.TreeUtils; import com.ruoyi.project.system.menu.dao.IMenuDao; import com.ruoyi.project.system.menu.domain.Menu; -import com.ruoyi.project.util.TreeUtil; /** * 菜单 业务层处理 @@ -39,7 +36,7 @@ public class MenuServiceImpl implements IMenuService public List selectMenusByUserId(Long userId) { List menus = menuDao.selectMenusByUserId(userId); - return TreeUtil.getChildPerms(menus, 0); + return TreeUtils.getChildPerms(menus, 0); } /** @@ -55,7 +52,7 @@ public class MenuServiceImpl implements IMenuService Set permsSet = new HashSet<>(); for (String perm : perms) { - if (StringUtils.isNotBlank(perm)) + if (StringUtils.isNotEmpty(perm)) { permsSet.addAll(Arrays.asList(perm.trim().split(","))); } @@ -73,7 +70,7 @@ public class MenuServiceImpl implements IMenuService { LinkedHashMap section = new LinkedHashMap<>(); List permissions = menuDao.selectPermsAll(); - if (StringTools.isNotEmpty(permissions)) + if (StringUtils.isNotEmpty(permissions)) { for (Menu menu : permissions) { 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 93ea998f7..228ff982d 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 @@ -8,7 +8,7 @@ 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.ResponseBody; -import com.ruoyi.common.tools.StringTools; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.framework.core.controller.BaseController; import com.ruoyi.framework.core.domain.R; @@ -42,7 +42,7 @@ public class LoginController extends BaseController catch (AuthenticationException e) { String msg = "用户或密码错误"; - if (StringTools.isNotEmpty(e.getMessage())) + if (StringUtils.isNotEmpty(e.getMessage())) { msg = e.getMessage(); } 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 e6e5f3c78..fbbaac9f7 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 @@ -9,8 +9,9 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.utils.TableDataInfo; + import com.ruoyi.framework.core.controller.BaseController; +import com.ruoyi.framework.page.TableDataInfo; import com.ruoyi.project.system.user.domain.User; import com.ruoyi.project.system.user.service.IUserService; 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 544701292..6e6648b34 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 @@ -1,7 +1,8 @@ package com.ruoyi.project.system.user.dao; import java.util.List; -import com.ruoyi.common.utils.PageUtilEntity; + +import com.ruoyi.framework.page.PageUtilEntity; import com.ruoyi.project.system.user.domain.User; /** diff --git a/src/main/java/com/ruoyi/project/system/user/dao/UserDaoImpl.java b/src/main/java/com/ruoyi/project/system/user/dao/UserDaoImpl.java index c069db15f..c1afabe98 100644 --- a/src/main/java/com/ruoyi/project/system/user/dao/UserDaoImpl.java +++ b/src/main/java/com/ruoyi/project/system/user/dao/UserDaoImpl.java @@ -4,8 +4,8 @@ import java.util.List; import org.springframework.stereotype.Repository; -import com.ruoyi.common.utils.PageUtilEntity; import com.ruoyi.framework.core.dao.DynamicObjectBaseDao; +import com.ruoyi.framework.page.PageUtilEntity; import com.ruoyi.project.system.user.domain.User; /** 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 7ac616469..509ec6ced 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 @@ -1,7 +1,8 @@ package com.ruoyi.project.system.user.service; import java.util.List; -import com.ruoyi.common.utils.PageUtilEntity; + +import com.ruoyi.framework.page.PageUtilEntity; import com.ruoyi.project.system.user.domain.User; /** diff --git a/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java b/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java index 811e42f76..f51170201 100644 --- a/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java +++ b/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java @@ -3,7 +3,8 @@ package com.ruoyi.project.system.user.service; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.utils.PageUtilEntity; + +import com.ruoyi.framework.page.PageUtilEntity; import com.ruoyi.project.system.user.dao.IUserDao; import com.ruoyi.project.system.user.domain.User; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index aa4131b72..980275c18 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -28,7 +28,7 @@ spring: # MyBatis mybatis: # 搜索指定包别名 - typeAliasesPackage: com.ruoyi.project.system + typeAliasesPackage: com.ruoyi.project # 配置mapper的扫描，找到所有的mapper.xml映射文件 mapperLocations: classpath:mybatis/**/*Mapper.xml # 加载全局的配置文件