public/RuoYi-Cloud-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Cloud-Plus.git synced 2026-05-11 22:32:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 优化 将logininfor规范化为loginInfo

Browse Source 
update 优化 规范DTO命名
add 新增注解类工具
update 优化 使用动态规划优化菜单树的构建
update 更新 统一枚举相关包名为enums
This commit is contained in:
疯狂的狮子Li
2026-03-19 12:03:58 +08:00
parent 6a8ca4a74d
commit e8fc7fb0df
55 changed files with 439 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogEventListener.java
View File

@@ -14,7 +14,7 @@ import org.dromara.common.core.utils.ip.AddressUtils;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.system.api.RemoteClientService;
import org.dromara.system.api.RemoteLogService;
import org.dromara.system.api.domain.bo.RemoteLogininforBo;
import org.dromara.system.api.domain.bo.RemoteLoginInfoBo;
import org.dromara.system.api.domain.bo.RemoteOperLogBo;
import org.dromara.system.api.domain.vo.RemoteClientVo;
import org.springframework.context.event.EventListener;
@@ -47,7 +47,7 @@ public class LogEventListener {
* 保存系统访问记录
*/
@EventListener
public void saveLogininfor(LogininforEvent logininforEvent) {
public void saveLoginInfo(LoginInfoEvent loginInfoEvent) {
HttpServletRequest request = ServletUtils.getRequest();
final UserAgent userAgent = UserAgentUtil.parse(request.getHeader("User-Agent"));
final String ip = ServletUtils.getClientIP(request);
@@ -62,34 +62,34 @@ public class LogEventListener {
StringBuilder s = new StringBuilder();
s.append(getBlock(ip));
s.append(address);
s.append(getBlock(logininforEvent.getUsername()));
s.append(getBlock(logininforEvent.getStatus()));
s.append(getBlock(logininforEvent.getMessage()));
s.append(getBlock(loginInfoEvent.getUsername()));
s.append(getBlock(loginInfoEvent.getStatus()));
s.append(getBlock(loginInfoEvent.getMessage()));
// 打印信息到日志
log.info(s.toString(), logininforEvent.getArgs());
log.info(s.toString(), loginInfoEvent.getArgs());
// 获取客户端操作系统
String os = userAgent.getOs().getName();
// 获取客户端浏览器
String browser = userAgent.getBrowser().getName();
// 封装对象
RemoteLogininforBo logininfor = new RemoteLogininforBo();
logininfor.setUserName(logininforEvent.getUsername());
RemoteLoginInfoBo loginInfo = new RemoteLoginInfoBo();
loginInfo.setUserName(loginInfoEvent.getUsername());
if (ObjectUtil.isNotNull(clientVo)) {
logininfor.setClientKey(clientVo.getClientKey());
logininfor.setDeviceType(clientVo.getDeviceType());
loginInfo.setClientKey(clientVo.getClientKey());
loginInfo.setDeviceType(clientVo.getDeviceType());
}
logininfor.setIpaddr(ip);
logininfor.setLoginLocation(address);
logininfor.setBrowser(browser);
logininfor.setOs(os);
logininfor.setMsg(logininforEvent.getMessage());
loginInfo.setIpaddr(ip);
loginInfo.setLoginLocation(address);
loginInfo.setBrowser(browser);
loginInfo.setOs(os);
loginInfo.setMsg(loginInfoEvent.getMessage());
// 日志状态
if (StringUtils.equalsAny(logininforEvent.getStatus(), Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER)) {
logininfor.setStatus(Constants.SUCCESS);
} else if (Constants.LOGIN_FAIL.equals(logininforEvent.getStatus())) {
logininfor.setStatus(Constants.FAIL);
if (StringUtils.equalsAny(loginInfoEvent.getStatus(), Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER)) {
loginInfo.setStatus(Constants.SUCCESS);
} else if (Constants.LOGIN_FAIL.equals(loginInfoEvent.getStatus())) {
loginInfo.setStatus(Constants.FAIL);
}
remoteLogService.saveLogininfor(logininfor);
remoteLogService.saveLoginInfo(loginInfo);
}
private String getBlock(Object msg) {

2
ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogininforEvent.java → ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LoginInfoEvent.java
View File

@@ -12,7 +12,7 @@ import java.io.Serializable;
*/
@Data
public class LogininforEvent implements Serializable {
public class LoginInfoEvent implements Serializable {
@Serial
private static final long serialVersionUID = 1L;