zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛 Fixing a bug. #2267 登录日志 未区分租户 日志表 中的tenant_id为0

Browse Source
This commit is contained in:
lbw committed 2021-01-13 10:13:45 +08:00
1 parent b80fce8c10
commit 14b5dacb64
2 files changed
+18 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pigx-auth/src/main/java/com/pig4cloud/pigx/auth/handler/PigxAuthenticationFailureEventHandler.java
+10 -5
View File
@@ -17,25 +17,27 @@
package com.pig4cloud.pigx.auth.handler;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.pig4cloud.pigx.admin.api.dto.SysLogDTO;
import com.pig4cloud.pigx.admin.api.feign.RemoteLogService;
import com.pig4cloud.pigx.common.core.constant.CommonConstants;
import com.pig4cloud.pigx.common.core.constant.SecurityConstants;
import com.pig4cloud.pigx.common.core.util.KeyStrResolver;
import com.pig4cloud.pigx.common.core.util.WebUtils;
import com.pig4cloud.pigx.common.log.util.LogTypeEnum;
import com.pig4cloud.pigx.common.log.util.SysLogUtils;
import com.pig4cloud.pigx.common.security.handler.AuthenticationFailureHandler;
import lombok.AllArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpHeaders;
import org.springframework.scheduling.annotation.Async;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.AuthenticationException;
import org.springframework.stereotype.Component;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
* @author lengleng
* @date 2018/10/8
@@ -47,6 +49,8 @@ public class PigxAuthenticationFailureEventHandler implements AuthenticationFail
private final RemoteLogService logService;
private final KeyStrResolver tenantKeyStrResolver;
/**
* 异步处理，登录失败方法
* <p>
@@ -63,11 +67,12 @@ public class PigxAuthenticationFailureEventHandler implements AuthenticationFail
String username = authentication.getName();
SysLogDTO sysLog = SysLogUtils.getSysLog(request, username);
sysLog.setTitle(username + "用户登录");
sysLog.setType(CommonConstants.STATUS_LOCK);
sysLog.setType(LogTypeEnum.ERROR.getType());
sysLog.setParams(username);
sysLog.setException(authenticationException.getLocalizedMessage());
String header = request.getHeader(HttpHeaders.AUTHORIZATION);
sysLog.setServiceId(WebUtils.extractClientId(header).orElse("N/A"));
sysLog.setTenantId(Integer.parseInt(tenantKeyStrResolver.key()));
logService.saveLog(sysLog, SecurityConstants.FROM_IN);
pigx-auth/src/main/java/com/pig4cloud/pigx/auth/handler/PigxAuthenticationSuccessEventHandler.java
+8 -3
View File
@@ -17,22 +17,24 @@
package com.pig4cloud.pigx.auth.handler;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.pig4cloud.pigx.admin.api.dto.SysLogDTO;
import com.pig4cloud.pigx.admin.api.feign.RemoteLogService;
import com.pig4cloud.pigx.common.core.constant.SecurityConstants;
import com.pig4cloud.pigx.common.core.util.KeyStrResolver;
import com.pig4cloud.pigx.common.core.util.WebUtils;
import com.pig4cloud.pigx.common.log.util.SysLogUtils;
import com.pig4cloud.pigx.common.security.handler.AuthenticationSuccessHandler;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpHeaders;
import org.springframework.scheduling.annotation.Async;
import org.springframework.security.core.Authentication;
import org.springframework.stereotype.Component;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
* @author lengleng
* @date 2018/10/8
@@ -44,6 +46,8 @@ public class PigxAuthenticationSuccessEventHandler implements AuthenticationSucc
private final RemoteLogService logService;
private final KeyStrResolver tenantKeyStrResolver;
/**
* 处理登录成功方法
* <p>
@@ -61,6 +65,7 @@ public class PigxAuthenticationSuccessEventHandler implements AuthenticationSucc
sysLog.setParams(username);
String header = request.getHeader(HttpHeaders.AUTHORIZATION);
sysLog.setServiceId(WebUtils.extractClientId(header).orElse("N/A"));
sysLog.setTenantId(Integer.parseInt(tenantKeyStrResolver.key()));
logService.saveLog(sysLog, SecurityConstants.FROM_IN);
log.info("用户：{} 登录成功", username);