Explorar o código

查询对象,支持跨项目查询

yucheng %!s(int64=3) %!d(string=hai) anos
pai
achega
b149e95fa6

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/controller/ObjectDigitalController.java

@@ -50,7 +50,7 @@ public class ObjectDigitalController{
             throw new BusinessException(ResponseCode.A0400.getCode(), ResponseCode.A0400.getDesc());
         }
         //基础参数校验
-        ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE,CommonConstant.QUERY_PROJECTID);
+        ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE);
 
         QueryWrapper<ObjectDigital> wrapper = new QueryWrapper<>();
         // 添加所属项目条件

+ 3 - 1
dmp-common/src/main/java/com/persagy/dmp/common/config/CommonWebConfigurer.java

@@ -25,8 +25,10 @@ public class CommonWebConfigurer implements WebMvcConfigurer {
 
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
+        String[] includePaths = {"/**"};
+        String[] excludePaths = {"/**/*.html", "/**/*.js", "/**/*.css", "/swagger-resources"};
         // 设置拦截的路径、不拦截的路径、优先级等等
-        registry.addInterceptor(appContextHandler()).order(10).addPathPatterns("/**");
+        registry.addInterceptor(appContextHandler()).order(10).addPathPatterns(includePaths).excludePathPatterns(excludePaths);
     }
 
 }

+ 0 - 7
dmp-common/src/main/java/com/persagy/dmp/common/handler/AppContextHandler.java

@@ -18,15 +18,8 @@ import javax.servlet.http.HttpServletResponse;
  */
 public class AppContextHandler extends HandlerInterceptorAdapter {
 
-    /** 忽略的url - swagger的文档不校验 */
-    private static final String[] IGNORE_URL = {".html", ".js", ".css", "/swagger-resources"};
-
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        String requestURI = request.getRequestURI();
-        if (StrUtil.containsAny(requestURI, IGNORE_URL)) {
-            return true;
-        }
         // 运维平台token认证
         if(StrUtil.isNotBlank(request.getHeader("token"))) {
             accessTokenInfo(request.getHeader("token"));

+ 2 - 42
dmp-server/src/main/java/com/persagy/aspects/RequestLogAspect.java

@@ -1,9 +1,7 @@
 package com.persagy.aspects;
 
 import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.StrUtil;
-import com.persagy.dmp.common.context.AppContext;
-import com.persagy.dmp.common.helper.SpringHelper;
+import cn.hutool.extra.servlet.ServletUtil;
 import com.persagy.dmp.common.model.response.CommonResult;
 import com.persagy.utils.JacksonMapper;
 import lombok.extern.slf4j.Slf4j;
@@ -18,8 +16,6 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -100,7 +96,7 @@ public class RequestLogAspect {
 	private static LogData initFlag(HttpServletRequest request) {
 		LogData data = new LogData();
 		// 请求IP
-		data.remoteIp = getIpAddr();
+		data.remoteIp = ServletUtil.getClientIP(request, null);
 		// 请求端口
 		data.remotePort = request.getRemotePort();
 		data.timestamp = System.currentTimeMillis();
@@ -113,42 +109,6 @@ public class RequestLogAspect {
 		return data;
 	}
 
-	/**
-	 * Description:获取ip地址
-	 *
-	 * @return String
-	 * @author lijie
-	 * @since 2018年10月22日: 下午4:57:26
-	 * Update By lijie 2018年10月22日: 下午4:57:26
-	 */
-	public static String getIpAddr() {
-		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-		String ip = request.getHeader("x-forwarded-for");
-		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-			ip = request.getHeader("Proxy-Client-IP");
-		}
-		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-			ip = request.getHeader("WL-Proxy-Client-IP");
-		}
-		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-			ip = request.getRemoteAddr();
-			if (ip.equals("127.0.0.1")) {
-				// 根据网卡取本机配置的IP
-				try {
-					ip = InetAddress.getLocalHost().getHostAddress();
-				} catch (UnknownHostException e) {
-					log.error("获取本机IP信息失败:", e);
-				}
-			}
-		}
-		// 对于通过多个代理的情况,第一个IP为客户端真实IP,多个IP按照','分割
-		if (ip != null && ip.length() > 15) {
-			if (ip.indexOf(",") > 0) {
-				ip = ip.substring(0, ip.indexOf(","));
-			}
-		}
-		return ip;
-	}
 	/***
 	 * Description: 日志数据实体
 	 * @author : lijie