fix(api): 修正API拦截器中的URL处理逻辑

Encaik · Sep 29, 2024 · 16c3b34 · 16c3b34 · vercel · Sep 29, 2024
1 parent fcfd73f
commit 16c3b34
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/proxy.conf.js b/proxy.conf.js
@@ -1,7 +1,7 @@
 module.exports = {
   '/api': {
-    // target: 'https://wanjie-api.vercel.app',
-    target: 'http://localhost:3000',
+    target: 'https://wanjie-api.vercel.app',
+    // target: 'http://localhost:3000',
     secure: false,
     changeOrigin: true,
     logLevel: 'debug'

diff --git a/src/app/interceptors/api-interceptor.interceptor.ts b/src/app/interceptors/api-interceptor.interceptor.ts
@@ -2,10 +2,12 @@ import { HttpInterceptorFn } from '@angular/common/http';
 import { environment } from 'environments/environment';
 
 export const apiInterceptor: HttpInterceptorFn = (req, next) => {
-  if (req.url.startsWith('/api')) {
-    const newUrl = `${environment.apiUrl}${req.url}`;
-    const modifiedReq = req.clone({ url: newUrl });
-    return next(modifiedReq);
+  // 统一加上服务端前缀
+  let url = req.url;
+  if (!url.startsWith('https://') && !url.startsWith('http://')) {
+    const { apiUrl } = environment;
+    url = apiUrl + (apiUrl.endsWith('/') && url.startsWith('/') ? url.substring(1) : url);
   }
-  return next(req);
+  const newReq = req.clone({ url });
+  return next(newReq);
 };