From d0120ef2272096cbcaf6e1b2e11edc029a7de511 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 19 Dec 2017 23:29:29 +0800
Subject: [PATCH] updates

---
 src/app/routes/users/installer/edit/edit.component.ts |    5 +++--
 src/environments/environment.chore.ts                 |    3 ++-
 src/environments/environment.hmr.ts                   |    3 ++-
 src/app/routes/users/installer/installer.component.ts |   12 ++++++++----
 src/environments/environment.prod.ts                  |    3 ++-
 src/environments/environment.ts                       |    3 ++-
 6 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/app/routes/users/installer/edit/edit.component.ts b/src/app/routes/users/installer/edit/edit.component.ts
index f9a4bd2..bfa8e97 100644
--- a/src/app/routes/users/installer/edit/edit.component.ts
+++ b/src/app/routes/users/installer/edit/edit.component.ts
@@ -2,6 +2,7 @@
 import { Component, OnInit } from '@angular/core';
 import { ModalHelper } from '@delon/theme';
 import { HttpClient } from '@angular/common/http';
+import { environment } from '../../../../../environments/environment';
 
 @Component({
   selector: 'app-edit',
@@ -20,14 +21,14 @@
 
   ngOnInit() {
     if (this.user.id > 0) {
-      this.http.get('http://localhost:8001/user/operate_user/' + this.user.id).subscribe((res: any) => {
+      this.http.get(environment.SERVER_BASH_URL + '/user/operate_user/' + this.user.id).subscribe((res: any) => {
           this.user = res.data[0];
       });
     }
   }
 
   save() {
-    this.http.post('http://localhost:8001/user/operate_user/save', this.user).subscribe(() => {
+    this.http.post(environment.SERVER_BASH_URL + '/user/operate_user/save', this.user).subscribe(() => {
       this.subject.next('true');
       this.close();
     });
diff --git a/src/app/routes/users/installer/installer.component.ts b/src/app/routes/users/installer/installer.component.ts
index a77990e..1aaec00 100644
--- a/src/app/routes/users/installer/installer.component.ts
+++ b/src/app/routes/users/installer/installer.component.ts
@@ -2,9 +2,9 @@
 import { NzMessageService } from 'ng-zorro-antd';
 import { ModalHelper } from '@delon/theme';
 import { HttpClient } from '@angular/common/http';
-import { getInstaller, deleteInstaller } from '../../../../../_mock/installer.service';
 import * as moment from 'moment';
 import { UserInstallerEditComponent } from './edit/edit.component';
+import { environment } from '../../../../environments/environment';
 
 @Component({
   selector: 'app-installer',
@@ -41,7 +41,7 @@
     if (reload) {
       this.q.pi = 1;
     }
-    this.http.get('http://localhost:8001/user/operate_user', this.q).subscribe((res: any) => {
+    this.http.get(environment.SERVER_BASH_URL + '/user/operate_user', this.q).subscribe((res: any) => {
 
       let data = res.data;
       const total = res.total;
@@ -85,14 +85,18 @@
   }
 
   delete(user) {
-    this.http.delete('http://localhost:8001/user/operate_user/' + user.id).subscribe((res: any) => {
+    this.http.delete(environment.SERVER_BASH_URL + '/user/operate_user/' + user.id).subscribe((res: any) => {
       this.msgSrv.success('���������������������������');
       this.load(true);
     });
   }
 
   remove() {
-    this.selectedRows.forEach(i => deleteInstaller(i.name));
+    this.selectedRows.forEach(i => {
+      this.http.delete(environment.SERVER_BASH_URL + '/user/operate_user/' + i.id).subscribe((res: any) => {
+        // TODO
+      });
+    });
     this.load(true);
   }
 
diff --git a/src/environments/environment.chore.ts b/src/environments/environment.chore.ts
index bb3034e..e179f77 100644
--- a/src/environments/environment.chore.ts
+++ b/src/environments/environment.chore.ts
@@ -2,5 +2,6 @@
     SERVER_URL: `./`,
     production: true,
     hmr: false,
-    useHash: false
+    useHash: false,
+    SERVER_BASH_URL: 'http://localhost:8001'
 };
diff --git a/src/environments/environment.hmr.ts b/src/environments/environment.hmr.ts
index 687d0b9..f128fdb 100644
--- a/src/environments/environment.hmr.ts
+++ b/src/environments/environment.hmr.ts
@@ -2,5 +2,6 @@
     SERVER_URL: `./`,
     production: true,
     hmr: true,
-    useHash: true
+    useHash: true,
+    SERVER_BASH_URL: 'http://localhost:8001'
 };
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 3f794b3..0c406d4 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -2,5 +2,6 @@
     SERVER_URL: `./`,
     production: true,
     hmr: false,
-    useHash: true
+    useHash: true,
+    SERVER_BASH_URL: 'http://localhost:8001'
 };
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 45c90c7..e29484e 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -7,5 +7,6 @@
     SERVER_URL: `./`,
     production: false,
     hmr: false,
-    useHash: true
+    useHash: true,
+    SERVER_BASH_URL: 'http://localhost:8001'
 };

--
Gitblit v1.8.0