diff --git a/core b/core
index c7f866ea..8a269ab6 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit c7f866ea614f8e25d23889842aca63b47cd32f8f
+Subproject commit 8a269ab652f3e08d658cc922aa7744ab14d1cb30
diff --git a/deploy/deploy-kvdb/pom.xml b/deploy/deploy-kvdb/pom.xml
deleted file mode 100644
index bdf82e22..00000000
--- a/deploy/deploy-kvdb/pom.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-
- deploy-root
- com.jd.blockchain
- 1.4.0-SNAPSHOT
-
- 4.0.0
-
- deploy-kvdb
- 1.0.1.RELEASE
-
-
-
-
- com.jd.blockchain
- kvdb-protocol
- ${kvdb.version}
-
-
-
- com.jd.blockchain
- kvdb-engine
- ${kvdb.version}
-
-
-
- com.jd.blockchain
- kvdb-server
- ${kvdb.version}
-
-
-
- com.jd.blockchain
- kvdb-cli
- ${kvdb.version}
-
-
-
- com.jd.blockchain
- kvdb-benchmark
- ${kvdb.version}
-
-
-
- com.jd.blockchain
- kvdb-client
- ${kvdb.version}
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-assembly-plugin
-
-
- make-assembly
- package
-
- single
-
-
- kvdb
-
- src/main/resources/assembly.xml
-
-
-
-
-
-
-
-
- net.nicoulaj.maven.plugins
- checksum-maven-plugin
- 1.8
-
-
-
- artifacts
-
-
-
-
-
- SHA-256
-
- ${project.basedir}/target/deployment-kvdb-${project.version}.zip
- true
- ${project.basedir}/target/SHA-256.xml
-
-
-
-
-
diff --git a/deploy/deploy-kvdb/src/main/resources/assembly.xml b/deploy/deploy-kvdb/src/main/resources/assembly.xml
deleted file mode 100644
index 34a09ee3..00000000
--- a/deploy/deploy-kvdb/src/main/resources/assembly.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
- ${project.version}
-
- zip
-
- false
-
-
- src/main/resources/script
- bin
- unix
-
-
- src/main/resources/config
- config
- unix
-
-
- src/main/resources/system
- system
- unix
-
-
-
-
- false
- true
- libs
-
-
-
-
-
- true
-
- com.jd.blockchain:kvdb-engine
- com.jd.blockchain:kvdb-benchmark
- com.jd.blockchain:kvdb-client
- com.jd.blockchain:kvdb-protocol
- com.jd.blockchain:kvdb-cli
- com.jd.blockchain:kvdb-server
-
-
- libs
- false
-
-
-
-
-
\ No newline at end of file
diff --git a/deploy/deploy-kvdb/src/main/resources/config/cluster.conf b/deploy/deploy-kvdb/src/main/resources/config/cluster.conf
deleted file mode 100644
index 9801c753..00000000
--- a/deploy/deploy-kvdb/src/main/resources/config/cluster.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# 数据库集群的分片数,每一个分片都赋予唯一的编号,分片编号最小为 0,所有分片的编号必须连续递增
-#cluster.test1.partitions=2
-# 数据库集群 ‘’ 的第 1 个分片的数据库实例地址(URL格式);
-#cluster.test1.0=kvdb://localhost:7078/test1
-# 数据库集群 ‘’ 的第 2 个分片的数据库实例地址(URL格式);
-#cluster.test1.1=kvdb://localhost:7079/test1
-
-# 指定多个不同的集群
-#cluster.test2.partitions=2
-#cluster.test2.0=kvdb://localhost:7078/test2
-#cluster.test2.1=kvdb://localhost:7079/test2
\ No newline at end of file
diff --git a/deploy/deploy-kvdb/src/main/resources/config/kvdb.conf b/deploy/deploy-kvdb/src/main/resources/config/kvdb.conf
deleted file mode 100644
index 1b47c61a..00000000
--- a/deploy/deploy-kvdb/src/main/resources/config/kvdb.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-# 数据库服务的本机监听地址;
-server.host=0.0.0.0
-
-# 数据库服务的本机监听端口;
-server.port=7078
-
-# 管理控制台的端口;
-# 注:管理控制台总是绑定到环回地址 127.0.0.1,只允许本机访问;
-manager.port=7060
-
-# 数据库实例默认的根目录
-dbs.rootdir=../dbs
-
-# 数据库实例默认的本地分区数
-dbs.partitions=4
\ No newline at end of file
diff --git a/deploy/deploy-kvdb/src/main/resources/script/kvdb-benchmark.sh b/deploy/deploy-kvdb/src/main/resources/script/kvdb-benchmark.sh
deleted file mode 100644
index b2180397..00000000
--- a/deploy/deploy-kvdb/src/main/resources/script/kvdb-benchmark.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-HOME=$(cd `dirname $0`;cd ../; pwd)
-KVDB=$(ls $HOME/libs | grep kvdb-benchmark)
-JVM_SET="-Xmx2g -Xms2g"
-LOG_SET="-Dlogging.path="$HOME/logs" -Dlogging.level=error"
-PROC_INFO=$HOME/libs/$KVDB
-if [ ! -n "$KVDB" ]; then
- echo "Can not find kvdb-benchmark !!!"
-else
- java -jar $LOG_SET $JVM_SET $PROC_INFO $*
-fi
\ No newline at end of file
diff --git a/deploy/deploy-kvdb/src/main/resources/script/kvdb-cli.sh b/deploy/deploy-kvdb/src/main/resources/script/kvdb-cli.sh
deleted file mode 100644
index fd6474a8..00000000
--- a/deploy/deploy-kvdb/src/main/resources/script/kvdb-cli.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-HOME=$(cd `dirname $0`;cd ../; pwd)
-KVDB=$(ls $HOME/libs | grep kvdb-cli)
-JVM_SET="-Xmx2g -Xms2g"
-LOG_SET="-Dlogging.path="$HOME/logs" -Dlogging.level.root=error"
-PROC_INFO=$HOME/libs/$KVDB
-if [ ! -n "$KVDB" ]; then
- echo "Can not find kvdb-cli !!!"
-else
- java -jar $LOG_SET $JVM_SET $PROC_INFO $*
-fi
\ No newline at end of file
diff --git a/deploy/deploy-kvdb/src/main/resources/script/start.sh b/deploy/deploy-kvdb/src/main/resources/script/start.sh
deleted file mode 100644
index 18fdc9c6..00000000
--- a/deploy/deploy-kvdb/src/main/resources/script/start.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-HOME=$(cd `dirname $0`;cd ../; pwd)
-KVDB=$(ls $HOME/libs | grep kvdb-server)
-JVM_SET="-Xmx2g -Xms2g"
-PROC_INFO=$HOME/libs/$KVDB" -home "$HOME
-LOG_SET="-Dlogging.path="$HOME/logs" -Dlogging.level=error"
-#echo $PROC_INFO
-#get PID
-PID=`ps -ef | grep "$PROC_INFO" | grep -v grep | awk '{print $2}'`
-#echo $PID
-if [[ ! -z $PID ]]
-then
- echo "process already exists,please check... If necessary, you should kill the process first."
- exit
-fi
-if [ ! -n "$KVDB" ]; then
- echo "Can not find kvdb-server !!!"
-else
- nohup java -jar $LOG_SET $JVM_SET $PROC_INFO $* >/dev/null 2>&1 &
-
- echo $! > $HOME/system/pid
-fi
\ No newline at end of file
diff --git a/deploy/deploy-kvdb/src/main/resources/script/stop.sh b/deploy/deploy-kvdb/src/main/resources/script/stop.sh
deleted file mode 100644
index 5b654ff7..00000000
--- a/deploy/deploy-kvdb/src/main/resources/script/stop.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-#启动Home路径
-HOME=$(cd `dirname $0`;cd ../; pwd)
-
-#进程启动后PID.log所在路径
-PID_LOG=$HOME/system/pid
-
-#从启动文件中读取PID
-if [ -f "$PID_LOG" ]; then
- # File exist
- echo "Read PID From File:[$PID_LOG] ..."
- PID=`sed -n '$p' $PID_LOG`
-#启动文件不存在则直接通过PS进行过滤
-else
- PID=`ps -ef | grep $HOME/libs/kvdb-server | grep -v grep | awk '{print $2}'`
-fi
-
-#通过Kill命令将进程杀死
-if [ -z "$PID" ]; then
- echo "Unable to find kvdb PID. stop aborted."
-else
- echo "Start to kill PID = $PID ..."
- kill -9 $PID
- echo "kvdb has been stopped ..."
- echo "" > $PID_LOG
-fi
\ No newline at end of file
diff --git a/deploy/deploy-kvdb/src/main/resources/system/dblist b/deploy/deploy-kvdb/src/main/resources/system/dblist
deleted file mode 100644
index 0d45040c..00000000
--- a/deploy/deploy-kvdb/src/main/resources/system/dblist
+++ /dev/null
@@ -1,2 +0,0 @@
-#通过配置enable为true可以在kvdb-server启动时创建或加载指定数据库
-#db.test1.enable=true
\ No newline at end of file
diff --git a/deploy/pom.xml b/deploy/pom.xml
index de93b710..fbb4ce19 100644
--- a/deploy/pom.xml
+++ b/deploy/pom.xml
@@ -21,7 +21,6 @@
../core
deploy-gateway
deploy-peer
- deploy-kvdb
diff --git a/kvdb b/kvdb
deleted file mode 160000
index 410de249..00000000
--- a/kvdb
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 410de24918b6c7214bafe316f5cc734d87c5b433
diff --git a/pom.xml b/pom.xml
index cd954299..eff9ec18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,6 @@
project
framework
core
- kvdb
deploy
test
samples