Merge branch 'master' into bootstrap4

app.js

@@ -15,27 +15,6 @@ var buff = [];
 
 server.run = function (options) {
 
-  // create shell process
-  // term = pty.fork(
-  //     process.env.SHELL || 'sh',
-  //     [],
-  //     {
-  //         name: require('fs').existsSync('/usr/share/terminfo/x/xterm-256color')
-  //             ? 'xterm-256color'
-  //             : 'xterm',
-  //         cols: 80,
-  //         rows: 24,
-  //         cwd: process.env.HOME
-  //     }
-  // );
-  //
-  // // store term's output into buffer or emit through socket
-  // term.on('data', function (data) {
-  //     return !socket ? buff.push(data) : socket.emit('data', data);
-  // });
-
-  // console.log('Created shell with pty master/slave pair (master: %d, pid: %d)', term.fd, term.pid);
-
   var app = express();
   var server = http.createServer(app);
   var apis = express.Router();
@@ -45,15 +24,20 @@ server.run = function (options) {
   // let term.js handle req/res
   // app.use(terminal.middleware());
 
+  apis.route('/browser')
+    .post(function (req, res) {
+      console.log(req);
+      res.string('');
+      // res.json({verified: true, csrf: "liuzheng"})
+    });
   apis.route('/checklogin')
     .post(function (req, res) {
       res.json({logined: true, id: 1, username: "liuzheng", name: "liuzheng"})
     })
     .get(function (req, res) {
-      res.json({logined: false})
+      res.json({logined: true})
     });
 
-
   app.use("/api", apis);
   // let server listen on the port
   options = options || {};

package-lock.json

@@ -8507,6 +8507,14 @@
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
       "dev": true
     },
+    "ssh-keygen": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/ssh-keygen/-/ssh-keygen-0.4.1.tgz",
+      "integrity": "sha1-yCsloYtEV+AUUyhFaMSszOAEqas=",
+      "requires": {
+        "underscore": "1.4.4"
+      }
+    },
     "sshpk": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
@@ -9200,6 +9208,11 @@
       "integrity": "sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po=",
       "dev": true
     },
+    "underscore": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz",
+      "integrity": "sha1-YaajIBBiKvoHljvzJSA88SI51gQ="
+    },
     "uniq": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",

package.json

@@ -31,6 +31,7 @@
     "rxjs": "^5.4.2",
     "socket.io": "^2.0.3",
     "tether": "^1.4.0",
