diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/DbTableRelationServiceImpl.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/DbTableRelationServiceImpl.java index 7dfcd4e1..c11ecc1b 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/DbTableRelationServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/DbTableRelationServiceImpl.java @@ -1,24 +1,20 @@ package com.zyplayer.doc.data.service.manage.impl; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.sun.jersey.server.impl.wadl.WadlResource; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zyplayer.doc.data.config.security.DocUserDetails; import com.zyplayer.doc.data.config.security.DocUserUtil; import com.zyplayer.doc.data.repository.manage.entity.DbTableRelation; import com.zyplayer.doc.data.repository.manage.mapper.DbTableRelationMapper; import com.zyplayer.doc.data.repository.manage.param.TableRelationParam; -import com.zyplayer.doc.data.repository.manage.vo.TableRelationVo; import com.zyplayer.doc.data.service.manage.DbTableRelationService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; -import java.util.*; +import java.util.Date; +import java.util.List; /** *

diff --git a/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/vo/ProxyRequestResultVo.java b/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/vo/ProxyRequestResultVo.java index d48a6a44..04a26aab 100644 --- a/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/vo/ProxyRequestResultVo.java +++ b/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/vo/ProxyRequestResultVo.java @@ -8,7 +8,7 @@ public class ProxyRequestResultVo { private List headers; private Integer status; private Long useTime; - private Integer bodyLength; + private Integer contentLength; private String data; private String errorMsg; @@ -60,11 +60,11 @@ public class ProxyRequestResultVo { this.errorMsg = errorMsg; } - public Integer getBodyLength() { - return bodyLength; + public Integer getContentLength() { + return contentLength; } - public void setBodyLength(Integer bodyLength) { - this.bodyLength = bodyLength; + public void setContentLength(Integer contentLength) { + this.contentLength = contentLength; } } diff --git a/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/service/SwaggerHttpRequestService.java b/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/service/SwaggerHttpRequestService.java index 6c44bb78..b99551a9 100644 --- a/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/service/SwaggerHttpRequestService.java +++ b/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/service/SwaggerHttpRequestService.java @@ -111,7 +111,7 @@ public class SwaggerHttpRequestService { HttpResponse httpResponse = httpRequest.timeout(10000).execute(); resultVo.setData(httpResponse.body()); resultVo.setStatus(httpResponse.getStatus()); - resultVo.setBodyLength(httpResponse.bodyBytes().length); + resultVo.setContentLength(httpResponse.bodyBytes().length); // 设置返回的cookies List responseCookies = httpResponse.getCookies(); if (CollectionUtils.isNotEmpty(responseCookies)) { diff --git a/zyplayer-doc-ui/swagger-ui/src/components/layouts/PageLayout.vue b/zyplayer-doc-ui/swagger-ui/src/components/layouts/PageLayout.vue index ff4ffc45..0d4b0b84 100644 --- a/zyplayer-doc-ui/swagger-ui/src/components/layouts/PageLayout.vue +++ b/zyplayer-doc-ui/swagger-ui/src/components/layouts/PageLayout.vue @@ -1,6 +1,6 @@ - + diff --git a/zyplayer-doc-ui/swagger-ui/src/views/doc/docView/DocDebuggerResult.vue b/zyplayer-doc-ui/swagger-ui/src/views/doc/docView/DocDebuggerResult.vue index 5f12de8c..3cae78c9 100644 --- a/zyplayer-doc-ui/swagger-ui/src/views/doc/docView/DocDebuggerResult.vue +++ b/zyplayer-doc-ui/swagger-ui/src/views/doc/docView/DocDebuggerResult.vue @@ -1,52 +1,74 @@ @@ -72,6 +94,10 @@ type: Object, required: true }, + loading: { + type: Boolean, + required: true + }, }, components: { CloseOutlined, ParamTable, ParamBody, aceEditor @@ -109,6 +135,8 @@ if (contentType && contentType.value) { if (contentType.value.indexOf('text/html') >= 0) { bodyShowFormatType.value = 'html'; + } else if (contentType.value.indexOf('text/plain') >= 0) { + bodyShowFormatType.value = 'text'; } else if (contentType.value.indexOf('application/json') >= 0) { bodyShowFormatType.value = 'json'; } else if (contentType.value.indexOf('application/xml') >= 0 || contentType.value.indexOf('text/xml') >= 0) {