fix: joint api error

Postcatlab · Nov 1, 2022 · 91dd7d9 · 91dd7d9
1 parent 0746c23
commit 91dd7d9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/src/workbench/browser/src/app/core/services/web/web.service.ts b/src/workbench/browser/src/app/core/services/web/web.service.ts
@@ -3,6 +3,7 @@ import { ElectronService } from 'eo/workbench/browser/src/app/core/services';
 import { DownloadClienteComponent } from 'eo/workbench/browser/src/app/core/services/web/download-client.component';
 import { PROTOCOL } from 'eo/workbench/browser/src/app/shared/constants/protocol';
 import { ModalService } from 'eo/workbench/browser/src/app/shared/services/modal.service';
+import { SettingService } from 'eo/workbench/browser/src/app/core/services/settings/settings.service';
 
 @Injectable({
   providedIn: 'root',
@@ -33,7 +34,12 @@ export class WebService {
       link: '',
     },
   ];
-  constructor(private modalService: ModalService, private electronService: ElectronService) {
+  constructor(
+    private modalService: ModalService,
+    private settingService: SettingService,
+    private electronService: ElectronService
+  ) {
+    this.settingService.putSettings({'eoapi-common.remoteServer.url':window.location.origin});
     this.getClientResource();
   }
   private findLinkInSingleAssets(assets, item) {

diff --git a/src/workbench/browser/src/app/pages/navbar/navbar.component.ts b/src/workbench/browser/src/app/pages/navbar/navbar.component.ts
@@ -12,7 +12,6 @@ import { RemoteService } from 'eo/workbench/browser/src/app/shared/services/stor
 import { distinct } from 'rxjs/operators';
 import { interval } from 'rxjs';
 import { copy } from 'eo/workbench/browser/src/app/utils/index.utils';
-import { EoMessageService } from 'eo/workbench/browser/src/app/eoui/message/eo-message.service';
 import { LanguageService } from 'eo/workbench/browser/src/app/core/services/language/language.service';
 @Component({
   selector: 'eo-navbar',
@@ -41,7 +40,6 @@ export class NavbarComponent implements OnInit {
     public dataSourceService: DataSourceService,
     public status: StatusService,
     private http: RemoteService,
-    private eoMessage: EoMessageService,
     private lang: LanguageService
   ) {
     this.issueEnvironment = this.getEnviroment();

diff --git a/src/workbench/browser/src/app/shared/services/data-source/data-source.service.ts b/src/workbench/browser/src/app/shared/services/data-source/data-source.service.ts
@@ -40,6 +40,7 @@ export class DataSourceService {
     private http: RemoteService,
     private web: WebService
   ) {
+    console.log('init');
     this.pingCloudServerUrl();
   }
 

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
@@ -16,6 +16,7 @@ import { WorkspaceService } from 'eo/workbench/browser/src/app/shared/services/w
 import { ProjectService } from 'eo/workbench/browser/src/app/shared/services/project/project.service';
 import { version2Number } from 'eo/workbench/browser/src/app/utils/index.utils';
 import { MessageService } from 'eo/workbench/browser/src/app/shared/services/message';
+import { WebService } from 'eo/workbench/browser/src/app/core/services';
 
 const protocolReg = new RegExp('^(http|https)://');
 
@@ -40,10 +41,12 @@ export class BaseUrlInterceptor extends SettingService implements HttpIntercepto
   constructor(
     private workspaceService: WorkspaceService,
     private projectService: ProjectService,
-    private messageService: MessageService
+    private messageService: MessageService,
+    private web: WebService
   ) {
     super();
-    this.prefix = '/';
+    //* Web deploy from v1.9.1
+    this.prefix = this.web.isWeb?'/api/':'/';
   }
 
   intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
@@ -81,7 +84,6 @@ export class BaseUrlInterceptor extends SettingService implements HttpIntercepto
         if (req.url.includes('/system/status')) {
           const { data } = event.body;
           this.prefix = version2Number(data) >= version2Number('v1.9.0') ? '/api' : '/';
-          console.log(data,this.prefix);
         }
       }),
       catchError((err: any) => {