This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git
commit d4e49aa0581e510884e85cc145e647dcb179f5a1 Merge: 04f0e60 fb3b3fa Author: 吴晟 Wu Sheng <wu.sh...@foxmail.com> AuthorDate: Wed Feb 14 17:21:52 2018 +0800 Merge pull request #116 from apache/feature/5.0.0 Feature/5.0.0 .gitignore | 1 + README.md | 16 +- pom.xml | 75 +++- src/main/frontend/.editorconfig | 16 + src/main/frontend/.eslintrc | 53 +++ src/main/frontend/.ga | 3 + src/main/frontend/.gitignore | 17 + src/main/frontend/.roadhogrc.js | 38 ++ src/main/frontend/.roadhogrc.mock.js | 35 ++ src/main/frontend/.stylelintrc | 25 ++ src/main/frontend/LICENSE | 201 ++++++++++ src/main/frontend/README.md | 1 + src/main/frontend/jsconfig.json | 5 + src/main/frontend/mock/.gitkeep | 0 src/main/frontend/mock/alarm.js | 93 +++++ src/main/frontend/mock/application.js | 99 +++++ src/main/frontend/mock/dashboard.js | 27 ++ src/main/frontend/mock/notices.js | 85 +++++ src/main/frontend/mock/rule.js | 127 +++++++ src/main/frontend/mock/server.js | 49 +++ src/main/frontend/mock/service.js | 93 +++++ src/main/frontend/mock/topology.js | 114 ++++++ src/main/frontend/mock/trace.js | 148 ++++++++ src/main/frontend/mock/utils.js | 45 +++ src/main/frontend/package.json | 112 ++++++ src/main/frontend/public/alert.png | Bin 0 -> 4326 bytes src/main/frontend/public/alert.svg | 1 + src/main/frontend/public/app.jpg | Bin 0 -> 8847 bytes src/main/frontend/public/app.svg | 1 + src/main/frontend/public/css/iconfont.css | 71 ++++ src/main/frontend/public/css/iconfont.eot | Bin 0 -> 5116 bytes src/main/frontend/public/css/iconfont.js | 1 + src/main/frontend/public/css/iconfont.svg | 57 +++ src/main/frontend/public/css/iconfont.ttf | Bin 0 -> 4948 bytes src/main/frontend/public/css/iconfont.woff | Bin 0 -> 3216 bytes src/main/frontend/public/data.png | Bin 0 -> 7245 bytes src/main/frontend/public/database.svg | 1 + src/main/frontend/public/img/logo/sw-2.png | Bin 0 -> 1397 bytes src/main/frontend/public/img/node/DUBBO.png | Bin 0 -> 3537 bytes .../frontend/public/img/node/FeignDefaultHttp.png | Bin 0 -> 3892 bytes src/main/frontend/public/img/node/H2.png | Bin 0 -> 2681 bytes src/main/frontend/public/img/node/HPROSE.png | Bin 0 -> 2158 bytes src/main/frontend/public/img/node/HTTPCLIENT.png | Bin 0 -> 10718 bytes src/main/frontend/public/img/node/JETTY.png | Bin 0 -> 2838 bytes src/main/frontend/public/img/node/JETTYSERVER.png | Bin 0 -> 9889 bytes src/main/frontend/public/img/node/MONGODB.png | Bin 0 -> 4161 bytes src/main/frontend/public/img/node/MOTAN.png | Bin 0 -> 17288 bytes src/main/frontend/public/img/node/MYSQL.png | Bin 0 -> 4980 bytes src/main/frontend/public/img/node/NutzHttp.png | Bin 0 -> 12509 bytes src/main/frontend/public/img/node/NutzMvc.png | Bin 0 -> 14196 bytes src/main/frontend/public/img/node/OKHTTP.png | Bin 0 -> 4070 bytes src/main/frontend/public/img/node/Oracle.png | Bin 0 -> 4312 bytes src/main/frontend/public/img/node/REDIS.png | Bin 0 -> 5178 bytes src/main/frontend/public/img/node/RESIN.png | Bin 0 -> 15092 bytes src/main/frontend/public/img/node/SPRINGMVC.png | Bin 0 -> 11226 bytes src/main/frontend/public/img/node/STRUTS2.png | Bin 0 -> 11643 bytes src/main/frontend/public/img/node/UNDEFINED.png | Bin 0 -> 2918 bytes src/main/frontend/public/img/node/USER.png | Bin 0 -> 2444 bytes src/main/frontend/public/img/node/tomcat.png | Bin 0 -> 4302 bytes src/main/frontend/public/index.html | 16 + src/main/frontend/public/redis.svg | 1 + src/main/frontend/public/service.svg | 1 + src/main/frontend/src/common/nav.js | 62 ++++ .../frontend/src/components/Charts/Area/index.js | 132 +++++++ .../frontend/src/components/Charts/Bar/index.d.ts | 14 + .../frontend/src/components/Charts/Bar/index.js | 151 ++++++++ .../src/components/Charts/ChartCard/index.d.ts | 11 + .../src/components/Charts/ChartCard/index.js | 60 +++ .../src/components/Charts/ChartCard/index.less | 74 ++++ .../src/components/Charts/Field/index.d.ts | 7 + .../frontend/src/components/Charts/Field/index.js | 12 + .../src/components/Charts/Field/index.less | 16 + .../src/components/Charts/Gauge/index.d.ts | 10 + .../frontend/src/components/Charts/Gauge/index.js | 202 ++++++++++ .../frontend/src/components/Charts/Line/index.js | 129 +++++++ .../src/components/Charts/MiniArea/index.d.ts | 29 ++ .../src/components/Charts/MiniArea/index.js | 125 +++++++ .../src/components/Charts/MiniBar/index.d.ts | 11 + .../src/components/Charts/MiniBar/index.js | 87 +++++ .../src/components/Charts/MiniProgress/index.d.ts | 12 + .../src/components/Charts/MiniProgress/index.js | 30 ++ .../src/components/Charts/MiniProgress/index.less | 35 ++ .../frontend/src/components/Charts/Pie/index.d.ts | 20 + .../frontend/src/components/Charts/Pie/index.js | 260 +++++++++++++ .../frontend/src/components/Charts/Pie/index.less | 94 +++++ .../src/components/Charts/Radar/index.d.ts | 14 + .../frontend/src/components/Charts/Radar/index.js | 189 ++++++++++ .../src/components/Charts/Radar/index.less | 46 +++ .../src/components/Charts/StackBar/index.js | 109 ++++++ .../src/components/Charts/TagCloud/index.d.ts | 10 + .../src/components/Charts/TagCloud/index.js | 170 +++++++++ .../src/components/Charts/TagCloud/index.less | 6 + .../src/components/Charts/TimelineChart/index.d.ts | 15 + .../src/components/Charts/TimelineChart/index.js | 125 +++++++ .../src/components/Charts/TimelineChart/index.less | 3 + .../src/components/Charts/WaterWave/index.d.ts | 9 + .../src/components/Charts/WaterWave/index.js | 200 ++++++++++ .../src/components/Charts/WaterWave/index.less | 28 ++ .../frontend/src/components/Charts/demo/bar.md | 26 ++ .../src/components/Charts/demo/chart-card.md | 65 ++++ .../frontend/src/components/Charts/demo/gauge.md | 18 + .../src/components/Charts/demo/mini-area.md | 28 ++ .../src/components/Charts/demo/mini-bar.md | 28 ++ .../src/components/Charts/demo/mini-pie.md | 16 + .../src/components/Charts/demo/mini-progress.md | 12 + .../frontend/src/components/Charts/demo/mix.md | 83 +++++ .../frontend/src/components/Charts/demo/pie.md | 47 +++ .../frontend/src/components/Charts/demo/radar.md | 64 ++++ .../src/components/Charts/demo/tag-cloud.md | 25 ++ .../src/components/Charts/demo/timeline-chart.md | 27 ++ .../src/components/Charts/demo/waterwave.md | 20 + src/main/frontend/src/components/Charts/equal.js | 17 + src/main/frontend/src/components/Charts/index.d.ts | 17 + src/main/frontend/src/components/Charts/index.js | 37 ++ src/main/frontend/src/components/Charts/index.less | 19 + src/main/frontend/src/components/Charts/index.md | 132 +++++++ .../src/components/DescriptionList/Description.js | 17 + .../components/DescriptionList/DescriptionList.js | 21 ++ .../src/components/DescriptionList/demo/basic.md | 35 ++ .../components/DescriptionList/demo/vertical.md | 35 ++ .../src/components/DescriptionList/index.d.ts | 22 ++ .../src/components/DescriptionList/index.js | 5 + .../src/components/DescriptionList/index.less | 75 ++++ .../src/components/DescriptionList/index.md | 39 ++ .../src/components/DescriptionList/responsive.js | 6 + .../frontend/src/components/Page/Panel/index.js | 30 ++ .../frontend/src/components/Page/Ranking/index.js | 29 ++ .../frontend/src/components/Page/Search/index.js | 68 ++++ src/main/frontend/src/components/Page/index.js | 9 + .../src/components/StandardFormRow/index.js | 26 ++ .../src/components/StandardFormRow/index.less | 71 ++++ .../frontend/src/components/StandardTable/index.js | 154 ++++++++ .../src/components/StandardTable/index.less | 13 + .../src/components/Time/TimeSelect/index.js | 246 ++++++++++++ .../src/components/Time/TimeSelect/index.less | 3 + .../src/components/Topology/AppTopology.js | 79 ++++ src/main/frontend/src/components/Topology/Base.js | 66 ++++ .../src/components/Topology/ServiceTopology.js | 77 ++++ src/main/frontend/src/components/Topology/conf.js | 13 + src/main/frontend/src/components/Topology/index.js | 7 + .../frontend/src/components/Topology/index.less | 17 + .../frontend/src/components/TraceStack/index.js | 334 +++++++++++++++++ .../frontend/src/components/TraceStack/index.less | 51 +++ .../frontend/src/components/TraceTable/index.js | 57 +++ .../frontend/src/components/TraceTable/index.less | 13 + .../frontend/src/components/Trend/demo/basic.md | 17 + src/main/frontend/src/components/Trend/index.d.ts | 8 + src/main/frontend/src/components/Trend/index.js | 22 ++ src/main/frontend/src/components/Trend/index.less | 30 ++ src/main/frontend/src/components/Trend/index.md | 21 ++ src/main/frontend/src/e2e/home.e2e.js | 9 + src/main/frontend/src/index.js | 23 ++ src/main/frontend/src/index.less | 16 + src/main/frontend/src/layouts/BasicLayout.js | 412 +++++++++++++++++++++ src/main/frontend/src/layouts/BasicLayout.less | 117 ++++++ src/main/frontend/src/layouts/BlankLayout.js | 3 + src/main/frontend/src/layouts/PageHeaderLayout.js | 12 + .../frontend/src/layouts/PageHeaderLayout.less | 11 + src/main/frontend/src/models/alarm.js | 93 +++++ src/main/frontend/src/models/application.js | 65 ++++ src/main/frontend/src/models/dashboard.js | 52 +++ src/main/frontend/src/models/global.js | 106 ++++++ src/main/frontend/src/models/index.js | 11 + src/main/frontend/src/models/rule.js | 80 ++++ src/main/frontend/src/models/server.js | 52 +++ src/main/frontend/src/models/service.js | 60 +++ src/main/frontend/src/models/topology.js | 40 ++ src/main/frontend/src/models/trace.js | 101 +++++ src/main/frontend/src/models/user.js | 66 ++++ src/main/frontend/src/polyfill.js | 7 + src/main/frontend/src/router.js | 60 +++ src/main/frontend/src/routes/Alarm/Alarm.js | 132 +++++++ src/main/frontend/src/routes/Alarm/Alarm.less | 50 +++ .../frontend/src/routes/Application/Application.js | 121 ++++++ .../src/routes/Application/Application.less | 28 ++ .../frontend/src/routes/Dashboard/Dashboard.js | 137 +++++++ .../frontend/src/routes/Dashboard/Dashboard.less | 28 ++ src/main/frontend/src/routes/List/TableList.js | 326 ++++++++++++++++ src/main/frontend/src/routes/List/TableList.less | 45 +++ src/main/frontend/src/routes/Server/Server.js | 193 ++++++++++ src/main/frontend/src/routes/Service/Service.js | 139 +++++++ src/main/frontend/src/routes/Service/Service.less | 0 src/main/frontend/src/routes/Topology/Topology.js | 37 ++ src/main/frontend/src/routes/Trace/Trace.js | 184 +++++++++ src/main/frontend/src/routes/Trace/Trace.less | 48 +++ src/main/frontend/src/services/api.js | 30 ++ src/main/frontend/src/services/graphql.js | 8 + src/main/frontend/src/services/user.js | 9 + src/main/frontend/src/theme.js | 5 + src/main/frontend/src/utils/request.js | 72 ++++ src/main/frontend/src/utils/utils.js | 284 ++++++++++++++ src/main/frontend/src/utils/utils.less | 50 +++ src/main/frontend/tests/jasmine.js | 1 + src/main/frontend/tests/run-tests.js | 35 ++ src/main/frontend/tests/setupTests.js | 13 + src/main/frontend/tests/styleMock.js | 1 + .../skywalking/apm/ui/ApplicationStartUp.java | 24 +- .../apache/skywalking/apm/ui/config/UIConfig.java | 4 +- .../skywalking/apm/ui/creator/UrlCreator.java | 73 ---- .../apm/ui/tools/CollectorServerList.java | 90 +++++ .../apm/ui/tools/CollectorUIServerGetterTimer.java | 89 ----- .../skywalking/apm/ui/tools/RewritePathFilter.java | 63 ++++ .../skywalking/apm/ui/tools/ServerSelector.java | 56 --- .../additional-spring-configuration-metadata.json | 8 - src/main/resources/application.yml | 12 +- 205 files changed, 10063 insertions(+), 260 deletions(-) -- To stop receiving notification emails like this one, please contact wush...@apache.org.