diff --git a/docus-api-common/src/main/java/com/docus/server/common/GlobalResponseBodyAdvice.java b/docus-api-common/src/main/java/com/docus/server/common/GlobalResponseBodyAdvice.java index e54008c..f9d985b 100644 --- a/docus-api-common/src/main/java/com/docus/server/common/GlobalResponseBodyAdvice.java +++ b/docus-api-common/src/main/java/com/docus/server/common/GlobalResponseBodyAdvice.java @@ -33,7 +33,7 @@ public class GlobalResponseBodyAdvice implements ResponseBodyAdvice { ServerHttpRequest request, ServerHttpResponse response) { String path = request.getURI().getPath(); // 跟swagger冲突,跳出response包装 - if (path.contains("swagger") || path.contains("api-docs") || path.contains("/monitor/url-mappings")) { + if (path.contains("swagger") || path.contains("api-docs") || path.contains("error") || path.contains("/monitor/url-mappings")) { return body; } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskConfigApi.java b/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskConfigApi.java index e92c2e1..b2f57a6 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskConfigApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskConfigApi.java @@ -22,7 +22,7 @@ import java.util.List; */ @Api(value = "主动消息任务管理接口", tags = "主动消息任务管理接口") @FeignClient(value = "docus-collector-api", contextId = "docus-collector-api.TaskConfigApi") -@RequestMapping("/taskConfig") +@RequestMapping("/collect/taskConfig") public interface TaskConfigApi { /** diff --git a/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskConfigRetryLogApi.java b/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskConfigRetryLogApi.java index 93f7cd0..8940be8 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskConfigRetryLogApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskConfigRetryLogApi.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping; */ @Api(value = "主动消息任务重试日志管理接口", tags = "主动消息任务重试日志管理接口") @FeignClient(value = "tsms-auth-api", contextId = "tsms-auth-api.TaskConfigRetryLogApi") -@RequestMapping("/taskConfigRetryLog") +@RequestMapping("/collect/taskConfigRetryLog") public interface TaskConfigRetryLogApi { /** diff --git a/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskMessageApi.java b/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskMessageApi.java index a07a589..05f3465 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskMessageApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskMessageApi.java @@ -22,7 +22,7 @@ import java.util.List; */ @Api(value = "被动消息任务管理接口", tags = "被动消息任务管理接口") @FeignClient(value = "docus-collector-api", contextId = "docus-collector-api.TaskMessageApi") -@RequestMapping("/taskMessage") +@RequestMapping("/collect/taskMessage") public interface TaskMessageApi { /** diff --git a/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskMessageRetryLogApi.java b/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskMessageRetryLogApi.java index cf2acb2..7999766 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskMessageRetryLogApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskMessageRetryLogApi.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping; */ @Api(value = "被动消息任务重试日志管理接口", tags = "被动消息任务重试日志管理接口") @FeignClient(value = "docus-collector-api", contextId = "docus-collector-api.TaskMessageRetryLogApi") -@RequestMapping("/taskMessageRetryLog") +@RequestMapping("/collect/taskMessageRetryLog") public interface TaskMessageRetryLogApi { /**