Add Jenkinsfile and remove the backend address.

This commit is contained in:
takiguchi
2019-05-21 22:13:54 +02:00
parent dc7d76654c
commit df5caadd57
7 changed files with 92 additions and 11 deletions

View File

@@ -19,7 +19,7 @@ export class AppComponent implements OnInit {
) {}
ngOnInit(): void {
this.http.get(`${environment.apiUrl}/api/version`).subscribe(pApiVersion => {
this.http.get(`/api/version`).subscribe(pApiVersion => {
this.apiVersion = pApiVersion;
this.connectedToApi = true;
this.loading = false;

View File

@@ -3,12 +3,8 @@ import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs';
import { environment } from '../../environments/environment';
import { User } from '../core/entities';
const LOGIN_URL = environment.apiUrl + '/api/account/login';
@Injectable()
export class LoginService {
@@ -17,6 +13,6 @@ export class LoginService {
) {}
login(user: User): Observable<User> {
return this.http.post<User>(LOGIN_URL, user);
return this.http.post<User>('/api/account/login', user);
}
}

View File

@@ -1,9 +1,8 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs';
import { environment } from '../../environments/environment';
const SERVER_URL = environment.apiUrl + '/api/server';
const SERVER_URL = '/api/server';
@Injectable()
export class ServerService {

View File

@@ -4,7 +4,6 @@
export const environment = {
production: false,
apiUrl: 'http://176.188.217.1:54447',
appVersion: '1.0.1',
title: 'INTÉGRATION'
};

View File

@@ -1,6 +1,5 @@
export const environment = {
production: true,
apiUrl: 'https://176.188.217.1:54446',
appVersion: '1.0.1',
title: ''
};

View File

@@ -4,7 +4,6 @@
export const environment = {
production: false,
apiUrl: 'http://localhost:8080',
appVersion: '1.0.1',
title: 'LOCAL'
};