From e0c586890e320cdb830188c510fa1e254f437ee4 Mon Sep 17 00:00:00 2001 From: wxz Date: Sat, 9 Oct 2021 15:51:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?LoginUserHandlerMethodArgumentResolver?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=A7=A3=E6=9E=90=E5=99=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?uri=E7=9A=84=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoginUserHandlerMethodArgumentResolver.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/resolver/LoginUserHandlerMethodArgumentResolver.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/resolver/LoginUserHandlerMethodArgumentResolver.java index 5c725c2ec4..79ee2d538a 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/resolver/LoginUserHandlerMethodArgumentResolver.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/resolver/LoginUserHandlerMethodArgumentResolver.java @@ -27,8 +27,14 @@ import org.springframework.core.MethodParameter; import org.springframework.stereotype.Service; import org.springframework.web.bind.support.WebDataBinderFactory; import org.springframework.web.context.request.NativeWebRequest; +import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.method.support.ModelAndViewContainer; +import org.springframework.web.servlet.HandlerMapping; + +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import java.util.Map; /** * 有@LoginUser注解的方法参数，注入当前登录用户 @@ -68,6 +74,12 @@ public class LoginUserHandlerMethodArgumentResolver implements HandlerMethodArgu @Override public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer container, NativeWebRequest request, WebDataBinderFactory factory) throws Exception { + + HttpServletRequest nativeReq = (HttpServletRequest) request.getNativeRequest(); + String requestURI = nativeReq.getRequestURI(); + + logger.info("【LoginUserHandlerMethodArgumentResolver】请求uri:{}", requestURI); + //app-client-userId String redisKey = request.getHeader(Constant.APP_USER_KEY); if (StringUtils.isEmpty(redisKey)) { From 17d5d109619082f2c2a1c2617439e629150ee60c Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 9 Oct 2021 15:58:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=BC=93=E5=AD=98=20?= =?UTF-8?q?=E6=8E=92=E6=9F=A5=E4=B8=8B=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E5=A4=9A=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/UserBaseInfoServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java index acb101464e..0f4d76d821 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java @@ -152,6 +152,9 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl 1){ + logger.error("queryUserBaseInfoFromCache userId:{} exist more than one record",userId); + } UserBaseInfoResultDTO userBaseInfoResultDTO = userBaseInfoResultDTOS.get(0); logger.debug("getUserResiInfoDTO userId:{},result:{}", userId,JSON.toJSONString(userBaseInfoResultDTO)); return userBaseInfoResultDTO; From ea7a2e0492b54acb057465396f9c38619e679e33 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 9 Oct 2021 16:37:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?job=E5=BB=B6=E9=95=BF=E7=AD=89=E5=BE=85?= =?UTF-8?q?=E6=97=B6=E9=95=BF=2010=E5=88=86=E9=92=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-job/epmet-job-server/src/main/resources/bootstrap.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml index aa0d5545ed..e0dc62b7f0 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml @@ -113,7 +113,7 @@ hystrix: execution: isolation: thread: - timeoutInMilliseconds: 90000 #缺省为1000 + timeoutInMilliseconds: 600000 #缺省为1000 ribbon: ReadTimeout: 300000