Merged in dev (pull request #77)

feat: bypass

src/app/app.service.ts

@@ -106,8 +106,10 @@ export class HttpService {
     const params = new HttpParams()
       .set('asset_token', assetToken)
       .set('token', token);
+// 原有：/api/session/ext/jumpserver/asset/token/add?asset_token=<asset_token>&token=<token>
+// 改为：/api/ext/jumpserver/asset/token/add?asset_token=<asset_token>&token=<token>
     return this.http.get(
-      '/guacamole/api/session/ext/jumpserver/asset/token/add',
+      '/guacamole/api/ext/jumpserver/asset/token/add',
       {
         headers: new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded'),
         params: params
@@ -266,6 +268,7 @@ export class AppService implements OnInit {
           // jQuery('angular2').show();
         } else {
           // this.browser();
+          if (document.location.pathname !== '/luna/connect') {
             this._http.get_user_profile()
               .subscribe(
                 data => {
@@ -308,6 +311,7 @@ export class AppService implements OnInit {
               );
           }
         }
+      }
     } else {
       this._router.navigate(['FOF']);
       // jQuery('angular2').show();