This is an automated email from the ASF dual-hosted git repository. min pushed a commit to branch service-test in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git
commit 83cd412df00041a7f862228269125ac7fca72e32 Merge: 126822d d7f0551 Author: nzomkxia <[email protected]> AuthorDate: Thu Jan 10 16:39:55 2019 +0800 Merge branch 'develop' into service-test # Conflicts: # dubbo-admin-frontend/src/components/test/ServiceTest.vue README.md | 6 +- README_ZH.md | 7 +- dubbo-admin-backend/README.md | 2 +- .../apache/dubbo/admin/common/util/Constants.java | 13 +- .../apache/dubbo/admin/common/util/MD5Util.java | 6 +- .../util/{RouteRule.java => RouteUtils.java} | 106 +++++++---- .../apache/dubbo/admin/config/ConfigCenter.java | 48 +++-- .../dubbo/admin/controller/AccessesController.java | 32 ++-- .../controller/ConditionRoutesController.java | 11 +- .../admin/controller/LoadBalanceController.java | 26 +-- .../admin/controller/OverridesController.java | 11 +- .../dubbo/admin/controller/ServiceController.java | 56 +----- .../admin/controller/TagRoutesController.java | 11 +- .../dubbo/admin/controller/WeightController.java | 48 ++--- .../apache/dubbo/admin/model/dto/ServiceDTO.java | 19 ++ .../dubbo/admin/model/store/RoutingRule.java | 16 +- .../config/GovernanceConfiguration.java | 2 +- .../config/impl/ApolloConfiguration.java | 4 +- .../config/impl/NoOpConfiguration.java | 4 +- .../config/impl/ZookeeperConfiguration.java | 27 ++- .../metadata/MetaDataCollector.java | 2 +- .../metadata/impl/NoOpMetadataCollector.java | 4 +- .../metadata/impl/RedisMetaDataCollector.java | 4 +- .../metadata/impl/ZookeeperMetaDataCollector.java | 9 +- .../dubbo/admin/service/ProviderService.java | 40 ++++- .../dubbo/admin/service/RegistryServerSync.java | 16 +- .../dubbo/admin/service/impl/AbstractService.java | 4 +- .../admin/service/impl/ProviderServiceImpl.java | 187 ++++++++++++++++---- .../dubbo/admin/service/impl/RouteServiceImpl.java | 74 ++++---- ...dubbo.admin.data.config.GovernanceConfiguration | 2 - ...che.dubbo.admin.data.metadata.MetaDataCollector | 2 - ...o.admin.registry.config.GovernanceConfiguration | 2 + ...dubbo.admin.registry.metadata.MetaDataCollector | 2 + .../src/main/resources/application.properties | 5 +- .../src/main/resources/log4j.properties | 4 +- .../{governance => common}/util/UrlUtilsTest.java | 2 +- .../dubbo/admin/common/util/YamlParserTest.java | 66 +++++++ .../dubbo/admin/common/util/YamlParserTest.java | 50 ------ .../src/test/{main => }/resources/LoadBalance.yml | 4 +- dubbo-admin-frontend/package.json | 1 + dubbo-admin-frontend/src/api/menu.js | 22 +-- .../src/components/ServiceDetail.vue | 132 +++++++------- .../src/components/ServiceSearch.vue | 87 +++++----- .../src/components/governance/AccessControl.vue | 188 +++++++++++++------- .../src/components/governance/LoadBalance.vue | 193 +++++++++++++-------- .../src/components/governance/Overrides.vue | 100 ++++++----- .../src/components/governance/RoutingRule.vue | 134 +++++++------- .../src/components/governance/TagRule.vue | 73 ++++---- .../src/components/governance/WeightAdjust.vue | 177 +++++++++++-------- .../src/components/metrics/ServiceMetrics.vue | 21 ++- .../src/components/public/Drawer.vue | 6 +- .../src/components/public/Search.vue | 2 +- .../src/components/public/Toolbar.vue | 47 ++++- .../src/components/test/ServiceMock.vue | 21 ++- dubbo-admin-frontend/src/lang/en.js | 100 +++++++++++ dubbo-admin-frontend/src/{store => lang}/index.js | 28 ++- dubbo-admin-frontend/src/lang/zh.js | 100 +++++++++++ dubbo-admin-frontend/src/main.js | 3 + dubbo-admin-frontend/src/store/index.js | 15 +- 59 files changed, 1548 insertions(+), 836 deletions(-) diff --cc dubbo-admin-frontend/package.json index 26e89c6,3625632..6a0a9ce --- a/dubbo-admin-frontend/package.json +++ b/dubbo-admin-frontend/package.json @@@ -15,8 -15,8 +15,9 @@@ "brace": "^0.11.1", "http-status": "^1.2.0", "js-yaml": "^3.12.0", + "jsoneditor": "^5.26.2", "vue": "^2.5.2", + "vue-i18n": "^8.6.0", "vue-router": "^3.0.1", "vuetify": "^1.2.2", "vuex": "^3.0.1"
