github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

format

pull/23/MERGE
RuoYi 2018-08-15 14:00:23 +08:00
parent f9c82e1f14
commit e93e0c4cb7
9 changed files with 680 additions and 682 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/main/java/com/ruoyi/common/utils/SystemLogUtils.java
View File

@ -1,69 +0,0 @@
package com.ruoyi.common.utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.utils.security.ShiroUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.project.monitor.logininfor.domain.Logininfor;
import com.ruoyi.project.monitor.logininfor.service.LogininforServiceImpl;
import eu.bitwalker.useragentutils.UserAgent;
/**
* 记录用户日志信息
*
* @author ruoyi
*/
@Deprecated // 加入异步功能之后，该类已无意义
public class SystemLogUtils {
private static final Logger sys_user_logger = LoggerFactory.getLogger("sys-user");
/**
* 记录格式 [ip][用户名][操作][错误消息]
* <p/>
* 注意操作如下： loginError 登录失败 loginSuccess 登录成功 passwordError 密码错误
* changePassword 修改密码 changeStatus 修改状态
*
* @param username
* @param op
* @param msg
* @param args
*/
public static void log(String username, String status, String msg, Object... args) {
StringBuilder s = new StringBuilder();
s.append(LogUtils.getBlock(ShiroUtils.getIp()));
s.append(AddressUtils.getRealAddressByIP(ShiroUtils.getIp()));
s.append(LogUtils.getBlock(username));
s.append(LogUtils.getBlock(status));
s.append(LogUtils.getBlock(msg));
sys_user_logger.info(s.toString(), args);
if (Constants.LOGIN_SUCCESS.equals(status) || Constants.LOGOUT.equals(status)) {
saveOpLog(username, msg, Constants.SUCCESS);
} else if (Constants.LOGIN_FAIL.equals(status)) {
saveOpLog(username, msg, Constants.FAIL);
}
}
public static void saveOpLog(String username, String message, String status) {
UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent"));
// 获取客户端操作系统
String os = userAgent.getOperatingSystem().getName();
// 获取客户端浏览器
String browser = userAgent.getBrowser().getName();
LogininforServiceImpl logininforService = SpringUtils.getBean(LogininforServiceImpl.class);
Logininfor logininfor = new Logininfor();
logininfor.setLoginName(username);
logininfor.setStatus(status);
logininfor.setIpaddr(ShiroUtils.getIp());
logininfor.setLoginLocation(AddressUtils.getRealAddressByIP(ShiroUtils.getIp()));
logininfor.setBrowser(browser);
logininfor.setOs(os);
logininfor.setMsg(message);
logininforService.insertLogininfor(logininfor);
}
}

242
src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
View File