+    "ssh-keygen": "^0.4.1",
     "zone.js": "^0.8.14"
   },
   "devDependencies": {

src/app/app.service.ts

@@ -2,14 +2,12 @@
  * Created by liuzheng on 2017/8/30.
  */
 import {Injectable, NgModule} from '@angular/core';
-import {Http} from '@angular/http';
+import {Http, Request, RequestOptionsArgs, Headers} from '@angular/http';
 import {Cookie} from 'ng2-cookies/ng2-cookies';
-// import {CookieService} from 'angular2-cookie/core'
 import {Logger} from 'angular2-logger/core';
 import 'rxjs/add/operator/map';
-// import {DynamicRouteConfigurator} from './dynamicRouteConfigurator'
-// import 'rxjs/add/operator/share';
-// import  'rxjs/Rx';
+import 'rxjs/add/operator/catch';
+
 declare let jQuery: any;
 // declare var Terminal: any;
 // declare var Clipboard: any;
@@ -83,13 +81,84 @@ export let DataStore: {
   leftbarhide: false,
   windowsize: [],
 };
+export let CSRF: string = '';
+
+export let Browser: {
+  userAgent: string;
+  appCodeName: string;
+  appName: string;
+  appVersion: string;
+  language: string;
+  platform: string;
+  product: string;
+  productSub: string;
+  vendor: string;
+} = {
+  userAgent: navigator.userAgent,
+  appCodeName: navigator.appCodeName,
+  appName: navigator.appName,
+  appVersion: navigator.appVersion,
+  language: navigator.language,
+  platform: navigator.platform,
+  product: navigator.product,
+  productSub: navigator.productSub,
+  vendor: navigator.vendor,
+};
+
+export class HttpService {
+  headers = new Headers();
+
+  constructor(private _http: Http) {
+  }
+
+  request(url: string | Request, options?: RequestOptionsArgs) {
+    options.headers = this.headers;
+    return this._http.request(url, options)
+  }
+
+  get(url: string, options?: RequestOptionsArgs) {
+    options.headers = this.headers;
+    return this._http.get(url, options)
+  }
+
+  post(url: string, body: any, options?: RequestOptionsArgs) {
+    options.headers = this.headers;
+    return this._http.post(url, body, options)
+  }
+
+  put(url: string, body: any, options?: RequestOptionsArgs) {
+    options.headers = this.headers;
+    return this._http.put(url, body, options)
+  }
+
+  delete(url: string, options?: RequestOptionsArgs) {
+    options.headers = this.headers;
+    return this._http.delete(url, options)
+  }
+
+  patch(url: string, body: any, options?: RequestOptionsArgs) {
+    options.headers = this.headers;
+    return this._http.patch(url, body, options)
+  }
+
+  head(url: string, options?: RequestOptionsArgs) {
+    options.headers = this.headers;
+    return this._http.head(url, options)
+  }
+
+  options(url: string, options?: RequestOptionsArgs) {
+    options.headers = this.headers;
+    return this._http.options(url, options)
+  }
+
+}
 
 @Injectable()
 export class AppService {
   // user:User = user  ;
   // searchrequest: any;
 
-  constructor(private http: Http,
+  constructor(private _http: HttpService,
               private _router: Router,
               private _logger: Logger) {
     if (Cookie.get('loglevel')) {
@@ -111,17 +180,11 @@ export class AppService {
       // this._logger.level = parseInt(Cookie.getCookie('loglevel'));
       this._logger.level = 0;
     }
-    const vm = this;
     DataStore.socket.on('connect', function () {
       console.log('DatsStore socket connected');
       DataStore.socket.on('nav', function (data) {
         DataStore.Nav = JSON.parse(data);
       });
-      DataStore.socket.on('leftbar', function (data) {
-        if (data === 'changed') {
-          vm.ReloadLeftbar();
-        }
-      });
       // DataStore.socket.on('popup', function (data) {
       //   layer.msg(data);
       // });
@@ -129,6 +192,7 @@ export class AppService {
       // DataStore.socket.emit('api', 'all');
     });
     this.checklogin();
+    this.browser()
   }
 
 
@@ -145,7 +209,7 @@ export class AppService {
           }
           // jQuery('angular2').show();
         } else {
-          this.http.get('/api/checklogin')
+          this._http.get('/api/checklogin')
             .map(res => res.json())
             .subscribe(
               data => {
@@ -185,7 +249,7 @@ export class AppService {
     DataStore.error['login'] = '';
     this._logger.log(User);
     if (User.username.length > 0 && User.password.length > 6 && User.password.length < 100) {
-      this.http.post('/api/checklogin', JSON.stringify(User)).map(res => res.json())
+      this._http.post('/api/checklogin', JSON.stringify(User)).map(res => res.json())
         .subscribe(
           data => {
             User.logined = data.logined;
@@ -221,6 +285,10 @@ export class AppService {
     }
   }
 
+  browser() {
+    this._http.post('/api/browser', JSON.stringify(Browser)).map(res => res.json())
+  }
+
 //
 //
 //   HideLeft() {
@@ -258,10 +326,6 @@ export class AppService {
 //
 //   }
 //
-  ReloadLeftbar() {
-    jQuery('#left-bar').fancytree('getTree').reload();
-  }
-
 //     setMyinfo(user:User) {
 //         // Update data store
 //         this._dataStore.user = user;