Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

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)) {

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

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java

@@ -152,6 +152,9 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
             logger.warn("queryUserBaseInfo return empty,userId:{}", userId);
             return null;
         }
+        if (userBaseInfoResultDTOS.size()> 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;