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 f71919b11aab476b91b53eb581b47c67944be74c Merge: c90dd33 7490b7e Author: nzomkxia <[email protected]> AuthorDate: Tue Dec 25 10:04:04 2018 +0800 Merge branch 'develop' into service-test README.md | 15 +++--- README_ZH.md | 20 ++++---- .../apache/dubbo/admin/common/util/Constants.java | 2 + .../dubbo/admin/common/util/OverrideUtils.java | 7 +-- .../apache/dubbo/admin/common/util/RouteRule.java | 48 +++++++++++++++----- .../admin/controller/LoadBalanceController.java | 12 +---- .../admin/controller/TagRoutesController.java | 11 +---- .../dubbo/admin/model/dto/DynamicConfigDTO.java | 9 ---- .../apache/dubbo/admin/model/dto/TagRouteDTO.java | 18 -------- .../dubbo/admin/model/store/OverrideDTO.java | 9 ---- .../{RoutingRuleDTO.java => RoutingRule.java} | 2 +- .../store/{RoutingRuleDTO.java => TagRoute.java} | 44 ++++++------------ .../apache/dubbo/admin/service/RouteService.java | 2 +- .../admin/service/impl/OverrideServiceImpl.java | 2 - .../dubbo/admin/service/impl/RouteServiceImpl.java | 53 ++++++++++++---------- .../src/components/ServiceSearch.vue | 2 +- .../src/components/governance/AccessControl.vue | 1 + .../src/components/governance/LoadBalance.vue | 3 +- .../src/components/governance/Overrides.vue | 5 +- .../src/components/governance/RoutingRule.vue | 17 ++----- .../src/components/governance/TagRule.vue | 18 +++----- .../src/components/governance/WeightAdjust.vue | 1 + 22 files changed, 126 insertions(+), 175 deletions(-)