@ -2,7 +2,6 @@ package com.ruoyi.framework.aspectj;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Map; import java.util.Map;
import org.aspectj.lang.JoinPoint; import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.Signature; import org.aspectj.lang.Signature;
import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.AfterReturning;
@ -15,7 +14,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
@ -35,128 +33,144 @@ import com.ruoyi.project.system.user.domain.User;
@Aspect @Aspect
@Component @Component
@EnableAsync @EnableAsync
public class LogAspect { public class LogAspect
private static final Logger log = LoggerFactory.getLogger(LogAspect.class); {
private static final Logger log = LoggerFactory.getLogger(LogAspect.class);
// 配置织入点 // 配置织入点
@Pointcut("@annotation(com.ruoyi.framework.aspectj.lang.annotation.Log)") @Pointcut("@annotation(com.ruoyi.framework.aspectj.lang.annotation.Log)")
public void logPointCut() { public void logPointCut()
} {
}
/** /**
* 前置通知 用于拦截操作 * 前置通知 用于拦截操作
* *
* @param joinPoint * @param joinPoint 切点
* 切点 */
*/ @AfterReturning(pointcut = "logPointCut()")
@AfterReturning(pointcut = "logPointCut()") public void doBefore(JoinPoint joinPoint)
public void doBefore(JoinPoint joinPoint) { {
handleLog(joinPoint, null); handleLog(joinPoint, null);
} }
/** /**
* 拦截异常操作 * 拦截异常操作
* *
* @param joinPoint * @param joinPoint
* @param e * @param e
*/ */
@AfterThrowing(value = "logPointCut()", throwing = "e") @AfterThrowing(value = "logPointCut()", throwing = "e")
public void doAfter(JoinPoint joinPoint, Exception e) { public void doAfter(JoinPoint joinPoint, Exception e)
handleLog(joinPoint, e); {
} handleLog(joinPoint, e);
}
@Async @Async
protected void handleLog(final JoinPoint joinPoint, final Exception e) { protected void handleLog(final JoinPoint joinPoint, final Exception e)
try { {
// 获得注解 try
Log controllerLog = getAnnotationLog(joinPoint); {
if (controllerLog == null) { // 获得注解
return; Log controllerLog = getAnnotationLog(joinPoint);
} if (controllerLog == null)
{
return;
}
// 获取当前的用户 // 获取当前的用户
User currentUser = ShiroUtils.getUser(); User currentUser = ShiroUtils.getUser();
// *========数据库日志=========*// // *========数据库日志=========*//
OperLog operLog = new OperLog(); OperLog operLog = new OperLog();
operLog.setStatus(BusinessStatus.SUCCESS); operLog.setStatus(BusinessStatus.SUCCESS);
// 请求的地址 // 请求的地址
String ip = ShiroUtils.getIp(); String ip = ShiroUtils.getIp();
operLog.setOperIp(ip); operLog.setOperIp(ip);
operLog.setOperUrl(ServletUtils.getRequest().getRequestURI()); operLog.setOperUrl(ServletUtils.getRequest().getRequestURI());
if (currentUser != null) { if (currentUser != null)
operLog.setOperName(currentUser.getLoginName()); {
if (StringUtils.isNotNull(currentUser.getDept()) && StringUtils.isNotEmpty(currentUser.getDept().getDeptName())) { operLog.setOperName(currentUser.getLoginName());
operLog.setDeptName(currentUser.getDept().getDeptName()); if (StringUtils.isNotNull(currentUser.getDept())
} && StringUtils.isNotEmpty(currentUser.getDept().getDeptName()))
} {
operLog.setDeptName(currentUser.getDept().getDeptName());
}
}
if (e != null) { if (e != null)
operLog.setStatus(BusinessStatus.FAIL); {
operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0, 2000)); operLog.setStatus(BusinessStatus.FAIL);
} operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0, 2000));
// 设置方法名称 }
String className = joinPoint.getTarget().getClass().getName(); // 设置方法名称
String methodName = joinPoint.getSignature().getName(); String className = joinPoint.getTarget().getClass().getName();
operLog.setMethod(className + "." + methodName + "()"); String methodName = joinPoint.getSignature().getName();
// 处理设置注解上的参数 operLog.setMethod(className + "." + methodName + "()");
getControllerMethodDescription(controllerLog, operLog); // 处理设置注解上的参数
// 保存数据库 getControllerMethodDescription(controllerLog, operLog);
AsyncManager.me().execute(AsyncFactory.recordOper(operLog)); // 保存数据库
} catch (Exception exp) { AsyncManager.me().execute(AsyncFactory.recordOper(operLog));
// 记录本地异常日志 }
log.error("==前置通知异常=="); catch (Exception exp)
log.error("异常信息:{}", exp.getMessage()); {
exp.printStackTrace(); // 记录本地异常日志
} log.error("==前置通知异常==");
} log.error("异常信息:{}", exp.getMessage());
exp.printStackTrace();
}
}
/** /**
* 获取注解中对方法的描述信息 用于Controller层注解 * 获取注解中对方法的描述信息 用于Controller层注解
* *
* @param joinPoint * @param joinPoint 切点
* 切点 * @return 方法描述
* @return 方法描述 * @throws Exception
* @throws Exception */
*/ public void getControllerMethodDescription(Log log, OperLog operLog) throws Exception
public void getControllerMethodDescription(Log log, OperLog operLog) throws Exception { {
// 设置action动作 // 设置action动作
operLog.setAction(log.action()); operLog.setAction(log.action());
// 设置标题 // 设置标题
operLog.setTitle(log.title()); operLog.setTitle(log.title());
// 设置channel // 设置channel
operLog.setChannel(log.channel()); operLog.setChannel(log.channel());
// 是否需要保存request，参数和值 // 是否需要保存request，参数和值
if (log.isSaveRequestData()) { if (log.isSaveRequestData())
// 获取参数的信息，传入到数据库中。 {
setRequestValue(operLog); // 获取参数的信息，传入到数据库中。
} setRequestValue(operLog);
} }
}
/** /**
* 获取请求的参数，放到log中 * 获取请求的参数，放到log中
* *
* @param operLog * @param operLog
* @param request * @param request
*/ */
private void setRequestValue(OperLog operLog) { private void setRequestValue(OperLog operLog)
Map<String, String[]> map = ServletUtils.getRequest().getParameterMap(); {
String params = JSONObject.toJSONString(map); Map<String, String[]> map = ServletUtils.getRequest().getParameterMap();
operLog.setOperParam(StringUtils.substring(params, 0, 255)); String params = JSONObject.toJSONString(map);
} operLog.setOperParam(StringUtils.substring(params, 0, 255));
}
/** /**
* 是否存在注解，如果存在就获取 * 是否存在注解，如果存在就获取
*/ */
private Log getAnnotationLog(JoinPoint joinPoint) throws Exception { private Log getAnnotationLog(JoinPoint joinPoint) throws Exception
Signature signature = joinPoint.getSignature(); {
MethodSignature methodSignature = (MethodSignature) signature; Signature signature = joinPoint.getSignature();
Method method = methodSignature.getMethod(); MethodSignature methodSignature = (MethodSignature) signature;
Method method = methodSignature.getMethod();
if (method != null) { if (method != null)
return method.getAnnotation(Log.class); {
} return method.getAnnotation(Log.class);
return null; }
} return null;
}
} }

45
src/main/java/com/ruoyi/framework/manager/AsyncManager.java
View File

