fix: fix get baseURL

rookie-luochao · Apr 20, 2024 · da0d9e4 · da0d9e4
1 parent 09d7cb5
commit da0d9e4
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/README-zh_CN.md b/README-zh_CN.md
@@ -54,7 +54,7 @@
   </head>
   <body>
     <div id="openapi-ui-container" spec-url="https://petstore3.swagger.io/api/v3/openapi.json"></div>
-    <script src="https://cdn.jsdelivr.net/npm/openapi-ui-dist@2.0.0/lib/openapi-ui.umd.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/openapi-ui-dist@latest/lib/openapi-ui.umd.js"></script>
   </body>
 </html>
 ```

diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@ OpenAPI/Swagger UI document, quickly generate mock params and call api, also sim
   </head>
   <body>
     <div id="openapi-ui-container" spec-url="https://petstore3.swagger.io/api/v3/openapi.json"></div>
-    <script src="https://cdn.jsdelivr.net/npm/openapi-ui-dist@2.0.0/lib/openapi-ui.umd.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/openapi-ui-dist@latest/lib/openapi-ui.umd.js"></script>
   </body>
 </html>
 ```

diff --git a/src/components/head/index.tsx b/src/components/head/index.tsx
@@ -82,7 +82,7 @@ export function Head() {
   }, []);
 
   async function refetchOpenapiInfo(url: string, isCallBySearchInput?: boolean) {
-    const res = await request(Object.assign({ url: url }));
+    const res = await request({ url: url });
 
     if (res?.status >= 200 && res?.status < 300) {
       const openapi = await parseSwaggerOrOpenapi(res.data);

diff --git a/src/components/package-config/index.tsx b/src/components/package-config/index.tsx
@@ -19,7 +19,7 @@ export function InitPackageConfig() {
   }, []);
 
   async function fetchOpenapiInfo(url: string) {
-    const res = await request(Object.assign({ url: url }));
+    const res = await request({ url: url });
 
     if (res?.status >= 200 && res?.status < 300) {
       const openapi = await parseSwaggerOrOpenapi(res.data);

diff --git a/src/openapi/util.ts b/src/openapi/util.ts
@@ -1,4 +1,5 @@
 import { keys, map, replace } from "lodash-es";
+import { urlRegex } from "../core/regex";
 import { dsc } from "../core/style/defaultStyleConfig";
 import { IMethodType, IRequestBody, MethodType } from "./type";
 
@@ -80,8 +81,12 @@ export function getAxiosBasePathByUrl(url: string) {
     return "//serviceURL";
   }
 
-  const tmpStrs = url.split("//");
-  const basePath = `${tmpStrs[0]}//${tmpStrs[1].split("/")[0]}`;
+  let basePath = "";
+
+  if (urlRegex.test(url)) {
+    const tmpStrs = url.split("//");
+    basePath = `${tmpStrs[0]}//${tmpStrs[1].split("/")[0]}`;
+  }
 
   return basePath;
 }