Merge branch 'master' into shiyang

.gitignore

@@ -1,4 +1,4 @@
-logs/
+/logs/
 npm-debug.log
 yarn-error.log
 node_modules
@@ -19,4 +19,4 @@ docker/.node_modules/*
 .vscode/
 .umi*
 
-data
+/data

app/view/index.html

@@ -19,7 +19,6 @@
   window.routerBase = '/';
   window.resourceBaseUrl = '{{ helper.assets.resourceBase }}';
 </script>
-<script src="https://gw.alipayobjects.com/os/antv/pkg/_antv.data-set-0.9.6/dist/data-set.min.js"></script>
 {% if ctx.app.config.env === 'local' -%}
 {{ helper.assets.getScript('umi.dll.js') | safe }}
 {%- endif %}

app/web/config/router.config.js

@@ -17,15 +17,6 @@ export default [
     Routes: ['src/pages/Authorized'],
     authority: ['admin', 'user'],
     routes: [
-
-       //测试专用
-       {
-        path: '/test',
-        name: 'test',
-        icon: 'AppstoreAdd',
-        component: './Endpoints/Execute',
-      },
-
       // dashboard
       { path: '/', redirect: '/platform' },
       {
@@ -58,7 +49,7 @@ export default [
         path: '/logs',
         name: 'logs',
         icon: 'search',
-        component: './List/TableList',
+        component: './Logs/Overview',
       },
 
       //alertings

app/web/src/components/SiderMenu/index.less

@@ -21,7 +21,7 @@
     display: inline-block;
     vertical-align: middle;
     font-size: 20px;
-    margin: 0 0 0 12px;
+    margin: 3px 0 0 12px;
     font-family: 'Myriad Pro', 'Helvetica Neue', Arial, Helvetica, sans-serif;
     font-weight: 600;
   }

app/web/src/components/TopNavHeader/index.less

@@ -51,7 +51,7 @@
     display: inline-block;
     vertical-align: top;
     font-size: 16px;
-    margin: 0 0 0 12px;
+    margin: 2px 0 0 12px;
     font-weight: 600;
     padding-right: 15px;
   }

app/web/src/layouts/BasicLayout.js

@@ -12,7 +12,7 @@ import { formatMessage } from 'umi/locale';
 import SiderMenu from '@/components/SiderMenu';
 import Authorized from '@/utils/Authorized';
 import SettingDrawer from '@/components/SettingDrawer';
-import logo from '../assets/logo.svg';
+import logo from '../assets/logo-color.svg';
 import Footer from './Footer';
 import Header from './Header';
 import Context from './MenuContext';

app/web/src/layouts/UserLayout.js

@@ -5,7 +5,7 @@ import { Icon } from 'antd';
 import GlobalFooter from '@/components/GlobalFooter';
 import SelectLang from '@/components/SelectLang';
 import styles from './UserLayout.less';
-import logo from '../assets/logo.svg';
+import logo from '../assets/logo-color.svg';
 
 const links = [
   {

app/web/src/layouts/UserLayout.less

@@ -41,7 +41,6 @@
 }
 
 .header {
-  height: 44px;
   line-height: 44px;
   a {
     text-decoration: none;
@@ -60,7 +59,7 @@
   font-family: 'Myriad Pro', 'Helvetica Neue', Arial, Helvetica, sans-serif;
   font-weight: 600;
   position: relative;
-  top: 2px;
+  top: 5px;
 }
 
 .desc {

app/web/src/pages/Logs/Overview.js

@@ -0,0 +1,14 @@
+import React from 'react';
+import { formatMessage } from 'umi/locale';
+import Link from 'umi/link';
+import Exception from '@/components/Exception';
+
+
+export default ()=>(
+<Exception
+    type="403"
+    desc={formatMessage({ id: 'app.exception.description.403' })}
+    linkElement={Link}
+    backText={formatMessage({ id: 'app.exception.back' })}
+  />
+);

app/web/src/pages/User/Login.js

@@ -81,10 +81,10 @@ class LoginPage extends Component {
               login.type === 'account' &&
               !submitting &&
               this.renderMessage(formatMessage({ id: 'app.login.message-invalid-credentials' }))}
-            <UserName name="userName" placeholder="admin/user" />
+            <UserName name="userName" placeholder="username" />
             <Password
               name="password"
-              placeholder="888888/123456"
+              placeholder="password"
               onPressEnter={() => this.loginForm.validateFields(this.handleSubmit)}
             />
           </Tab>