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 55f6abc6..6c44bb78 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 @@ -7,7 +7,6 @@ import cn.hutool.http.Method; import com.zyplayer.doc.core.exception.ConfirmException; import com.zyplayer.doc.data.repository.manage.entity.SwaggerGlobalParam; import com.zyplayer.doc.data.service.manage.SwaggerGlobalParamService; -import com.zyplayer.doc.swaggerplus.controller.param.ParamData; import com.zyplayer.doc.swaggerplus.controller.param.ProxyRequestParam; import com.zyplayer.doc.swaggerplus.controller.vo.HttpCookieVo; import com.zyplayer.doc.swaggerplus.controller.vo.HttpHeaderVo; @@ -15,6 +14,7 @@ import com.zyplayer.doc.swaggerplus.controller.vo.ProxyRequestResultVo; import com.zyplayer.doc.swaggerplus.framework.utils.SwaggerDocUtil; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; +import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; @@ -149,11 +149,12 @@ public class SwaggerHttpRequestService { httpCookies.add(new HttpCookie(cookie.getName(), cookie.getValue())); } if (StringUtils.isNotBlank(headerCookie)) { - for (String cookie : headerCookie.split(";")) { - cookie = cookie.trim(); - int index = cookie.indexOf("="); - httpCookies.add(new HttpCookie(cookie.substring(0, index), cookie.substring(index + 1))); - } + Arrays.stream(headerCookie.split(";")).map(String::trim).forEach(cookie -> { + String[] cookieArr = StringUtils.split(cookie, "=", 2); + if (ArrayUtils.getLength(cookieArr) == 2) { + httpCookies.add(new HttpCookie(cookieArr[0], cookieArr[1])); + } + }); } if (MapUtils.isNotEmpty(globalCookieParamMap)) { globalCookieParamMap.forEach((key, value) -> httpCookies.add(new HttpCookie(key, value))); diff --git a/zyplayer-doc-ui/swagger-ui/src/assets/utils/unitConvert.js b/zyplayer-doc-ui/swagger-ui/src/assets/utils/unitConvert.js new file mode 100644 index 00000000..75aba2e8 --- /dev/null +++ b/zyplayer-doc-ui/swagger-ui/src/assets/utils/unitConvert.js @@ -0,0 +1,32 @@ +export default { + formatSeconds(value) { + let result = parseInt(value); + let second = result / 1000; + let s = Math.floor(second % 60); + let ms = (result % 1000); + if (s > 0) return `${s}.${ms} s`; + return `${ms} ms`; + }, + formatFileSize(fileSize) { + if (!fileSize) { + return '0 B'; + } + let size = ""; + if (fileSize < 0.1 * 1024) { + size = fileSize.toFixed(2) + " B" + } else if (fileSize < 0.1 * 1024 * 1024) { + size = (fileSize / 1024).toFixed(2) + " KB" + } else if (fileSize < 0.1 * 1024 * 1024 * 1024) { + size = (fileSize / (1024 * 1024)).toFixed(2) + " MB" + } else { + size = (fileSize / (1024 * 1024 * 1024)).toFixed(2) + " GB" + } + let sizeStr = size + ""; + let index = sizeStr.indexOf("."); + let dou = sizeStr.substr(index + 1, 2); + if (dou == "00") { + return sizeStr.substring(0, index) + sizeStr.substr(index + 3, 2) + } + return size; + }, +} diff --git a/zyplayer-doc-ui/swagger-ui/src/components/layouts/EmptyKeepAliveLayout.vue b/zyplayer-doc-ui/swagger-ui/src/components/layouts/EmptyKeepAliveLayout.vue new file mode 100644 index 00000000..a3683061 --- /dev/null +++ b/zyplayer-doc-ui/swagger-ui/src/components/layouts/EmptyKeepAliveLayout.vue @@ -0,0 +1,19 @@ + + + diff --git a/zyplayer-doc-ui/swagger-ui/src/components/layouts/MenuLayout.vue b/zyplayer-doc-ui/swagger-ui/src/components/layouts/MenuLayout.vue index 3760342d..d6cfce93 100644 --- a/zyplayer-doc-ui/swagger-ui/src/components/layouts/MenuLayout.vue +++ b/zyplayer-doc-ui/swagger-ui/src/components/layouts/MenuLayout.vue @@ -35,7 +35,7 @@