@ -9,18 +9,35 @@ import java.util.concurrent.TimeUnit;
* *
* @author liuhulu * @author liuhulu
*/ */
public class AsyncManager { public class AsyncManager
// 操作延迟 {
private final int OPERATE_DELAY_TIME = 10; /**
// 异步操作此案城池 * 操作延迟10毫秒
private ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(5); */
// 单例 private final int OPERATE_DELAY_TIME = 10;
private static AsyncManager me = new AsyncManager();
public static AsyncManager me() { /**
return me; * 异步操作任务调度线程池
} */
// 执行任务 private ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(5);
public void execute(TimerTask task) {
executor.schedule(task, OPERATE_DELAY_TIME, TimeUnit.MILLISECONDS); /**
} * 单例模式
*/
private static AsyncManager me = new AsyncManager();
public static AsyncManager me()
{
return me;
}
/**
* 执行任务
*
* @param 任务task
*/
public void execute(TimerTask task)
{
executor.schedule(task, OPERATE_DELAY_TIME, TimeUnit.MILLISECONDS);
}
} }

197
src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
View File

@ -1,10 +1,8 @@
package com.ruoyi.framework.manager.factory; package com.ruoyi.framework.manager.factory;
import java.util.TimerTask; import java.util.TimerTask;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.utils.AddressUtils; import com.ruoyi.common.utils.AddressUtils;
import com.ruoyi.common.utils.LogUtils; import com.ruoyi.common.utils.LogUtils;
@ -18,7 +16,6 @@ import com.ruoyi.project.monitor.online.domain.UserOnline;
import com.ruoyi.project.monitor.online.service.IUserOnlineService; import com.ruoyi.project.monitor.online.service.IUserOnlineService;
import com.ruoyi.project.monitor.operlog.domain.OperLog; import com.ruoyi.project.monitor.operlog.domain.OperLog;
import com.ruoyi.project.monitor.operlog.service.IOperLogService; import com.ruoyi.project.monitor.operlog.service.IOperLogService;
import eu.bitwalker.useragentutils.UserAgent; import eu.bitwalker.useragentutils.UserAgent;
/** /**
@ -27,99 +24,111 @@ import eu.bitwalker.useragentutils.UserAgent;
* @author liuhulu * @author liuhulu
* *
*/ */
public class AsyncFactory { public class AsyncFactory
private static final Logger sys_user_logger = LoggerFactory.getLogger("sys-user"); {
private static final Logger sys_user_logger = LoggerFactory.getLogger("sys-user");
/** /**
* 同步session到数据库 * 同步session到数据库
* *
* @param operLog * @param session 在线用户会话
* @return * @return 任务task
*/ */
public static TimerTask syncSessionToDb(final OnlineSession session) { public static TimerTask syncSessionToDb(final OnlineSession session)
return new TimerTask() { {
@Override return new TimerTask()
public void run() { {
UserOnline online = new UserOnline(); @Override
online.setSessionId(String.valueOf(session.getId())); public void run()
online.setDeptName(session.getDeptName()); {
online.setLoginName(session.getLoginName()); UserOnline online = new UserOnline();
online.setStartTimestamp(session.getStartTimestamp()); online.setSessionId(String.valueOf(session.getId()));
online.setLastAccessTime(session.getLastAccessTime()); online.setDeptName(session.getDeptName());
online.setExpireTime(session.getTimeout()); online.setLoginName(session.getLoginName());
online.setIpaddr(session.getHost()); online.setStartTimestamp(session.getStartTimestamp());
online.setLonginLocation(AddressUtils.getRealAddressByIP(session.getHost())); online.setLastAccessTime(session.getLastAccessTime());
online.setBrowser(session.getBrowser()); online.setExpireTime(session.getTimeout());
online.setOs(session.getOs()); online.setIpaddr(session.getHost());
online.setStatus(session.getStatus()); online.setLonginLocation(AddressUtils.getRealAddressByIP(session.getHost()));
online.setSession(session); online.setBrowser(session.getBrowser());
SpringUtils.getBean(IUserOnlineService.class).saveOnline(online); online.setOs(session.getOs());
online.setStatus(session.getStatus());
online.setSession(session);
SpringUtils.getBean(IUserOnlineService.class).saveOnline(online);
} }
}; };
} }
/**
* 记录 操作log
*
* @param rc
* @return
*/
public static TimerTask recordOper(final OperLog operLog) {
return new TimerTask() {
@Override
public void run() {
// 远程查询操作地点
operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp()));
SpringUtils.getBean(IOperLogService.class).insertOperlog(operLog);
}
};
}
/** /**
* 记录登陆信息 * 操作日志记录
* *
* @param username * @param operLog 操作日志信息
* @param status * @return 任务task
* @param message */
* @param userAgent public static TimerTask recordOper(final OperLog operLog)
* @param args {
* @return return new TimerTask()
*/ {
public static TimerTask recordLogininfor(final String username, final String status, final String message, final Object... args) { @Override
final UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent")); public void run()
return new TimerTask() { {
@Override // 远程查询操作地点
public void run() { operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp()));
StringBuilder s = new StringBuilder(); SpringUtils.getBean(IOperLogService.class).insertOperlog(operLog);
s.append(LogUtils.getBlock(ShiroUtils.getIp())); }
s.append(AddressUtils.getRealAddressByIP(ShiroUtils.getIp())); };
s.append(LogUtils.getBlock(username)); }
s.append(LogUtils.getBlock(status));
s.append(LogUtils.getBlock(message));
// 打印信息到日志
sys_user_logger.info(s.toString(), args);
// 获取客户端操作系统
String os = userAgent.getOperatingSystem().getName();
// 获取客户端浏览器
String browser = userAgent.getBrowser().getName();
// 封装对象
Logininfor logininfor = new Logininfor();
logininfor.setLoginName(username);
logininfor.setIpaddr(ShiroUtils.getIp());
logininfor.setLoginLocation(AddressUtils.getRealAddressByIP(ShiroUtils.getIp()));
logininfor.setBrowser(browser);
logininfor.setOs(os);
logininfor.setMsg(message);
// 日志状态
if (Constants.LOGIN_SUCCESS.equals(status) || Constants.LOGOUT.equals(status)) {
logininfor.setStatus(Constants.SUCCESS);
} else if (Constants.LOGIN_FAIL.equals(status)) {
logininfor.setStatus(Constants.FAIL);
}
// 插入数据
SpringUtils.getBean(LogininforServiceImpl.class).insertLogininfor(logininfor);
}
};
}
/**
* 记录登陆信息
*
* @param username 用户名
* @param status 状态
* @param message 消息
* @param args 列表
* @return 任务task
*/
public static TimerTask recordLogininfor(final String username, final String status, final String message, final Object... args)
{
final UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent"));
return new TimerTask()
{
@Override
public void run()
{
StringBuilder s = new StringBuilder();
s.append(LogUtils.getBlock(ShiroUtils.getIp()));
s.append(AddressUtils.getRealAddressByIP(ShiroUtils.getIp()));
s.append(LogUtils.getBlock(username));
s.append(LogUtils.getBlock(status));
s.append(LogUtils.getBlock(message));
// 打印信息到日志
sys_user_logger.info(s.toString(), args);
// 获取客户端操作系统
String os = userAgent.getOperatingSystem().getName();
// 获取客户端浏览器
String browser = userAgent.getBrowser().getName();
// 封装对象
Logininfor logininfor = new Logininfor();
logininfor.setLoginName(username);
logininfor.setIpaddr(ShiroUtils.getIp());
logininfor.setLoginLocation(AddressUtils.getRealAddressByIP(ShiroUtils.getIp()));
logininfor.setBrowser(browser);
logininfor.setOs(os);
logininfor.setMsg(message);
// 日志状态
if (Constants.LOGIN_SUCCESS.equals(status) || Constants.LOGOUT.equals(status))
{
logininfor.setStatus(Constants.SUCCESS);
}
else if (Constants.LOGIN_FAIL.equals(status))
{
logininfor.setStatus(Constants.FAIL);
}
// 插入数据
SpringUtils.getBean(LogininforServiceImpl.class).insertLogininfor(logininfor);
}
};
}
} }

