diff --git a/pom.xml b/pom.xml index 882ca7040..9973a4229 100644 --- a/pom.xml +++ b/pom.xml @@ -135,6 +135,12 @@ UserAgentUtils 1.19 + + + org.projectlombok + lombok + 1.16.18 + org.quartz-scheduler diff --git a/src/main/java/com/ruoyi/framework/config/DruidDBConfig.java b/src/main/java/com/ruoyi/framework/config/DruidDBConfig.java index 24d07497a..10d6a9df0 100644 --- a/src/main/java/com/ruoyi/framework/config/DruidDBConfig.java +++ b/src/main/java/com/ruoyi/framework/config/DruidDBConfig.java @@ -1,18 +1,17 @@ package com.ruoyi.framework.config; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.support.http.StatViewServlet; -import com.alibaba.druid.support.http.WebStatFilter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import java.sql.SQLException; +import javax.sql.DataSource; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.boot.web.servlet.ServletRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; -import javax.sql.DataSource; -import java.sql.SQLException; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.support.http.StatViewServlet; +import com.alibaba.druid.support.http.WebStatFilter; +import lombok.extern.slf4j.Slf4j; /** * 数据库信息配置加载 @@ -20,10 +19,9 @@ import java.sql.SQLException; * @author yangzz */ @Configuration +@Slf4j public class DruidDBConfig { - private Logger logger = LoggerFactory.getLogger(DruidDBConfig.class); - @Value("${spring.datasource.url}") private String dbUrl; @@ -108,7 +106,7 @@ public class DruidDBConfig } catch (SQLException e) { - logger.error("druid configuration initialization filter", e); + log.error("druid configuration initialization filter", e); } datasource.setConnectionProperties(connectionProperties); 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 3278441e1..3df130d04 100644 --- a/src/main/java/com/ruoyi/framework/core/dao/DynamicObjectBaseDao.java +++ b/src/main/java/com/ruoyi/framework/core/dao/DynamicObjectBaseDao.java @@ -6,19 +6,17 @@ import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; import org.mybatis.spring.SqlSessionTemplate; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.ruoyi.project.shiro.exception.base.DaoException; +import lombok.extern.slf4j.Slf4j; /** * 数据DAO层通用数据处理 * * @author yangzz */ +@Slf4j public class DynamicObjectBaseDao { - private static final Logger log = LoggerFactory.getLogger(DynamicObjectBaseDao.class); - @Resource(name = "sqlSessionTemplate") private SqlSessionTemplate sqlSessionTemplate; 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 e72589fcb..4cbac99e6 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 @@ -1,7 +1,6 @@ package com.ruoyi.project.shiro.common.utils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import lombok.extern.slf4j.Slf4j; import java.security.MessageDigest; /** @@ -9,9 +8,9 @@ import java.security.MessageDigest; * * @author yangzz */ +@Slf4j public class Md5Utils { - private static final Logger LOGGER = LoggerFactory.getLogger(Md5Utils.class); private static byte[] md5(String s) { @@ -26,7 +25,7 @@ public class Md5Utils } catch (Exception e) { - LOGGER.error("MD5 Error...", e); + log.error("MD5 Error...", e); } return null; } @@ -59,7 +58,7 @@ public class Md5Utils } catch (Exception e) { - LOGGER.error("not supported charset...{}", e); + log.error("not supported charset...{}", e); return s; } } diff --git a/src/main/java/com/ruoyi/project/shiro/realm/UserRealm.java b/src/main/java/com/ruoyi/project/shiro/realm/UserRealm.java index 33e5588eb..f01eb7d17 100644 --- a/src/main/java/com/ruoyi/project/shiro/realm/UserRealm.java +++ b/src/main/java/com/ruoyi/project/shiro/realm/UserRealm.java @@ -14,8 +14,6 @@ import org.apache.shiro.authz.AuthorizationInfo; import org.apache.shiro.authz.SimpleAuthorizationInfo; import org.apache.shiro.realm.AuthorizingRealm; import org.apache.shiro.subject.PrincipalCollection; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import com.ruoyi.common.tools.StringTools; import com.ruoyi.common.utils.security.ShiroUtils; @@ -27,17 +25,17 @@ import com.ruoyi.project.shiro.exception.user.UserPasswordNotMatchException; import com.ruoyi.project.shiro.exception.user.UserPasswordRetryLimitExceedException; import com.ruoyi.project.system.menu.service.IMenuService; import com.ruoyi.project.system.user.domain.User; +import lombok.extern.slf4j.Slf4j; /** * 自定义Realm 处理登录 权限 * * @author yangzz */ +@Slf4j public class UserRealm extends AuthorizingRealm { - private static final Logger log = LoggerFactory.getLogger(UserRealm.class); - @Autowired private IMenuService menuService; diff --git a/src/main/java/com/ruoyi/project/shiro/web/session/OnlineWebSessionManager.java b/src/main/java/com/ruoyi/project/shiro/web/session/OnlineWebSessionManager.java index b651cde12..1b17cdf22 100644 --- a/src/main/java/com/ruoyi/project/shiro/web/session/OnlineWebSessionManager.java +++ b/src/main/java/com/ruoyi/project/shiro/web/session/OnlineWebSessionManager.java @@ -11,23 +11,22 @@ 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 org.slf4j.Logger; -import org.slf4j.LoggerFactory; 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 lombok.extern.slf4j.Slf4j; /** * 主要是在此如果会话的属性修改了 就标识下其修改了 然后方便 OnlineSessionDao同步 * * @author yangzz */ +@Slf4j public class OnlineWebSessionManager extends DefaultWebSessionManager { - private static final Logger log = LoggerFactory.getLogger(OnlineWebSessionManager.class); @Override public void setAttribute(SessionKey sessionKey, Object attributeKey, Object value) throws InvalidSessionException diff --git a/src/main/java/com/ruoyi/project/shiro/web/session/SpringSessionValidationScheduler.java b/src/main/java/com/ruoyi/project/shiro/web/session/SpringSessionValidationScheduler.java index 1d02649a4..b68260d92 100644 --- a/src/main/java/com/ruoyi/project/shiro/web/session/SpringSessionValidationScheduler.java +++ b/src/main/java/com/ruoyi/project/shiro/web/session/SpringSessionValidationScheduler.java @@ -3,25 +3,22 @@ package com.ruoyi.project.shiro.web.session; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; - import org.apache.shiro.session.mgt.DefaultSessionManager; import org.apache.shiro.session.mgt.SessionValidationScheduler; import org.apache.shiro.session.mgt.ValidatingSessionManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import lombok.extern.slf4j.Slf4j; /** * 自定义任务调度器完成 * * @author yangzz */ +@Slf4j public class SpringSessionValidationScheduler implements SessionValidationScheduler { public static final long DEFAULT_SESSION_VALIDATION_INTERVAL = DefaultSessionManager.DEFAULT_SESSION_VALIDATION_INTERVAL; - private static final Logger log = LoggerFactory.getLogger(SpringSessionValidationScheduler.class); - /** * 定时器，用于处理超时的挂起请求，也用于连接断开时的重连。 */ diff --git a/src/main/java/com/ruoyi/project/system/dept/domain/Dept.java b/src/main/java/com/ruoyi/project/system/dept/domain/Dept.java index a8216543d..e9d9d7984 100644 --- a/src/main/java/com/ruoyi/project/system/dept/domain/Dept.java +++ b/src/main/java/com/ruoyi/project/system/dept/domain/Dept.java @@ -1,16 +1,15 @@ package com.ruoyi.project.system.dept.domain; -import java.io.Serializable; +import lombok.Data; /** * 部门对象 sys_dept * * @author yangzz */ -public class Dept implements Serializable +@Data +public class Dept { - private static final long serialVersionUID = 1L; - // 部门ID private Long deptId; // 父部门ID @@ -22,61 +21,4 @@ public class Dept implements Serializable // 部门状态:0正常,1停用 private String status; - public Long getDeptId() - { - return deptId; - } - - public void setDeptId(Long deptId) - { - this.deptId = deptId; - } - - public Long getParentId() - { - return parentId; - } - - public void setParentId(Long parentId) - { - this.parentId = parentId; - } - - public String getDeptName() - { - return deptName; - } - - public void setDeptName(String deptName) - { - this.deptName = deptName; - } - - public String getOrderNum() - { - return orderNum; - } - - public void setOrderNum(String orderNum) - { - this.orderNum = orderNum; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - - @Override - public String toString() - { - return "{\"deptId\":\"" + deptId + "\",\"parentId\":\"" + parentId + "\",\"deptName\":\"" + deptName - + "\",\"orderNum\":\"" + orderNum + "\",\"status\":\"" + status + "\"} "; - } - } diff --git a/src/main/java/com/ruoyi/project/system/logininfor/domain/Logininfor.java b/src/main/java/com/ruoyi/project/system/logininfor/domain/Logininfor.java index 58c94f57a..3a462f95f 100644 --- a/src/main/java/com/ruoyi/project/system/logininfor/domain/Logininfor.java +++ b/src/main/java/com/ruoyi/project/system/logininfor/domain/Logininfor.java @@ -1,16 +1,15 @@ package com.ruoyi.project.system.logininfor.domain; -import java.io.Serializable; +import lombok.Data; /** * 系统访问日志情况信息 sys_logininfor * * @author yangzz */ -public class Logininfor implements Serializable +@Data +public class Logininfor { - private static final long serialVersionUID = 1L; - // ID private Integer infoId; // 用户账号 @@ -28,92 +27,4 @@ public class Logininfor implements Serializable // 访问时间 private String loginTime; - public Integer getInfoId() - { - return infoId; - } - - public void setInfoId(Integer infoId) - { - this.infoId = infoId; - } - - public String getLoginName() - { - return loginName; - } - - public void setLoginName(String loginName) - { - this.loginName = loginName; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - - public String getIpaddr() - { - return ipaddr; - } - - public void setIpaddr(String ipaddr) - { - this.ipaddr = ipaddr; - } - - public String getBrowser() - { - return browser; - } - - public void setBrowser(String browser) - { - this.browser = browser; - } - - public String getOs() - { - return os; - } - - public void setOs(String os) - { - this.os = os; - } - - public String getMsg() - { - return msg; - } - - public void setMsg(String msg) - { - this.msg = msg; - } - - public String getLoginTime() - { - return loginTime; - } - - public void setLoginTime(String loginTime) - { - this.loginTime = loginTime; - } - - @Override - public String toString() - { - return "{\"infoId\":\"" + infoId + "\",\"loginName\":\"" + loginName + "\",\"status\":\"" + status - + "\",\"ipaddr\":\"" + ipaddr + "\",\"browser\":\"" + browser + "\",\"os\":\"" + os + "\",\"msg\":\"" - + msg + "\",\"loginTime\":\"" + loginTime + "\"} "; - } - } \ No newline at end of file diff --git a/src/main/java/com/ruoyi/project/system/menu/domain/Menu.java b/src/main/java/com/ruoyi/project/system/menu/domain/Menu.java index 17eba8fb3..e43738f08 100644 --- a/src/main/java/com/ruoyi/project/system/menu/domain/Menu.java +++ b/src/main/java/com/ruoyi/project/system/menu/domain/Menu.java @@ -1,18 +1,17 @@ package com.ruoyi.project.system.menu.domain; -import java.io.Serializable; import java.util.ArrayList; import java.util.List; +import lombok.Data; /** * 角色对象 sys_menu * * @author yangzz */ -public class Menu implements Serializable +@Data +public class Menu { - private static final long serialVersionUID = 1L; - // 菜单ID private Integer menuId; // 菜单名称 @@ -42,153 +41,4 @@ public class Menu implements Serializable // 子菜单 private List children = new ArrayList(); - public Integer getMenuId() - { - return menuId; - } - - public void setMenuId(Integer menuId) - { - this.menuId = menuId; - } - - public String getMenuName() - { - return menuName; - } - - public void setMenuName(String menuName) - { - this.menuName = menuName; - } - - public Integer getParentId() - { - return parentId; - } - - public void setParentId(Integer parentId) - { - this.parentId = parentId; - } - - public String getOrderNum() - { - return orderNum; - } - - public void setOrderNum(String orderNum) - { - this.orderNum = orderNum; - } - - public String getUrl() - { - return url; - } - - public void setUrl(String url) - { - this.url = url; - } - - public String getMenuType() - { - return menuType; - } - - public void setMenuType(String menuType) - { - this.menuType = menuType; - } - - public String getVisible() - { - return visible; - } - - public void setVisible(String visible) - { - this.visible = visible; - } - - public String getPerms() - { - return perms; - } - - public void setPerms(String perms) - { - this.perms = perms; - } - - public String getIcon() - { - return icon; - } - - public void setIcon(String icon) - { - this.icon = icon; - } - - public String getCreateTime() - { - return createTime; - } - - public void setCreateTime(String createTime) - { - this.createTime = createTime; - } - - public String getUpdateTime() - { - return updateTime; - } - - public void setUpdateTime(String updateTime) - { - this.updateTime = updateTime; - } - - public String getUpdateBy() - { - return updateBy; - } - - public void setUpdateBy(String updateBy) - { - this.updateBy = updateBy; - } - - public String getRemark() - { - return remark; - } - - public void setRemark(String remark) - { - this.remark = remark; - } - - public List getChildren() - { - return children; - } - - public void setChildren(List children) - { - this.children = children; - } - - @Override - public String toString() - { - return "{\"menuId\":\"" + menuId + "\",\"menuName\":\"" + menuName + "\",\"parentId\":\"" + parentId - + "\",\"orderNum\":\"" + orderNum + "\",\"url\":\"" + url + "\",\"menuType\":\"" + menuType - + "\",\"visible\":\"" + visible + "\",\"perms\":\"" + perms + "\",\"icon\":\"" + icon - + "\",\"createTime\":\"" + createTime + "\",\"updateTime\":\"" + updateTime + "\",\"updateBy\":\"" - + updateBy + "\",\"remark\":\"" + remark + "\",\"children\":\"" + children + "\"} "; - } } diff --git a/src/main/java/com/ruoyi/project/system/online/domain/UserOnline.java b/src/main/java/com/ruoyi/project/system/online/domain/UserOnline.java index 9513d2542..a80e0c254 100644 --- a/src/main/java/com/ruoyi/project/system/online/domain/UserOnline.java +++ b/src/main/java/com/ruoyi/project/system/online/domain/UserOnline.java @@ -1,7 +1,7 @@ package com.ruoyi.project.system.online.domain; -import java.io.Serializable; import java.util.Date; +import lombok.Data; import com.ruoyi.project.system.online.domain.OnlineSession.OnlineStatus; /** @@ -9,10 +9,9 @@ import com.ruoyi.project.system.online.domain.OnlineSession.OnlineStatus; * * @author yangzz */ -public class UserOnline implements Serializable +@Data +public class UserOnline { - private static final long serialVersionUID = 1L; - // 用户会话id private String sessionId; @@ -49,126 +48,6 @@ public class UserOnline implements Serializable // 备份的当前用户会话 private OnlineSession session; - public String getSessionId() - { - return sessionId; - } - - public void setSessionId(String sessionId) - { - this.sessionId = sessionId; - } - - public String getDeptName() - { - return deptName; - } - - public void setDeptName(String deptName) - { - this.deptName = deptName; - } - - public String getLoginName() - { - return loginName; - } - - public void setLoginName(String loginName) - { - this.loginName = loginName; - } - - public String getRoleName() - { - return roleName; - } - - public void setRoleName(String roleName) - { - this.roleName = roleName; - } - - public String getIpaddr() - { - return ipaddr; - } - - public void setIpaddr(String ipaddr) - { - this.ipaddr = ipaddr; - } - - public String getBrowser() - { - return browser; - } - - public void setBrowser(String browser) - { - this.browser = browser; - } - - public String getOs() - { - return os; - } - - public void setOs(String os) - { - this.os = os; - } - - public Date getStartTimestamp() - { - return startTimestamp; - } - - public void setStartTimestamp(Date startTimestamp) - { - this.startTimestamp = startTimestamp; - } - - public Date getLastAccessTime() - { - return lastAccessTime; - } - - public void setLastAccessTime(Date lastAccessTime) - { - this.lastAccessTime = lastAccessTime; - } - - public Long getExpireTime() - { - return expireTime; - } - - public void setExpireTime(Long expireTime) - { - this.expireTime = expireTime; - } - - public OnlineStatus getStatus() - { - return status; - } - - public void setStatus(OnlineStatus status) - { - this.status = status; - } - - public OnlineSession getSession() - { - return session; - } - - public void setSession(OnlineSession session) - { - this.session = session; - } - /** * 设置session对象 */ diff --git a/src/main/java/com/ruoyi/project/system/role/domain/Role.java b/src/main/java/com/ruoyi/project/system/role/domain/Role.java index ae0cf8145..6d085d224 100644 --- a/src/main/java/com/ruoyi/project/system/role/domain/Role.java +++ b/src/main/java/com/ruoyi/project/system/role/domain/Role.java @@ -1,16 +1,15 @@ package com.ruoyi.project.system.role.domain; -import java.io.Serializable; +import lombok.Data; /** * 角色对象 sys_role * * @author yangzz */ -public class Role implements Serializable +@Data +public class Role { - private static final long serialVersionUID = 1L; - // 角色ID private Long roleId; // 角色名 @@ -26,82 +25,4 @@ public class Role implements Serializable // 备注 private String remark; - public Long getRoleId() - { - return roleId; - } - - public void setRoleId(Long roleId) - { - this.roleId = roleId; - } - - public String getRoleName() - { - return roleName; - } - - public void setRoleName(String roleName) - { - this.roleName = roleName; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - - public String getCreateTime() - { - return createTime; - } - - public void setCreateTime(String createTime) - { - this.createTime = createTime; - } - - public String getUpdateTime() - { - return updateTime; - } - - public void setUpdateTime(String updateTime) - { - this.updateTime = updateTime; - } - - public String getUpdateBy() - { - return updateBy; - } - - public void setUpdateBy(String updateBy) - { - this.updateBy = updateBy; - } - - public String getRemark() - { - return remark; - } - - public void setRemark(String remark) - { - this.remark = remark; - } - - @Override - public String toString() - { - return "{\"roleId\":\"" + roleId + "\",\"roleName\":\"" + roleName + "\",\"status\":\"" + status - + "\",\"createTime\":\"" + createTime + "\",\"updateTime\":\"" + updateTime + "\",\"updateBy\":\"" - + updateBy + "\",\"remark\":\"" + remark + "\"} "; - } - } diff --git a/src/main/java/com/ruoyi/project/system/user/domain/User.java b/src/main/java/com/ruoyi/project/system/user/domain/User.java index d38855ac9..484b9ec12 100644 --- a/src/main/java/com/ruoyi/project/system/user/domain/User.java +++ b/src/main/java/com/ruoyi/project/system/user/domain/User.java @@ -1,18 +1,17 @@ package com.ruoyi.project.system.user.domain; -import java.io.Serializable; import com.ruoyi.project.system.dept.domain.Dept; import com.ruoyi.project.system.role.domain.Role; +import lombok.Data; /** * 用户对象 sys_user * * @author yangzz */ -public class User implements Serializable +@Data +public class User { - private static final long serialVersionUID = 1L; - // 用户ID private Long userId; // 部门ID @@ -40,155 +39,4 @@ public class User implements Serializable // 角色对象 private Role role; - public User() - { - } - - public User(Long userId, String loginName, String password) - { - super(); - this.userId = userId; - this.loginName = loginName; - this.password = password; - } - - public Long getUserId() - { - return userId; - } - - public void setUserId(Long userId) - { - this.userId = userId; - } - - public Long getDeptId() - { - return deptId; - } - - public void setDeptId(Long deptId) - { - this.deptId = deptId; - } - - public String getLoginName() - { - return loginName; - } - - public void setLoginName(String loginName) - { - this.loginName = loginName; - } - - public String getUserName() - { - return userName; - } - - public void setUserName(String userName) - { - this.userName = userName; - } - - public String getEmail() - { - return email; - } - - public void setEmail(String email) - { - this.email = email; - } - - public String getPhonenumber() - { - return phonenumber; - } - - public void setPhonenumber(String phonenumber) - { - this.phonenumber = phonenumber; - } - - public String getPassword() - { - return password; - } - - public void setPassword(String password) - { - this.password = password; - } - - public String getSalt() - { - return salt; - } - - public void setSalt(String salt) - { - this.salt = salt; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - - public String getRefuseDes() - { - return refuseDes; - } - - public void setRefuseDes(String refuseDes) - { - this.refuseDes = refuseDes; - } - - public String getCreateTime() - { - return createTime; - } - - public void setCreateTime(String createTime) - { - this.createTime = createTime; - } - - public Dept getDept() - { - return dept; - } - - public void setDept(Dept dept) - { - this.dept = dept; - } - - public Role getRole() - { - return role; - } - - public void setRole(Role role) - { - this.role = role; - } - - @Override - public String toString() - { - return "{\"userId\":\"" + userId + "\",\"deptId\":\"" + deptId + "\",\"loginName\":\"" + loginName - + "\",\"userName\":\"" + userName + "\",\"email\":\"" + email + "\",\"phonenumber\":\"" + phonenumber - + "\",\"password\":\"" + password + "\",\"salt\":\"" + salt + "\",\"status\":\"" + status - + "\",\"refuseDes\":\"" + refuseDes + "\",\"createTime\":\"" + createTime + "\"} "; - } - }