浏览代码

修改bug

liubo 3 年之前
父节点
当前提交
66140cb3a2
共有 1 个文件被更改,包括 6 次插入7 次删除
  1. 6 7
      zd-common/common-core/src/main/java/com/zd/common/core/aspect/ResponseAdvice.java

+ 6 - 7
zd-common/common-core/src/main/java/com/zd/common/core/aspect/ResponseAdvice.java

@@ -13,7 +13,6 @@ import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
 
-import java.lang.reflect.Type;
 import java.util.Map;
 
 /**
@@ -29,12 +28,7 @@ public class ResponseAdvice implements ResponseBodyAdvice<Object> {
 
     @Override
     public boolean supports(MethodParameter methodParameter, Class<? extends HttpMessageConverter<?>> aClass) {
-        Type type = methodParameter.getGenericParameterType();
-        return !type.equals(TableDataInfo.class) &&
-                !type.equals(AjaxResult.class) &&
-                !type.equals(ResultData.class) &&
-                !type.equals(R.class) &&
-                !type.equals(String.class);
+        return true;
     }
 
     @Override
@@ -44,6 +38,11 @@ public class ResponseAdvice implements ResponseBodyAdvice<Object> {
                                   ServerHttpRequest serverHttpRequest,
                                   ServerHttpResponse serverHttpResponse) {
 
+        if(o instanceof TableDataInfo || o instanceof AjaxResult || o instanceof ResultData
+                || o instanceof R || o instanceof String){
+            return o;
+        }
+
         if (methodParameter.getMethod().getName().equals("error")) {
             return ResultData.fail(((Map<String, Object>) o).get("error").toString());
         }