172
src/main/java/com/ruoyi/framework/shiro/service/LoginService.java
View File

@ -3,7 +3,6 @@ package com.ruoyi.framework.shiro.service;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.ShiroConstants; import com.ruoyi.common.constant.ShiroConstants;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
@ -27,101 +26,104 @@ import com.ruoyi.project.system.user.service.IUserService;
* @author ruoyi * @author ruoyi
*/ */
@Component @Component
public class LoginService { public class LoginService
@Autowired {
private PasswordService passwordService; @Autowired
private PasswordService passwordService;
@Autowired @Autowired
private IUserService userService; private IUserService userService;
/** /**
* 登录 * 登录
*/ */
public User login(String username, String password) { public User login(String username, String password)
// 验证码校验 {
if (!StringUtils.isEmpty(ServletUtils.getRequest().getAttribute(ShiroConstants.CURRENT_CAPTCHA))) { // 验证码校验
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error"))); if (!StringUtils.isEmpty(ServletUtils.getRequest().getAttribute(ShiroConstants.CURRENT_CAPTCHA)))
// SystemLogUtils.log(username, Constants.LOGIN_FAIL, {
// MessageUtils.message("user.jcaptcha.error")); AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error")));
throw new CaptchaException(); throw new CaptchaException();
} }
// 用户名或密码为空 错误 // 用户名或密码为空 错误
if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password)) { if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password))
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("not.null"))); {
// SystemLogUtils.log(username, Constants.LOGIN_FAIL, AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("not.null")));
// MessageUtils.message("not.null")); throw new UserNotExistsException();
throw new UserNotExistsException(); }
} // 密码如果不在指定范围内 错误
// 密码如果不在指定范围内 错误 if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
if (password.length() < UserConstants.PASSWORD_MIN_LENGTH || password.length() > UserConstants.PASSWORD_MAX_LENGTH) { || password.length() > UserConstants.PASSWORD_MAX_LENGTH)
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match"))); {
// SystemLogUtils.log(username, Constants.LOGIN_FAIL, AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
// MessageUtils.message("user.password.not.match")); throw new UserPasswordNotMatchException();
throw new UserPasswordNotMatchException(); }
}
// 用户名不在指定范围内 错误 // 用户名不在指定范围内 错误
if (username.length() < UserConstants.USERNAME_MIN_LENGTH || username.length() > UserConstants.USERNAME_MAX_LENGTH) { if (username.length() < UserConstants.USERNAME_MIN_LENGTH
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match"))); || username.length() > UserConstants.USERNAME_MAX_LENGTH)
// SystemLogUtils.log(username, Constants.LOGIN_FAIL, {
// MessageUtils.message("user.password.not.match")); AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
throw new UserPasswordNotMatchException(); throw new UserPasswordNotMatchException();
} }
// 查询用户信息 // 查询用户信息
User user = userService.selectUserByLoginName(username); User user = userService.selectUserByLoginName(username);
if (user == null && maybeMobilePhoneNumber(username)) { if (user == null && maybeMobilePhoneNumber(username))
user = userService.selectUserByPhoneNumber(username); {
} user = userService.selectUserByPhoneNumber(username);
}
if (user == null && maybeEmail(username)) { if (user == null && maybeEmail(username))
user = userService.selectUserByEmail(username); {
} user = userService.selectUserByEmail(username);
}
if (user == null || UserStatus.DELETED.getCode().equals(user.getDelFlag())) { if (user == null || UserStatus.DELETED.getCode().equals(user.getDelFlag()))
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.not.exists"))); {
// SystemLogUtils.log(username, Constants.LOGIN_FAIL, AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.not.exists")));
// MessageUtils.message("user.not.exists")); throw new UserNotExistsException();
throw new UserNotExistsException(); }
}
passwordService.validate(user, password); passwordService.validate(user, password);
if (UserStatus.DISABLE.getCode().equals(user.getStatus())) { if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.blocked", user.getRemark()))); {
// SystemLogUtils.log(username, Constants.LOGIN_FAIL, AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.blocked", user.getRemark())));
// MessageUtils.message("user.blocked", user.getRemark())); throw new UserBlockedException(user.getRemark());
throw new UserBlockedException(user.getRemark()); }
} AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"))); recordLoginInfo(user);
// SystemLogUtils.log(username, Constants.LOGIN_SUCCESS, return user;
// MessageUtils.message("user.login.success")); }
recordLoginInfo(user);
return user;
}
private boolean maybeEmail(String username) { private boolean maybeEmail(String username)
if (!username.matches(UserConstants.EMAIL_PATTERN)) { {
return false; if (!username.matches(UserConstants.EMAIL_PATTERN))
} {
return true; return false;
} }
return true;
}
private boolean maybeMobilePhoneNumber(String username) { private boolean maybeMobilePhoneNumber(String username)
if (!username.matches(UserConstants.MOBILE_PHONE_NUMBER_PATTERN)) { {
return false; if (!username.matches(UserConstants.MOBILE_PHONE_NUMBER_PATTERN))
} {
return true; return false;
} }
return true;
}
/** /**
* 记录登录信息 * 记录登录信息
*/ */
public void recordLoginInfo(User user) { public void recordLoginInfo(User user)
user.setLoginIp(ShiroUtils.getIp()); {
user.setLoginDate(DateUtils.getNowDate()); user.setLoginIp(ShiroUtils.getIp());
userService.updateUserInfo(user); user.setLoginDate(DateUtils.getNowDate());
} userService.updateUserInfo(user);
}
} }

