fix: remote source for web

Postcatlab · Jun 28, 2022 · 5e53f2a · 5e53f2a
1 parent 952d092
commit 5e53f2a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/workbench/browser/src/app/shared/components/setting/common/data-storage.component.ts b/src/workbench/browser/src/app/shared/components/setting/common/data-storage.component.ts
@@ -18,7 +18,7 @@ import { NzMessageService } from 'ng-zorro-antd/message';
           <p>Localhost: Store the data locally. You can only use the product on the current computer.</p>
           <p>
             Remote Server: Store data on a remote server to facilitate cross device use of the product.
-            <a href="" class="text-blue-400">Learn more...</a>
+            <a href="https://eoapi.io/docs/storage.html" target="_blank" class="eo_link"> Learn more...</a>
           </p>
         </div>
       </nz-form-item>

diff --git a/src/workbench/browser/src/app/shared/services/storage/http/lib/baseUrl.service.ts b/src/workbench/browser/src/app/shared/services/storage/http/lib/baseUrl.service.ts
@@ -1,13 +1,14 @@
-import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest, HttpResponse } from "@angular/common/http";
-import { Injectable } from "@angular/core";
-import { filter, map, Observable } from "rxjs";
+import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest, HttpResponse } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { RemoteService } from 'eo/workbench/browser/src/app/shared/services/remote/remote.service';
+import { filter, map, Observable } from 'rxjs';
 const protocolReg = new RegExp('^(http|https)://');
 
 // implements StorageInterface
 @Injectable()
-export class BaseUrlInterceptor implements HttpInterceptor {
+export class BaseUrlInterceptor extends RemoteService implements HttpInterceptor {
   intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
-    const { url = '', token = '' } = window.eo?.getModuleSettings?.('eoapi-common.remoteServer') || {};
+    const { url = '', token = '' } = this.getConfiguration('eoapi-common.remoteServer') || {};
     req = req.clone({
       url: protocolReg.test(req.url) ? req.url : url + req.url,
       headers: req.headers.append('x-api-key', token),
@@ -18,4 +19,4 @@ export class BaseUrlInterceptor implements HttpInterceptor {
       map((event: HttpResponse<any>) => event.clone({ body: { status: 200, data: event.body.data } }))
     );
   }
-}
+}