[Update] 修改token

src/app/elements/guacamole/guacamole.component.ts

@@ -26,6 +26,30 @@ export class ElementGuacamoleComponent implements OnInit {
               private _logger: LogService) {
   }
 
+  registerHost() {
+    if (this.remoteAppId) {
+      this._http.guacamole_add_remote_app(User.id, this.remoteAppId).subscribe(
+        data => {
+          const base = data.result;
+          this.target = document.location.origin + '/guacamole/#/client/' + base + '?token=' + DataStore.guacamole_token;
+        },
+        error => {
+          this._logger.error(error);
+        }
+      );
+    } else {
+      this._http.guacamole_add_asset(User.id, this.host.id, this.userid).subscribe(
+        data => {
+          const base = data.result;
+          this.target = document.location.origin + '/guacamole/#/client/' + base + '?token=' + DataStore.guacamole_token;
+        },
+        error2 => {
+          this._logger.error(error2);
+        }
+      );
+    }
+  }
+
   ngOnInit() {
     // /guacamole/api/tokens will redirect to http://guacamole/api/tokens
     if (this.target) {
@@ -43,6 +67,7 @@ export class ElementGuacamoleComponent implements OnInit {
         data => {
           // /guacamole/client will redirect to http://guacamole/#/client
           DataStore.guacamole_token = data['authToken'];
+          this.registerHost();
         },
         error => {
           this._logger.error(error);
@@ -50,27 +75,8 @@ export class ElementGuacamoleComponent implements OnInit {
           return null;
         }
       );
-    }
-    if (this.remoteAppId !== '') {
-      this._http.guacamole_add_remote_app(User.id, this.remoteAppId).subscribe(
-        data => {
-          const base = data.result;
-          this.target = document.location.origin + '/guacamole/#/client/' + base + '?token=' + DataStore.guacamole_token;
-        },
-        error => {
-          this._logger.error(error);
-        }
-      );
     } else {
-      this._http.guacamole_add_asset(User.id, this.host.id, this.userid).subscribe(
-        data => {
-          const base = data.result;
-          this.target = document.location.origin + '/guacamole/#/client/' + base + '?token=' + DataStore.guacamole_token;
-        },
-        error2 => {
-          this._logger.error(error2);
-        }
-      );
+      this.registerHost();
     }
 
     NavList.List[this.index].Rdp = this.el.nativeElement;

src/app/pages/control/control/control.component.ts

@@ -19,7 +19,7 @@ export class View {
   closed: boolean;
   host: any;
   user: any;
-  remoteApp: any;
+  remoteApp: string;
   room: string;
   Rdp: any;
   Term: any;