107
src/main/java/com/ruoyi/framework/shiro/service/PasswordService.java
View File

@ -1,16 +1,13 @@
package com.ruoyi.framework.shiro.service; package com.ruoyi.framework.shiro.service;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import org.apache.shiro.cache.Cache; import org.apache.shiro.cache.Cache;
import org.apache.shiro.cache.CacheManager; import org.apache.shiro.cache.CacheManager;
import org.apache.shiro.crypto.hash.Md5Hash; import org.apache.shiro.crypto.hash.Md5Hash;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.exception.user.UserPasswordNotMatchException; import com.ruoyi.common.exception.user.UserPasswordNotMatchException;
import com.ruoyi.common.exception.user.UserPasswordRetryLimitExceedException; import com.ruoyi.common.exception.user.UserPasswordRetryLimitExceedException;
@ -25,66 +22,70 @@ import com.ruoyi.project.system.user.domain.User;
* @author ruoyi * @author ruoyi
*/ */
@Component @Component
public class PasswordService { public class PasswordService
{
@Autowired @Autowired
private CacheManager cacheManager; private CacheManager cacheManager;
private Cache<String, AtomicInteger> loginRecordCache; private Cache<String, AtomicInteger> loginRecordCache;
@Value(value = "${user.password.maxRetryCount}") @Value(value = "${user.password.maxRetryCount}")
private String maxRetryCount; private String maxRetryCount;
@PostConstruct @PostConstruct
public void init() { public void init()
loginRecordCache = cacheManager.getCache("loginRecordCache"); {
} loginRecordCache = cacheManager.getCache("loginRecordCache");
}
public void validate(User user, String password) { public void validate(User user, String password)
String loginName = user.getLoginName(); {
String loginName = user.getLoginName();
AtomicInteger retryCount = loginRecordCache.get(loginName); AtomicInteger retryCount = loginRecordCache.get(loginName);
if (retryCount == null) { if (retryCount == null)
retryCount = new AtomicInteger(0); {
loginRecordCache.put(loginName, retryCount); retryCount = new AtomicInteger(0);
} loginRecordCache.put(loginName, retryCount);
if (retryCount.incrementAndGet() > Integer.valueOf(maxRetryCount).intValue()) { }
AsyncManager.me().execute(AsyncFactory.recordLogininfor(loginName, Constants.LOGIN_FAIL, MessageUtils.message("user.password.retry.limit.exceed"), maxRetryCount)); if (retryCount.incrementAndGet() > Integer.valueOf(maxRetryCount).intValue())
// SystemLogUtils.log(loginName, Constants.LOGIN_FAIL, {
// MessageUtils.message("user.password.retry.limit.exceed", AsyncManager.me().execute(AsyncFactory.recordLogininfor(loginName, Constants.LOGIN_FAIL, MessageUtils.message("user.password.retry.limit.exceed"), maxRetryCount));
// maxRetryCount)); throw new UserPasswordRetryLimitExceedException(Integer.valueOf(maxRetryCount).intValue());
throw new UserPasswordRetryLimitExceedException(Integer.valueOf(maxRetryCount).intValue()); }
}
if (!matches(user, password)) { if (!matches(user, password))
AsyncManager.me().execute(AsyncFactory.recordLogininfor(loginName, Constants.LOGIN_FAIL, MessageUtils.message("user.password.retry.limit.count"), retryCount, password)); {
// SystemLogUtils.log(loginName, Constants.LOGIN_FAIL, AsyncManager.me().execute(AsyncFactory.recordLogininfor(loginName, Constants.LOGIN_FAIL, MessageUtils.message("user.password.retry.limit.count"), retryCount, password));
// MessageUtils.message("user.password.retry.limit.count", loginRecordCache.put(loginName, retryCount);
// retryCount, password)); throw new UserPasswordNotMatchException();
loginRecordCache.put(loginName, retryCount); }
throw new UserPasswordNotMatchException(); else
} else { {
clearLoginRecordCache(loginName); clearLoginRecordCache(loginName);
} }
} }
public boolean matches(User user, String newPassword) { public boolean matches(User user, String newPassword)
return user.getPassword().equals(encryptPassword(user.getLoginName(), newPassword, user.getSalt())); {
} return user.getPassword().equals(encryptPassword(user.getLoginName(), newPassword, user.getSalt()));
}
public void clearLoginRecordCache(String username) { public void clearLoginRecordCache(String username)
loginRecordCache.remove(username); {
} loginRecordCache.remove(username);
}
public String encryptPassword(String username, String password, String salt) { public String encryptPassword(String username, String password, String salt)
return new Md5Hash(username + password + salt).toHex().toString(); {
} return new Md5Hash(username + password + salt).toHex().toString();
}
public static void main(String[] args) { public static void main(String[] args)
// System.out.println(new PasswordService().encryptPassword("admin", {
// "admin123", "111111")); System.out.println(new PasswordService().encryptPassword("admin", "admin123", "111111"));
// System.out.println(new PasswordService().encryptPassword("ry", System.out.println(new PasswordService().encryptPassword("ry", "admin123", "222222"));
// "admin123", "222222")); }
}
} }

