Merge branch 'dev' of github.com:jumpserver/luna

app.js

@@ -170,6 +170,37 @@ server.run = function (options) {
           }]
       }])
     });
+  apis.route('/hostlist')
+    .get(function (req, res) {
+      res.json([{
+        "name": "测试服务器组1",
+        "id": 1,
+        "children": [{"name": "测试服务器1", "uuid": "", "type": "ssh", "users": ["root", "test"]}, {
+          "name": "测试服务器2",
+          "uuid": "",
+          "type": "ssh",
+          "users": ["root", "test"]
+        }]
+      }, {
+        "name": "樱花庄服务器组",
+        "id": 2,
+        "children": [{"name": "测试服务器1", "uuid": "", "type": "ssh", "users": ["root", "test"]}, {
+          "name": "测试服务器2",
+          "uuid": "",
+          "type": "ssh",
+          "users": ["root", "test"]
+        }]
+      }, {
+        "name": "阿里云服务器组",
+        "id": 3,
+        "children": [{"name": "测试服务器1", "uuid": "", "type": "ssh", "users": ["root", "test"]}, {
+          "name": "测试服务器2",
+          "uuid": "",
+          "type": "ssh",
+          "users": ["root", "test"]
+        }]
+      }])
+    });
 
   app.use("/api", apis);
   // let server listen on the port

proxy.conf.json

 {
   "/api": {
-    "target": "http://localhost:7871",
+    "target": "http://localhost:3000",
     "secure": false
   },
   "/socket.io/": {
-    "target": "http://127.0.0.1:7871",
+    "target": "http://127.0.0.1:3000",
     "secure": false
   },
   "/rdp/socket.io/": {

src/app/BasicPage/nav/nav.component.html

-<div class="nav" *ngIf="User.logined">
+<div class="nav">
     <ul>
         <li><a [routerLink]="['Index']"><img src="assets/imgs/logo.png" height="26px"/></a>
         </li>

src/app/ControlPage/cleftbar/cleftbar.component.css

@@ -58,3 +58,8 @@
     background-size: 33px 63px;
   }
 }
+
+app-search {
+  border-left-width: 0;
+  border-bottom: gold 7px inset;
+}