Merge branch 'routable'

#4

Author: robberphex

README.md

@@ -10,6 +10,8 @@ You can view and modify your service information and service governance configur
 
 ## Quick Start
 
+This project requires Java 11 && Maven >= 3.6.0.
+
 1. Download code: `git clone https://github.com/opensergo/opensergo-dashboard.git`
 2. Modify `opensergo-dashboard-server/src/main/resources/application.yaml`, specify the mysql server address
     * Table struct: [opensergo-dashboard-server/src/main/resources/schema.sql](./opensergo-dashboard-server/src/main/resources/schema.sql)

README.zh-Hans.md

@@ -9,6 +9,8 @@
 
 ## 快速开始
 
+本项目依赖 Java 11 && Maven >= 3.6.0。
+
 1. 下载代码：`git clone https://github.com/opensergo/opensergo-dashboard.git`
 2. 在`opensergo-dashboard-server/src/main/resources/application.yaml`中指定mysql的地址
     * mysql的表结构见 [opensergo-dashboard-server/src/main/resources/schema.sql](./opensergo-dashboard-server/src/main/resources/schema.sql)

opensergo-dashboard-distribution/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.opensergo</groupId>
         <artifactId>opensergo-dashboard</artifactId>
-        <version>0.0.1</version>
+        <version>0.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

opensergo-dashboard-server/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.opensergo</groupId>
         <artifactId>opensergo-dashboard</artifactId>
-        <version>0.0.1</version>
+        <version>0.0.2</version>
     </parent>
 
     <artifactId>opensergo-dashboard-server</artifactId>
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>io.opensergo</groupId>
             <artifactId>opensergo-dashboard-ui</artifactId>
-            <version>0.0.1</version>
+            <version>0.0.2</version>
             <scope>provided</scope>
             <type>pom</type>
         </dependency>
@@ -74,7 +74,7 @@
         <dependency>
             <groupId>io.opensergo</groupId>
             <artifactId>opensergo-java</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>0.0.1</version>
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>

opensergo-dashboard-ui/README.md

@@ -10,4 +10,4 @@ OpenSergo Dashboard前端使用了React和Console Design。
 
 ### Console Design支持群
 
-![钉钉群](./ding-group.jpg)
+<img src="./ding-group.jpg" width="300" />

opensergo-dashboard-ui/README.zh-Hans.md

@@ -10,4 +10,4 @@ OpenSergo Dashboard前端使用了React和Console Design。
 
 ### Console Design支持群
 
-![钉钉群](./ding-group.jpg)
+<img src="./ding-group.jpg" width="300" />

opensergo-dashboard-ui/package-lock.json

@@ -20,7 +20,7 @@
     "@alicloud/console-base-rc-top-nav": "^1.10.1",
     "@alicloud/console-components": "^1.5.1",
     "@alicloud/console-components-app-layout": "^1.1.4",
-    "@alicloud/console-components-console-menu": "^1.2.11",
+    "@alicloud/console-components-console-menu": "^1.2.12",
     "@alicloud/console-components-page": "^1.0.18",
     "@alicloud/console-components-table": "^1.0.21",
     "@alicloudfe/components-console-menu": "^1.1.0",
@@ -55,7 +55,6 @@
     "oclazyload": "^1.1.0",
     "react": "^16.8.6",
     "react-dom": "^16.8.6",
-    "react-router-dom": "^5.3.0",
     "react-scripts": "^4.0.3",
     "selectize": "^0.12.1",
     "styled-components": "^4.3.2"

opensergo-dashboard-ui/package.json

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.opensergo</groupId>
         <artifactId>opensergo-dashboard</artifactId>
-        <version>0.0.1</version>
+        <version>0.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

opensergo-dashboard-ui/pom.xml

@@ -1,26 +1,25 @@
 import React from 'react';
 import './App.css';
-import ConsoleMenu from "@alicloud/console-components-console-menu";
-import {Button, Message} from "@alicloud/console-components";
+import {IRoutableItemDescriptor} from "@alicloud/console-components-console-menu";
+import RoutableMenu from "@alicloud/console-components-console-menu/lib/RoutableMenu";
 import AppLayout from "@alicloud/console-components-app-layout";
-import Page from '@alicloud/console-components-page'
 
 
 import "@alicloud/console-components/dist/wind.css";
-import {Link, Switch, Route} from "dva/router";
+import {Redirect, Route, Switch} from "dva/router";
 import AppList from "./AppList";
 
+
+const items: IRoutableItemDescriptor[] = [
+    // {key: '/home', to: '/', label: '概览'},
+    {key: '/application', to: '/application', label: '应用列表'},
+];
+
 const Nav = () => (
-    <ConsoleMenu>
-        {/*<ConsoleMenu.Item key="aaaa"><Link to="/a">aaaa</Link></ConsoleMenu.Item>*/}
-        <ConsoleMenu.Item key="AppList"><Link to="/AppList">应用列表</Link></ConsoleMenu.Item>
-        {/*<ConsoleMenu.SubMenu key="log" label="日志">*/}
-        {/*    <ConsoleMenu.Item key="access-log">访问日志</ConsoleMenu.Item>*/}
-        {/*    <ConsoleMenu.Item key="load-log">负载日志</ConsoleMenu.Item>*/}
-        {/*</ConsoleMenu.SubMenu>*/}
-        {/*<ConsoleMenu.Item key="help">产品帮助</ConsoleMenu.Item>*/}
-        {/*<ConsoleMenu.Item key="api-docs">API 文档</ConsoleMenu.Item>*/}
-    </ConsoleMenu>
+    <RoutableMenu
+        items={items}
+        defaultActiveKey={'/application'}
+    />
 );
 
 function App() {
@@ -29,9 +28,12 @@ function App() {
             nav={<Nav/>}
         >
             <Switch>
-                <Route path="/AppList">
+                <Route path="/application">
                     <AppList/>
                 </Route>
+                <Route path="/">
+                    <Redirect to={'/application'}/>
+                </Route>
             </Switch>
         </AppLayout>
     );