165
src/main/java/com/ruoyi/framework/shiro/session/OnlineSessionDAO.java
View File

@ -2,12 +2,10 @@ package com.ruoyi.framework.shiro.session;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import org.apache.shiro.session.Session; import org.apache.shiro.session.Session;
import org.apache.shiro.session.mgt.eis.EnterpriseCacheSessionDAO; import org.apache.shiro.session.mgt.eis.EnterpriseCacheSessionDAO;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import com.ruoyi.framework.manager.AsyncManager; import com.ruoyi.framework.manager.AsyncManager;
import com.ruoyi.framework.manager.factory.AsyncFactory; import com.ruoyi.framework.manager.factory.AsyncFactory;
import com.ruoyi.project.monitor.online.domain.OnlineSession; import com.ruoyi.project.monitor.online.domain.OnlineSession;
@ -19,90 +17,101 @@ import com.ruoyi.project.monitor.online.service.IUserOnlineService;
* *
* @author ruoyi * @author ruoyi
*/ */
public class OnlineSessionDAO extends EnterpriseCacheSessionDAO { public class OnlineSessionDAO extends EnterpriseCacheSessionDAO
/** {
* 同步session到数据库的周期 单位为毫秒（默认1分钟） /**
*/ * 同步session到数据库的周期 单位为毫秒（默认1分钟）
@Value("${shiro.session.dbSyncPeriod}") */
private int dbSyncPeriod; @Value("${shiro.session.dbSyncPeriod}")
private int dbSyncPeriod;
/** /**
* 上次同步数据库的时间戳 * 上次同步数据库的时间戳
*/ */
private static final String LAST_SYNC_DB_TIMESTAMP = OnlineSessionDAO.class.getName() + "LAST_SYNC_DB_TIMESTAMP"; private static final String LAST_SYNC_DB_TIMESTAMP = OnlineSessionDAO.class.getName() + "LAST_SYNC_DB_TIMESTAMP";
@Autowired @Autowired
private IUserOnlineService onlineService; private IUserOnlineService onlineService;
@Autowired @Autowired
private OnlineSessionFactory onlineSessionFactory; private OnlineSessionFactory onlineSessionFactory;
public OnlineSessionDAO() { public OnlineSessionDAO()
super(); {
} super();
}
public OnlineSessionDAO(long expireTime) { public OnlineSessionDAO(long expireTime)
super(); {
} super();
}
/** /**
* 根据会话ID获取会话 * 根据会话ID获取会话
* *
* @param sessionId * @param sessionId 会话ID
* 会话ID * @return ShiroSession
* @return ShiroSession */
*/ @Override
@Override protected Session doReadSession(Serializable sessionId)
protected Session doReadSession(Serializable sessionId) { {
UserOnline userOnline = onlineService.selectOnlineById(String.valueOf(sessionId)); UserOnline userOnline = onlineService.selectOnlineById(String.valueOf(sessionId));
if (userOnline == null) { if (userOnline == null)
return null; {
} return null;
return onlineSessionFactory.createSession(userOnline); }
} return onlineSessionFactory.createSession(userOnline);
}
/** /**
* 更新会话；如更新会话最后访问时间/停止会话/设置超时时间/设置移除属性等会调用 * 更新会话；如更新会话最后访问时间/停止会话/设置超时时间/设置移除属性等会调用
*/ */
public void syncToDb(OnlineSession onlineSession) { public void syncToDb(OnlineSession onlineSession)
Date lastSyncTimestamp = (Date) onlineSession.getAttribute(LAST_SYNC_DB_TIMESTAMP); {
if (lastSyncTimestamp != null) { Date lastSyncTimestamp = (Date) onlineSession.getAttribute(LAST_SYNC_DB_TIMESTAMP);
boolean needSync = true; if (lastSyncTimestamp != null)
long deltaTime = onlineSession.getLastAccessTime().getTime() - lastSyncTimestamp.getTime(); {
if (deltaTime < dbSyncPeriod * 60 * 1000) { boolean needSync = true;
// 时间差不足 无需同步 long deltaTime = onlineSession.getLastAccessTime().getTime() - lastSyncTimestamp.getTime();
needSync = false; if (deltaTime < dbSyncPeriod * 60 * 1000)
} {
boolean isGuest = onlineSession.getUserId() == null || onlineSession.getUserId() == 0L; // 时间差不足 无需同步
needSync = false;
}
boolean isGuest = onlineSession.getUserId() == null || onlineSession.getUserId() == 0L;
// session 数据变更了 同步 // session 数据变更了 同步
if (isGuest == false && onlineSession.isAttributeChanged()) { if (isGuest == false && onlineSession.isAttributeChanged())
needSync = true; {
} needSync = true;
}
if (needSync == false) { if (needSync == false)
return; {
} return;
} }
onlineSession.setAttribute(LAST_SYNC_DB_TIMESTAMP, onlineSession.getLastAccessTime()); }
// 更新完后 重置标识 onlineSession.setAttribute(LAST_SYNC_DB_TIMESTAMP, onlineSession.getLastAccessTime());
if (onlineSession.isAttributeChanged()) { // 更新完后 重置标识
onlineSession.resetAttributeChanged(); if (onlineSession.isAttributeChanged())
} {
// onlineService.saveOnline(UserOnline.fromOnlineSession(onlineSession)); onlineSession.resetAttributeChanged();
AsyncManager.me().execute(AsyncFactory.syncSessionToDb(onlineSession)); }
} AsyncManager.me().execute(AsyncFactory.syncSessionToDb(onlineSession));
}
/** /**
* 当会话过期/停止（如用户退出时）属性等会调用 * 当会话过期/停止（如用户退出时）属性等会调用
*/ */
@Override @Override
protected void doDelete(Session session) { protected void doDelete(Session session)
OnlineSession onlineSession = (OnlineSession) session; {
if (null == onlineSession) { OnlineSession onlineSession = (OnlineSession) session;
return; if (null == onlineSession)
} {
onlineSession.setStatus(OnlineSession.OnlineStatus.off_line); return;
onlineService.deleteOnlineById(String.valueOf(onlineSession.getId())); }
} onlineSession.setStatus(OnlineSession.OnlineStatus.off_line);
onlineService.deleteOnlineById(String.valueOf(onlineSession.getId()));
}
} }

