fix(vercel): compat server url not root pathname

walinejs · Dec 14, 2020 · 17d402c · 17d402c
1 parent 0f92b8e
commit 17d402c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/admin/src/utils/request.js b/packages/admin/src/utils/request.js
@@ -21,7 +21,8 @@ export default async function request(url, opts = {}) {
     opts.headers.Authorization = `Bearer ${token}`;
   }
 
-  return fetch((globalThis.serverURL || '/')+ opts.url, opts).then(resp => {
+  const baseUrl = globalThis.serverURL || location.pathname.match(/(.*)?\/ui/)[1] || '/';
+  return fetch(baseUrl + opts.url, opts).then(resp => {
     if(resp.ok) {
       return resp.json();
     }

diff --git a/packages/server/src/controller/index.js b/packages/server/src/controller/index.js
@@ -15,7 +15,7 @@ module.exports = class extends think.Controller {
         new Waline({
           el: '#waline',
           path: '/',
-          serverURL: location.protocol + '//' + location.host
+          serverURL: location.protocol + '//' + location.host + location.pathname.slice(1)
         });
       </script>
     </body>