You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ki...@apache.org on 2020/06/24 04:39:16 UTC
[shardingsphere-ui] branch master updated: support etcd config
center
This is an automated email from the ASF dual-hosted git repository.
kimmking pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-ui.git
The following commit(s) were added to refs/heads/master by this push:
new 26bf6d1 support etcd config center
new d525af9 Merge pull request #2 from cncounter/master
26bf6d1 is described below
commit 26bf6d1c8910f95a3e13908dc59ae3cf710faff4
Author: renfufei <re...@huobi.com>
AuthorDate: Tue Jun 23 19:07:55 2020 +0800
support etcd config center
Add etcd support
Update guava version same as ss.
throw exception with the cause
---
pom.xml | 7 +++++++
shardingsphere-ui-backend/pom.xml | 5 +++++
.../ui/servcie/impl/ShardingSchemaServiceImpl.java | 2 +-
.../shardingsphere/ui/util/CenterRepositoryFactory.java | 11 +++++++++++
shardingsphere-ui-frontend/src/lang/zh-CN.js | 4 ++--
.../src/views/config-center/module/configCenter.vue | 2 ++
.../src/views/registry-center/module/registryCenter.vue | 2 ++
7 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5f61c05..cf7a8dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,7 @@
<frontend-maven-plugin.version>1.6</frontend-maven-plugin.version>
<os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version>
<takari-maven-plugin.version>0.6.1</takari-maven-plugin.version>
+ <guava.version>20.0</guava.version>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
@@ -57,6 +58,12 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/shardingsphere-ui-backend/pom.xml b/shardingsphere-ui-backend/pom.xml
index 12e1f54..f01b644 100644
--- a/shardingsphere-ui-backend/pom.xml
+++ b/shardingsphere-ui-backend/pom.xml
@@ -58,6 +58,11 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-orchestration-center-etcd</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-cluster-facade</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/servcie/impl/ShardingSchemaServiceImpl.java b/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/servcie/impl/ShardingSchemaServiceImpl.java
index 7a9487b..d2727e2 100644
--- a/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/servcie/impl/ShardingSchemaServiceImpl.java
+++ b/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/servcie/impl/ShardingSchemaServiceImpl.java
@@ -97,7 +97,7 @@ public final class ShardingSchemaServiceImpl implements ShardingSchemaService {
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
- throw new IllegalArgumentException("rule configuration is invalid.");
+ throw new IllegalArgumentException("rule configuration is invalid.", ex);
}
}
diff --git a/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/util/CenterRepositoryFactory.java b/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/util/CenterRepositoryFactory.java
index 097b7fd..07aa955 100644
--- a/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/util/CenterRepositoryFactory.java
+++ b/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/util/CenterRepositoryFactory.java
@@ -23,6 +23,7 @@ import org.apache.shardingsphere.orchestration.center.ConfigCenterRepository;
import org.apache.shardingsphere.orchestration.center.RegistryCenterRepository;
import org.apache.shardingsphere.orchestration.center.config.CenterConfiguration;
import org.apache.shardingsphere.orchestration.center.instance.CuratorZookeeperCenterRepository;
+import org.apache.shardingsphere.orchestration.center.instance.EtcdCenterRepository;
import org.apache.shardingsphere.ui.common.constant.InstanceType;
import org.apache.shardingsphere.ui.common.domain.CenterConfig;
@@ -55,6 +56,11 @@ public final class CenterRepositoryFactory {
case ZOOKEEPER:
result = new CuratorZookeeperCenterRepository();
break;
+ case ETCD:
+ EtcdCenterRepository etcdCenterRepository = new EtcdCenterRepository();
+ etcdCenterRepository.setProps(new Properties());
+ result = etcdCenterRepository;
+ break;
default:
throw new UnsupportedOperationException(config.getName());
}
@@ -79,6 +85,11 @@ public final class CenterRepositoryFactory {
case ZOOKEEPER:
result = new CuratorZookeeperCenterRepository();
break;
+ case ETCD:
+ EtcdCenterRepository etcdCenterRepository = new EtcdCenterRepository();
+ etcdCenterRepository.setProps(new Properties());
+ result = etcdCenterRepository;
+ break;
default:
throw new UnsupportedOperationException(config.getName());
}
diff --git a/shardingsphere-ui-frontend/src/lang/zh-CN.js b/shardingsphere-ui-frontend/src/lang/zh-CN.js
index 7d16891..07d7221 100644
--- a/shardingsphere-ui-frontend/src/lang/zh-CN.js
+++ b/shardingsphere-ui-frontend/src/lang/zh-CN.js
@@ -121,7 +121,7 @@ export default {
name: '请输入注册中心名称',
centerType: '请选择注册中心类型',
namespaces: '请输入命名空间',
- address: '请选输入注册中心地址',
+ address: '请输入注册中心地址',
orchestrationName: '请输入数据治理实例名称',
digest: '请输入登录凭证'
}
@@ -151,7 +151,7 @@ export default {
name: '请输入配置中心名称',
centerType: '请选择配置中心类型',
namespaces: '请输入命名空间',
- address: '请选输入配置中心地址',
+ address: '请输入配置中心地址',
orchestrationName: '请输入数据治理实例名称',
digest: '请输入登录凭证'
}
diff --git a/shardingsphere-ui-frontend/src/views/config-center/module/configCenter.vue b/shardingsphere-ui-frontend/src/views/config-center/module/configCenter.vue
index 19dbd81..999f9cf 100644
--- a/shardingsphere-ui-frontend/src/views/config-center/module/configCenter.vue
+++ b/shardingsphere-ui-frontend/src/views/config-center/module/configCenter.vue
@@ -101,6 +101,7 @@
<el-form-item :label="$t('configCenter.configDialog.centerType')" prop="instanceType">
<el-radio-group v-model="form.instanceType">
<el-radio label="Zookeeper">Zookeeper</el-radio>
+ <el-radio label="Etcd">Etcd</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item :label="$t('configCenter.configDialog.address')" prop="serverLists">
@@ -152,6 +153,7 @@
<el-form-item :label="$t('configCenter.configDialog.centerType')" prop="instanceType">
<el-radio-group v-model="editForm.instanceType">
<el-radio label="Zookeeper">Zookeeper</el-radio>
+ <el-radio label="Etcd">Etcd</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item :label="$t('configCenter.configDialog.address')" prop="serverLists">
diff --git a/shardingsphere-ui-frontend/src/views/registry-center/module/registryCenter.vue b/shardingsphere-ui-frontend/src/views/registry-center/module/registryCenter.vue
index 30d4d80..3a74952 100644
--- a/shardingsphere-ui-frontend/src/views/registry-center/module/registryCenter.vue
+++ b/shardingsphere-ui-frontend/src/views/registry-center/module/registryCenter.vue
@@ -101,6 +101,7 @@
<el-form-item :label="$t('registryCenter.registDialog.centerType')" prop="instanceType">
<el-radio-group v-model="form.instanceType">
<el-radio label="Zookeeper">Zookeeper</el-radio>
+ <el-radio label="Etcd">Etcd</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item :label="$t('registryCenter.registDialog.address')" prop="serverLists">
@@ -152,6 +153,7 @@
<el-form-item :label="$t('registryCenter.registDialog.centerType')" prop="instanceType">
<el-radio-group v-model="editForm.instanceType">
<el-radio label="Zookeeper">Zookeeper</el-radio>
+ <el-radio label="Etcd">Etcd</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item :label="$t('registryCenter.registDialog.address')" prop="serverLists">