109
src/main/java/com/ruoyi/framework/shiro/web/filter/LogoutFilter.java
View File

@ -2,12 +2,10 @@ package com.ruoyi.framework.shiro.web.filter;
import javax.servlet.ServletRequest; import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse; import javax.servlet.ServletResponse;
import org.apache.shiro.session.SessionException; import org.apache.shiro.session.SessionException;
import org.apache.shiro.subject.Subject; import org.apache.shiro.subject.Subject;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.utils.MessageUtils; import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
@ -21,58 +19,69 @@ import com.ruoyi.project.system.user.domain.User;
* *
* @author ruoyi * @author ruoyi
*/ */
public class LogoutFilter extends org.apache.shiro.web.filter.authc.LogoutFilter { public class LogoutFilter extends org.apache.shiro.web.filter.authc.LogoutFilter
private static final Logger log = LoggerFactory.getLogger(LogoutFilter.class); {
private static final Logger log = LoggerFactory.getLogger(LogoutFilter.class);
/** /**
* 退出后重定向的地址 * 退出后重定向的地址
*/ */
private String loginUrl; private String loginUrl;
public String getLoginUrl() { public String getLoginUrl()
return loginUrl; {
} return loginUrl;
}
public void setLoginUrl(String loginUrl) { public void setLoginUrl(String loginUrl)
this.loginUrl = loginUrl; {
} this.loginUrl = loginUrl;
}
@Override @Override
protected boolean preHandle(ServletRequest request, ServletResponse response) throws Exception { protected boolean preHandle(ServletRequest request, ServletResponse response) throws Exception
try { {
Subject subject = getSubject(request, response); try
String redirectUrl = getRedirectUrl(request, response, subject); {
try { Subject subject = getSubject(request, response);
User user = ShiroUtils.getUser(); String redirectUrl = getRedirectUrl(request, response, subject);
if (StringUtils.isNotNull(user)) { try
String loginName = user.getLoginName(); {
// 记录用户退出日志 User user = ShiroUtils.getUser();
AsyncManager.me().execute(AsyncFactory.recordLogininfor(loginName, Constants.LOGOUT, MessageUtils.message("user.logout.success"))); if (StringUtils.isNotNull(user))
// SystemLogUtils.log(loginName, Constants.LOGOUT, {
// MessageUtils.message("user.logout.success")); String loginName = user.getLoginName();
} // 记录用户退出日志
// 退出登录 AsyncManager.me().execute(AsyncFactory.recordLogininfor(loginName, Constants.LOGOUT, MessageUtils.message("user.logout.success")));
subject.logout(); }
} catch (SessionException ise) { // 退出登录
log.error("logout fail.", ise); subject.logout();
} }
issueRedirect(request, response, redirectUrl); catch (SessionException ise)
} catch (Exception e) { {
log.error("Encountered session exception during logout. This can generally safely be ignored.", e); log.error("logout fail.", ise);
} }
return false; issueRedirect(request, response, redirectUrl);
} }
catch (Exception e)
{
log.error("Encountered session exception during logout. This can generally safely be ignored.", e);
}
return false;
}
/** /**
* 退出跳转URL * 退出跳转URL
*/ */
@Override @Override
protected String getRedirectUrl(ServletRequest request, ServletResponse response, Subject subject) { protected String getRedirectUrl(ServletRequest request, ServletResponse response, Subject subject)
String url = getLoginUrl(); {
if (StringUtils.isNotEmpty(url)) { String url = getLoginUrl();
return url; if (StringUtils.isNotEmpty(url))
} {
return super.getRedirectUrl(request, response, subject); return url;
} }
return super.getRedirectUrl(request, response, subject);
}
} }

256
src/main/java/com/ruoyi/project/monitor/online/domain/UserOnline.java
View File

