diff --git a/.gitmodules b/.gitmodules
index bc38453f19280d94c5c950e650dc0a96abffde62..34a2da2894bd64ff122b67596c16e0bed7d08a74 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,3 +16,6 @@
 [submodule "tools/taos-tools"]
 	path = tools/taos-tools
 	url = https://github.com/taosdata/taos-tools
+[submodule "tools/taosadapter"]
+	path = tools/taosadapter
+	url = https://github.com/taosdata/taosadapter.git
diff --git a/cmake/cmake.define b/cmake/cmake.define
index 8d71870e7d8ce3e554dd9c6810ea3829e5e9511a..f58c1ad3548202781834cc8c29c54c4d55af953c 100644
--- a/cmake/cmake.define
+++ b/cmake/cmake.define
@@ -18,6 +18,33 @@ if (NOT DEFINED TD_GRANT)
   SET(TD_GRANT FALSE)
 endif()
 
+IF ("${BUILD_HTTP}" STREQUAL "")
+  IF (TD_LINUX)
+    IF (TD_ARM_32)
+      SET(TD_BUILD_HTTP TRUE)
+    ELSE ()
+      SET(TD_BUILD_HTTP TRUE)
+    ENDIF ()
+  ELSEIF (TD_DARWIN)
+    SET(TD_BUILD_HTTP TRUE)
+  ELSE ()
+    SET(TD_BUILD_HTTP TRUE)
+  ENDIF ()
+ELSEIF (${BUILD_HTTP} MATCHES "false")
+  SET(TD_BUILD_HTTP FALSE)
+ELSEIF (${BUILD_HTTP} MATCHES "true")
+  SET(TD_BUILD_HTTP TRUE)
+ELSEIF (${BUILD_HTTP} MATCHES "internal")
+  SET(TD_BUILD_HTTP FALSE)
+  SET(TD_BUILD_TAOSA_INTERNAL TRUE)
+ELSE ()
+  SET(TD_BUILD_HTTP TRUE)
+ENDIF ()
+
+IF (TD_BUILD_HTTP)
+  ADD_DEFINITIONS(-DHTTP_EMBEDDED)
+ENDIF ()
+
 IF ("${BUILD_TOOLS}" STREQUAL "")
   IF (TD_LINUX)
     IF (TD_ARM_32)
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index afd3b36f2d071537e1ffdb74fd670dc7516a2208..da1afe84a705d68fe03e4d878b6260dc7e252092 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -9,3 +9,95 @@ IF (TD_TAOS_TOOLS)
 ENDIF ()
 
 add_subdirectory(shell)
