Merge pull request #24 from samuikaze/dev

Merge into main branch
samuikaze · Sep 17, 2023 · 83e15e9 · 83e15e9
2 parents 93ef027 + de00c35
commit 83e15e9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/app/services/app-environment-service/app-environment.service.ts b/src/app/services/app-environment-service/app-environment.service.ts
@@ -1,20 +1,21 @@
-import { HttpClient, HttpErrorResponse } from '@angular/common/http';
-import { Injectable, inject, isDevMode } from '@angular/core';
+import { HttpErrorResponse } from '@angular/common/http';
+import { Injectable } from '@angular/core';
 import { environment } from 'src/environments/environment';
+import { RequestService } from '../request-service/request.service';
 
 @Injectable({
   providedIn: 'root',
 })
 export class AppEnvironmentService {
   private configFromJson?: any = undefined;
-  constructor(private httpClient: HttpClient) {}
+  constructor(private requestService: RequestService) {}
 
   /**
    * 從 assets/configs.json 取得設定值
    */
   public retrievingConfigsFromJson(): Promise<boolean> {
     return new Promise<boolean>((resolve, reject) => {
-      this.httpClient.get('/assets/configs.json').subscribe({
+      this.requestService.get<any>('/assets/configs.json').subscribe({
         next: (response) => {
           this.configFromJson = response;
           resolve(true);

diff --git a/src/app/services/request-service/request.service.ts b/src/app/services/request-service/request.service.ts
@@ -30,11 +30,11 @@ export class RequestService {
     }
 
     const protocol = `${location.protocol}//`
-    const hostname = location.hostname;
-    const path = location.pathname;
-    const uri = originalUri.substring(1);
+    const hostname = location.host;
+    const path = location.pathname === '/' ? '' : location.pathname;
+    const uri = (originalUri.indexOf('/') === 0) ? `/${originalUri.substring(1)}` : originalUri;
 
-    return `${protocol}${hostname}${path}/${uri}`;
+    return `${protocol}${hostname}${path}${uri}`;
   }
 
   /**