@ -1,8 +1,6 @@
package com.ruoyi.project.monitor.online.domain; package com.ruoyi.project.monitor.online.domain;
import java.util.Date; import java.util.Date;
import com.ruoyi.common.utils.AddressUtils;
import com.ruoyi.framework.web.domain.BaseEntity; import com.ruoyi.framework.web.domain.BaseEntity;
import com.ruoyi.project.monitor.online.domain.OnlineSession.OnlineStatus; import com.ruoyi.project.monitor.online.domain.OnlineSession.OnlineStatus;
@ -11,164 +9,172 @@ import com.ruoyi.project.monitor.online.domain.OnlineSession.OnlineStatus;
* *
* @author ruoyi * @author ruoyi
*/ */
public class UserOnline extends BaseEntity { public class UserOnline extends BaseEntity
private static final long serialVersionUID = 1L; {
/** 用户会话id */ private static final long serialVersionUID = 1L;
private String sessionId; /** 用户会话id */
private String sessionId;
/** 部门名称 */ /** 部门名称 */
private String deptName; private String deptName;
/** 登录名称 */ /** 登录名称 */
private String loginName; private String loginName;
/** 登录IP地址 */ /** 登录IP地址 */
private String ipaddr; private String ipaddr;
/** 登录地址 */ /** 登录地址 */
private String longinLocation; private String longinLocation;
/** 浏览器类型 */ /** 浏览器类型 */
private String browser; private String browser;
/** 操作系统 */ /** 操作系统 */
private String os; private String os;
/** session创建时间 */ /** session创建时间 */
private Date startTimestamp; private Date startTimestamp;
/** session最后访问时间 */ /** session最后访问时间 */
private Date lastAccessTime; private Date lastAccessTime;
/** 超时时间，单位为分钟 */ /** 超时时间，单位为分钟 */
private Long expireTime; private Long expireTime;
/** 在线状态 */ /** 在线状态 */
private OnlineStatus status = OnlineStatus.on_line; private OnlineStatus status = OnlineStatus.on_line;
/** 备份的当前用户会话 */ /** 备份的当前用户会话 */
private OnlineSession session; private OnlineSession session;
/** public String getSessionId()
* 设置session对象 {
*/ return sessionId;
@Deprecated }
public static final UserOnline fromOnlineSession(OnlineSession session) {
UserOnline online = new UserOnline();
online.setSessionId(String.valueOf(session.getId()));
online.setDeptName(session.getDeptName());
online.setLoginName(session.getLoginName());
online.setStartTimestamp(session.getStartTimestamp());
online.setLastAccessTime(session.getLastAccessTime());
online.setExpireTime(session.getTimeout());
online.setIpaddr(session.getHost());
online.setLonginLocation(AddressUtils.getRealAddressByIP(session.getHost()));
online.setBrowser(session.getBrowser());
online.setOs(session.getOs());
online.setStatus(session.getStatus());
online.setSession(session);
return online;
}
public String getSessionId() { public void setSessionId(String sessionId)
return sessionId; {
} this.sessionId = sessionId;
}
public void setSessionId(String sessionId) { public String getDeptName()
this.sessionId = sessionId; {
} return deptName;
}
public String getDeptName() { public void setDeptName(String deptName)
return deptName; {
} this.deptName = deptName;
}
public void setDeptName(String deptName) { public String getLoginName()
this.deptName = deptName; {
} return loginName;
}
public String getLoginName() { public void setLoginName(String loginName)
return loginName; {
} this.loginName = loginName;
}
public void setLoginName(String loginName) { public String getIpaddr()
this.loginName = loginName; {
} return ipaddr;
}
public String getIpaddr() { public void setIpaddr(String ipaddr)
return ipaddr; {
} this.ipaddr = ipaddr;
}
public void setIpaddr(String ipaddr) { public String getLonginLocation()
this.ipaddr = ipaddr; {
} return longinLocation;
}
public String getLonginLocation() { public void setLonginLocation(String longinLocation)
return longinLocation; {
} this.longinLocation = longinLocation;
}
public void setLonginLocation(String longinLocation) { public String getBrowser()
this.longinLocation = longinLocation; {
} return browser;
}
public String getBrowser() { public void setBrowser(String browser)
return browser; {
} this.browser = browser;
}
public void setBrowser(String browser) { public String getOs()
this.browser = browser; {
} return os;
}
public String getOs() { public void setOs(String os)
return os; {
} this.os = os;
}
public void setOs(String os) { public Date getStartTimestamp()
this.os = os; {
} return startTimestamp;
}
public Date getStartTimestamp() { public void setStartTimestamp(Date startTimestamp)
return startTimestamp; {
} this.startTimestamp = startTimestamp;
}
public void setStartTimestamp(Date startTimestamp) { public Date getLastAccessTime()
this.startTimestamp = startTimestamp; {
} return lastAccessTime;
}
public Date getLastAccessTime() { public void setLastAccessTime(Date lastAccessTime)
return lastAccessTime; {
} this.lastAccessTime = lastAccessTime;
}
public void setLastAccessTime(Date lastAccessTime) { public Long getExpireTime()
this.lastAccessTime = lastAccessTime; {
} return expireTime;
}
public Long getExpireTime() { public void setExpireTime(Long expireTime)
return expireTime; {
} this.expireTime = expireTime;
}
public void setExpireTime(Long expireTime) { public OnlineStatus getStatus()
this.expireTime = expireTime; {
} return status;
}
public OnlineStatus getStatus() { public void setStatus(OnlineStatus status)
return status; {
} this.status = status;
}
public void setStatus(OnlineStatus status) { public OnlineSession getSession()
this.status = status; {
} return session;
}
public OnlineSession getSession() { public void setSession(OnlineSession session)
return session; {
} this.session = session;
}
public void setSession(OnlineSession session) { @Override
this.session = session; public String toString()
} {
return "UserOnline [sessionId=" + sessionId + ", deptName=" + deptName + ", loginName=" + loginName
@Override + ", ipaddr=" + ipaddr + ", browser=" + browser + ", os=" + os + ", startTimestamp=" + startTimestamp
public String toString() { + ", lastAccessTime=" + lastAccessTime + ", expireTime=" + expireTime + ", status=" + status
return "UserOnline [sessionId=" + sessionId + ", deptName=" + deptName + ", loginName=" + loginName + ", ipaddr=" + ipaddr + ", browser=" + browser + ", os=" + os + ", startTimestamp=" + startTimestamp + ", lastAccessTime=" + lastAccessTime + ", expireTime=" + expireTime + ", status=" + status + ", session=" + session + "]"; + ", session=" + session + "]";
} }
} }