+IF (TD_BUILD_HTTP)
+    MESSAGE("")
+    MESSAGE("${Yellow} use original embedded httpd ${ColourReset}")
+    MESSAGE("")
+    #    ADD_SUBDIRECTORY(http)
+ELSEIF(TD_BUILD_TAOSA_INTERNAL)
+    MESSAGE("${Yellow} use taosa internal as httpd ${ColourReset}")
+ELSE ()
+    MESSAGE("")
+    MESSAGE("${Green} use taosadapter as httpd, platform is ${PLATFORM_ARCH_STR} ${ColourReset}")
+
+    EXECUTE_PROCESS(
+            COMMAND  git rev-parse --abbrev-ref HEAD
+            RESULT_VARIABLE result_taos_version
+            OUTPUT_VARIABLE taos_version
+    )
+
+    STRING(FIND ${taos_version} release is_release_branch)
+
+    IF ("${is_release_branch}" STREQUAL "0")
+        STRING(SUBSTRING "${taos_version}" 12 -1 taos_version)
+        STRING(STRIP "${taos_version}" taos_version)
+    ELSE ()
+        STRING(CONCAT taos_version "_branch_" "${taos_version}")
+        STRING(STRIP "${taos_version}" taos_version)
+    ENDIF ()
+    EXECUTE_PROCESS(
+            COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter
+    )
+    EXECUTE_PROCESS(
+            COMMAND git rev-parse --short HEAD
+            RESULT_VARIABLE commit_sha1
+            OUTPUT_VARIABLE taosadapter_commit_sha1
+    )
+    IF ("${taosadapter_commit_sha1}" STREQUAL "")
+        SET(taosadapter_commit_sha1 "unknown")
+    ELSE ()
+        STRING(SUBSTRING "${taosadapter_commit_sha1}" 0 7 taosadapter_commit_sha1)
+        STRING(STRIP "${taosadapter_commit_sha1}" taosadapter_commit_sha1)
+    ENDIF ()
+    MESSAGE("${Green} taosAdapter will use ${taos_version} and commit ${taosadapter_commit_sha1} as version ${ColourReset}")
+    EXECUTE_PROCESS(
+            COMMAND cd ..
+    )
+    MESSAGE("CURRENT SOURCE DIR ${CMAKE_CURRENT_SOURCE_DIR}")
+    IF (TD_LINUX)
+        include(ExternalProject)
+        ExternalProject_Add(taosadapter
+                PREFIX        "taosadapter"
+                SOURCE_DIR    ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter
+                BUILD_ALWAYS         off
+                DEPENDS             taos
+                BUILD_IN_SOURCE     1
+                CONFIGURE_COMMAND cmake -E echo "taosadapter no need cmake to config"
+                PATCH_COMMAND
+                COMMAND     git clean -f -d
+                BUILD_COMMAND
+                COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib  go build -a -ldflags "-s -w -X github.com/taosdata/taosadapter/version.Version=${taos_version} -X github.com/taosdata/taosadapter/version.CommitID=${taosadapter_commit_sha1}"
+                COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib  go build -a -o taosadapter-debug -ldflags "-X github.com/taosdata/taosadapter/version.Version=${taos_version} -X github.com/taosdata/taosadapter/version.CommitID=${taosadapter_commit_sha1}"
+                INSTALL_COMMAND
+                COMMAND curl -sL https://github.com/upx/upx/releases/download/v3.96/upx-3.96-${PLATFORM_ARCH_STR}_linux.tar.xz -o upx.tar.xz && tar -xvJf upx.tar.xz -C ${CMAKE_BINARY_DIR} --strip-components 1 > /dev/null && ${CMAKE_BINARY_DIR}/upx taosadapter || :
+                COMMAND cmake -E copy taosadapter ${CMAKE_BINARY_DIR}/build/bin
+                COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test/cfg/
+                COMMAND cmake -E copy ./example/config/taosadapter.toml ${CMAKE_BINARY_DIR}/test/cfg/
+                COMMAND cmake -E copy ./taosadapter.service ${CMAKE_BINARY_DIR}/test/cfg/
+                COMMAND cmake -E copy taosadapter-debug ${CMAKE_BINARY_DIR}/build/bin
+                )
+    ELSEIF (TD_DARWIN)
+        include(ExternalProject)
+        ExternalProject_Add(taosadapter
+                PREFIX        "taosadapter"
+                SOURCE_DIR    ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter
+                BUILD_ALWAYS         off
+                DEPENDS             taos
+                BUILD_IN_SOURCE     1
+                CONFIGURE_COMMAND cmake -E echo "taosadapter no need cmake to config"
+                PATCH_COMMAND
+                COMMAND     git clean -f -d
+                BUILD_COMMAND
+                COMMAND    CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib  go build -a -ldflags "-s -w -X github.com/taosdata/taosadapter/version.Version=${taos_version} -X github.com/taosdata/taosadapter/version.CommitID=${taosadapter_commit_sha1}"
+                COMMAND    CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib  go build -a -o taosadapter-debug -ldflags "-X github.com/taosdata/taosadapter/version.Version=${taos_version} -X github.com/taosdata/taosadapter/version.CommitID=${taosadapter_commit_sha1}"
+                INSTALL_COMMAND
+                COMMAND cmake -E copy taosadapter ${CMAKE_BINARY_DIR}/build/bin
+                COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test/cfg/
+                COMMAND cmake -E copy ./example/config/taosadapter.toml ${CMAKE_BINARY_DIR}/test/cfg/
+                COMMAND cmake -E copy ./taosadapter.service ${CMAKE_BINARY_DIR}/test/cfg/
+                COMMAND cmake -E copy taosadapter-debug ${CMAKE_BINARY_DIR}/build/bin
+                )
+    ELSE ()
+        MESSAGE("${Yellow} Windows system still use original embedded httpd ${ColourReset}")
+    ENDIF ()
+ENDIF ()
diff --git a/tools/taosadapter b/tools/taosadapter
new file mode 160000
index 0000000000000000000000000000000000000000..9ce3f5c98ef95d9c7c596c4ed7302b0ed69a92b2
--- /dev/null
+++ b/tools/taosadapter
@@ -0,0 +1 @@
+Subproject commit 9ce3f5c98ef95d9c7c596c4ed7302b0ed69a92b2