This is an automated email from the ASF dual-hosted git repository. min pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git
The following commit(s) were added to refs/heads/develop by this push: new 1f770c0 including version and group in service ID 1f770c0 is described below commit 1f770c0a63bdf370246e3c901417197249180d4f Author: nzomkxia <z82507...@gmail.com> AuthorDate: Fri Nov 2 16:39:05 2018 +0800 including version and group in service ID --- dubbo-admin-frontend/src/components/governance/AccessControl.vue | 4 ++-- dubbo-admin-frontend/src/components/governance/LoadBalance.vue | 4 ++-- dubbo-admin-frontend/src/components/governance/Overrides.vue | 4 ++-- dubbo-admin-frontend/src/components/governance/RoutingRule.vue | 4 ++-- dubbo-admin-frontend/src/components/governance/WeightAdjust.vue | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dubbo-admin-frontend/src/components/governance/AccessControl.vue b/dubbo-admin-frontend/src/components/governance/AccessControl.vue index 265dcc8..c9c8c59 100644 --- a/dubbo-admin-frontend/src/components/governance/AccessControl.vue +++ b/dubbo-admin-frontend/src/components/governance/AccessControl.vue @@ -86,7 +86,7 @@ <v-card-text> <v-form ref="modalForm"> <v-text-field label="Service Unique ID" - hint="A service ID in form of service" + hint="A service ID in form of group/service:version, group and version are optional" :rules="[required]" :readonly="modal.id != null" v-model="modal.service" /> @@ -151,7 +151,7 @@ export default { } ], accesses: [], - required: value => !!value || 'Service Id is required', + required: value => !!value || 'Service ID is required, in form of group/service:version, group and version are optional', modal: { enable: false, title: 'Create New', diff --git a/dubbo-admin-frontend/src/components/governance/LoadBalance.vue b/dubbo-admin-frontend/src/components/governance/LoadBalance.vue index 19e7903..143d6f6 100644 --- a/dubbo-admin-frontend/src/components/governance/LoadBalance.vue +++ b/dubbo-admin-frontend/src/components/governance/LoadBalance.vue @@ -64,7 +64,7 @@ <v-card-text > <v-text-field label="Service Unique ID" - hint="A service ID is service name" + hint="A service ID in form of group/service:version, group and version are optional" :rules="[required]" v-model="service" ></v-text-field> @@ -125,7 +125,7 @@ ], loadBalances: [ ], - required: value => !!value || 'Service ID is required', + required: value => !!value || 'Service ID is required, in form of group/service:version, group and version are optional', template: 'methodName: sayHello # 0 for all methods\n' + 'strategy: # leastactive, random, roundrobin', diff --git a/dubbo-admin-frontend/src/components/governance/Overrides.vue b/dubbo-admin-frontend/src/components/governance/Overrides.vue index 85edab1..b6071ef 100644 --- a/dubbo-admin-frontend/src/components/governance/Overrides.vue +++ b/dubbo-admin-frontend/src/components/governance/Overrides.vue @@ -62,7 +62,7 @@ <v-card-text > <v-text-field label="Service Unique ID" - hint="A service ID is service name" + hint="A service ID in form of group/service:version, group and version are optional" :rules="[required]" v-model="service" ></v-text-field> @@ -119,7 +119,7 @@ operations: operations, configs: [ ], - required: value => !!value || 'Service ID is Required.', + required: value => !!value || 'Service ID is required, in form of group/service:version, group and version are optional', template: 'application: # consumer\'s application name, empty for all \n' + 'address: 192.168.0.1 # consumer\'s ip address, empty for all consumers\n' + diff --git a/dubbo-admin-frontend/src/components/governance/RoutingRule.vue b/dubbo-admin-frontend/src/components/governance/RoutingRule.vue index fa9455b..7907d39 100644 --- a/dubbo-admin-frontend/src/components/governance/RoutingRule.vue +++ b/dubbo-admin-frontend/src/components/governance/RoutingRule.vue @@ -65,7 +65,7 @@ <v-card-text > <v-text-field label="Service Unique ID" - hint="A service ID in form of service:version, version is optional" + hint="A service ID in form of group/service:version, group and version are optional" :rules="[required]" v-model="service" ></v-text-field> @@ -129,7 +129,7 @@ operations: operations, routingRules: [ ], - required: value => !!value || 'Service ID is required', + required: value => !!value || 'Service ID is required, in form of group/service:version, group and version are optional', template: 'enabled: true/false\n' + 'priority:\n' + diff --git a/dubbo-admin-frontend/src/components/governance/WeightAdjust.vue b/dubbo-admin-frontend/src/components/governance/WeightAdjust.vue index aefeae2..d914991 100644 --- a/dubbo-admin-frontend/src/components/governance/WeightAdjust.vue +++ b/dubbo-admin-frontend/src/components/governance/WeightAdjust.vue @@ -64,7 +64,7 @@ <v-card-text > <v-text-field label="Service Unique ID" - hint="A service ID is service name" + hint="A service ID in form of group/service:version, group and version are optional" :rules="[required]" v-model="service" ></v-text-field> @@ -126,7 +126,7 @@ ], weights: [ ], - required: value => !!value || 'Service ID is required', + required: value => !!value || 'Service ID is required, in form of group/service:version, group and version are optional', template: 'weight: 100 # 100 for default\n' + 'provider: # provider\'s ip\n' +