fix: update

src/app/app.service.ts

@@ -278,78 +278,67 @@ export class AppService implements OnInit {
         } else if (document.location.pathname === '/luna/connect') {
           User.logined = true;
         } else {
-          // this.browser();
           this._http.get_user_profile()
-            .subscribe(
-              data => {
-                User.id = data['id'];
-                User.name = data['name'];
-                User.username = data['username'];
-                User.email = data['email'];
-                User.is_active = data['is_active'];
-                User.is_superuser = data['is_superuser'];
-                User.role = data['role'];
-                // User.groups = data['groups'];
-                User.wechat = data['wechat'];
-                User.comment = data['comment'];
-                User.date_expired = data['date_expired'];
-                if (data['phone']) {
-                  User.phone = data['phone'].toString();
-                }
-                User.logined = data['logined'];
-                this._logger.debug(User);
-                this._localStorage.set('user', data['id']);
-              },
-              err => {
-                // this._logger.error(err);
-                User.logined = false;
-                window.location.href = document.location.origin + '/users/login?next=' + document.location.pathname + document.location.search;
-                // this._router.navigate(['login']);
-              },
-              // () => {
-              //   if (User.logined) {
-              //     if (document.location.pathname === '/login') {
-              //       this._router.navigate(['']);
-              //     } else {
-              //       this._router.navigate([document.location.pathname]);
-              //     }
-              //   } else {
-              //     this._router.navigate(['login']);
-              //   }
-              // jQuery('angular2').show();
-              // }
+              .subscribe(
+                data => {
+                  User.id = data['id'];
+                  User.name = data['name'];
+                  User.username = data['username'];
+                  User.email = data['email'];
+                  User.is_active = data['is_active'];
+                  User.is_superuser = data['is_superuser'];
+                  User.role = data['role'];
+                  // User.groups = data['groups'];
+                  User.wechat = data['wechat'];
+                  User.comment = data['comment'];
+                  User.date_expired = data['date_expired'];
+                  if (data['phone']) {
+                    User.phone = data['phone'].toString();
+                  }
+                  User.logined = data['logined'];
+                  this._logger.debug(User);
+                  this._localStorage.set('user', data['id']);
+                },
+                err => {
+                  // this._logger.error(err);
+                  User.logined = false;
+                  window.location.href = document.location.origin + '/users/login?next=' +
+                    document.location.pathname + document.location.search;
+                  // this._router.navigate(['login']);
+                },
+                // () => {
+                //   if (User.logined) {
+                //     if (document.location.pathname === '/login') {
+                //       this._router.navigate(['']);
+                //     } else {
+                //       this._router.navigate([document.location.pathname]);
+                //     }
+                //   } else {
+                //     this._router.navigate(['login']);
+                //   }
+                // jQuery('angular2').show();
+                // }
             );
-        }
       }
     }
+  } else {
+      this._router.navigate(['FOF']);
+      // jQuery('angular2').show();
+    }
   }
 
-  else {
-  this;
-.
-  _router;
-.
-
-  navigate(['FOF']);
-
-  // jQuery('angular2').show();
-}
-}
-
-browser();
-{
-  this._http.report_browser();
-}
+  browser() {
+    this._http.report_browser();
+  }
 
-getQueryString(name);
-{
-  const reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
-  const r = window.location.search.substr(1).match(reg);
-  if (r != null) {
-    return unescape(r[2]);
+  getQueryString(name) {
+    const reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
+    const r = window.location.search.substr(1).match(reg);
+    if (r != null) {
+      return unescape(r[2]);
+    }
+    return null;
   }
-  return null;
-}
 
 //
 //

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

@@ -38,7 +38,8 @@ export class ElementGuacamoleComponent implements OnInit {
             this._http.guacamole_token_add_asset(this.token, data['authToken']).subscribe(
               data2 => {
                 this._logger.debug(data);
-                this.target = document.location.origin + '/guacamole/#/client/' + data2['result'] + '?asset_token=jumpserver&token=' + data['authToken'];
+                this.target = document.location.origin + '/guacamole/#/client/' + data2['result'] +
+                  '?asset_token=jumpserver&token=' + data['authToken'];
               },
               error2 => {
                 this._logger.error(error2);