diff --git a/canal-admin/canal-admin-ui/.editorconfig b/admin/admin-ui/.editorconfig
similarity index 100%
rename from canal-admin/canal-admin-ui/.editorconfig
rename to admin/admin-ui/.editorconfig
diff --git a/canal-admin/canal-admin-ui/.env.development b/admin/admin-ui/.env.development
similarity index 100%
rename from canal-admin/canal-admin-ui/.env.development
rename to admin/admin-ui/.env.development
diff --git a/canal-admin/canal-admin-ui/.env.production b/admin/admin-ui/.env.production
similarity index 100%
rename from canal-admin/canal-admin-ui/.env.production
rename to admin/admin-ui/.env.production
diff --git a/canal-admin/canal-admin-ui/.env.staging b/admin/admin-ui/.env.staging
similarity index 100%
rename from canal-admin/canal-admin-ui/.env.staging
rename to admin/admin-ui/.env.staging
diff --git a/canal-admin/canal-admin-ui/.eslintignore b/admin/admin-ui/.eslintignore
similarity index 100%
rename from canal-admin/canal-admin-ui/.eslintignore
rename to admin/admin-ui/.eslintignore
diff --git a/canal-admin/canal-admin-ui/.eslintrc.js b/admin/admin-ui/.eslintrc.js
similarity index 100%
rename from canal-admin/canal-admin-ui/.eslintrc.js
rename to admin/admin-ui/.eslintrc.js
diff --git a/canal-admin/canal-admin-ui/.gitignore b/admin/admin-ui/.gitignore
similarity index 100%
rename from canal-admin/canal-admin-ui/.gitignore
rename to admin/admin-ui/.gitignore
diff --git a/canal-admin/canal-admin-ui/.travis.yml b/admin/admin-ui/.travis.yml
similarity index 100%
rename from canal-admin/canal-admin-ui/.travis.yml
rename to admin/admin-ui/.travis.yml
diff --git a/canal-admin/canal-admin-ui/LICENSE b/admin/admin-ui/LICENSE
similarity index 100%
rename from canal-admin/canal-admin-ui/LICENSE
rename to admin/admin-ui/LICENSE
diff --git a/canal-admin/canal-admin-ui/babel.config.js b/admin/admin-ui/babel.config.js
similarity index 100%
rename from canal-admin/canal-admin-ui/babel.config.js
rename to admin/admin-ui/babel.config.js
diff --git a/canal-admin/canal-admin-ui/build/index.js b/admin/admin-ui/build/index.js
similarity index 100%
rename from canal-admin/canal-admin-ui/build/index.js
rename to admin/admin-ui/build/index.js
diff --git a/canal-admin/canal-admin-ui/jest.config.js b/admin/admin-ui/jest.config.js
similarity index 100%
rename from canal-admin/canal-admin-ui/jest.config.js
rename to admin/admin-ui/jest.config.js
diff --git a/canal-admin/canal-admin-ui/mock/index.js b/admin/admin-ui/mock/index.js
similarity index 100%
rename from canal-admin/canal-admin-ui/mock/index.js
rename to admin/admin-ui/mock/index.js
diff --git a/canal-admin/canal-admin-ui/mock/mock-server.js b/admin/admin-ui/mock/mock-server.js
similarity index 100%
rename from canal-admin/canal-admin-ui/mock/mock-server.js
rename to admin/admin-ui/mock/mock-server.js
diff --git a/canal-admin/canal-admin-ui/mock/table.js b/admin/admin-ui/mock/table.js
similarity index 100%
rename from canal-admin/canal-admin-ui/mock/table.js
rename to admin/admin-ui/mock/table.js
diff --git a/canal-admin/canal-admin-ui/mock/user.js b/admin/admin-ui/mock/user.js
similarity index 100%
rename from canal-admin/canal-admin-ui/mock/user.js
rename to admin/admin-ui/mock/user.js
diff --git a/admin/admin-ui/node/node b/admin/admin-ui/node/node
new file mode 100755
index 00000000..cafd5bf5
Binary files /dev/null and b/admin/admin-ui/node/node differ
diff --git a/canal-admin/canal-admin-ui/package.json b/admin/admin-ui/package.json
similarity index 100%
rename from canal-admin/canal-admin-ui/package.json
rename to admin/admin-ui/package.json
diff --git a/canal-admin/canal-admin-ui/pom.xml b/admin/admin-ui/pom.xml
similarity index 94%
rename from canal-admin/canal-admin-ui/pom.xml
rename to admin/admin-ui/pom.xml
index aaa98be6..d60b2312 100644
--- a/canal-admin/canal-admin-ui/pom.xml
+++ b/admin/admin-ui/pom.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <artifactId>canal-admin</artifactId>
+    <artifactId>canal.admin</artifactId>
     <groupId>com.alibaba.otter</groupId>
     <version>1.1.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>canal-admin-ui</artifactId>
-
+  <artifactId>canal.admin-ui</artifactId>
+  <name>canal admin-ui module for otter ${project.version}</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/canal-admin/canal-admin-ui/postcss.config.js b/admin/admin-ui/postcss.config.js
similarity index 100%
rename from canal-admin/canal-admin-ui/postcss.config.js
rename to admin/admin-ui/postcss.config.js
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/avatar.gif b/admin/admin-ui/public/avatar.gif
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/avatar.gif
rename to admin/admin-ui/public/avatar.gif
diff --git a/canal-admin/canal-admin-ui/public/favicon.ico b/admin/admin-ui/public/favicon.ico
similarity index 100%
rename from canal-admin/canal-admin-ui/public/favicon.ico
rename to admin/admin-ui/public/favicon.ico
diff --git a/canal-admin/canal-admin-ui/public/index.html b/admin/admin-ui/public/index.html
similarity index 100%
rename from canal-admin/canal-admin-ui/public/index.html
rename to admin/admin-ui/public/index.html
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/logo.png b/admin/admin-ui/public/logo.png
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/logo.png
rename to admin/admin-ui/public/logo.png
diff --git a/canal-admin/canal-admin-ui/src/App.vue b/admin/admin-ui/src/App.vue
similarity index 100%
rename from canal-admin/canal-admin-ui/src/App.vue
rename to admin/admin-ui/src/App.vue
diff --git a/canal-admin/canal-admin-ui/src/api/canalCluster.js b/admin/admin-ui/src/api/canalCluster.js
similarity index 100%
rename from canal-admin/canal-admin-ui/src/api/canalCluster.js
rename to admin/admin-ui/src/api/canalCluster.js
diff --git a/canal-admin/canal-admin-ui/src/api/canalConfig.js b/admin/admin-ui/src/api/canalConfig.js
similarity index 100%
rename from canal-admin/canal-admin-ui/src/api/canalConfig.js
rename to admin/admin-ui/src/api/canalConfig.js
diff --git a/canal-admin/canal-admin-ui/src/api/canalInstance.js b/admin/admin-ui/src/api/canalInstance.js
similarity index 100%
rename from canal-admin/canal-admin-ui/src/api/canalInstance.js
rename to admin/admin-ui/src/api/canalInstance.js
diff --git a/canal-admin/canal-admin-ui/src/api/nodeServer.js b/admin/admin-ui/src/api/nodeServer.js
similarity index 100%
rename from canal-admin/canal-admin-ui/src/api/nodeServer.js
rename to admin/admin-ui/src/api/nodeServer.js
diff --git a/canal-admin/canal-admin-ui/src/api/table.js b/admin/admin-ui/src/api/table.js
similarity index 100%
rename from canal-admin/canal-admin-ui/src/api/table.js
rename to admin/admin-ui/src/api/table.js
diff --git a/canal-admin/canal-admin-ui/src/api/user.js b/admin/admin-ui/src/api/user.js
similarity index 100%
rename from canal-admin/canal-admin-ui/src/api/user.js
rename to admin/admin-ui/src/api/user.js
diff --git a/canal-admin/canal-admin-ui/src/assets/404_images/404.png b/admin/admin-ui/src/assets/404_images/404.png
similarity index 100%
rename from canal-admin/canal-admin-ui/src/assets/404_images/404.png
rename to admin/admin-ui/src/assets/404_images/404.png
diff --git a/canal-admin/canal-admin-ui/src/assets/404_images/404_cloud.png b/admin/admin-ui/src/assets/404_images/404_cloud.png
similarity index 100%
rename from canal-admin/canal-admin-ui/src/assets/404_images/404_cloud.png
rename to admin/admin-ui/src/assets/404_images/404_cloud.png
diff --git a/canal-admin/canal-admin-ui/src/components/Breadcrumb/index.vue b/admin/admin-ui/src/components/Breadcrumb/index.vue
similarity index 100%
rename from canal-admin/canal-admin-ui/src/components/Breadcrumb/index.vue
rename to admin/admin-ui/src/components/Breadcrumb/index.vue
diff --git a/canal-admin/canal-admin-ui/src/components/Hamburger/index.vue b/admin/admin-ui/src/components/Hamburger/index.vue
similarity index 100%
rename from canal-admin/canal-admin-ui/src/components/Hamburger/index.vue
rename to admin/admin-ui/src/components/Hamburger/index.vue
diff --git a/canal-admin/canal-admin-ui/src/components/Pagination/index.vue b/admin/admin-ui/src/components/Pagination/index.vue
similarity index 100%
rename from canal-admin/canal-admin-ui/src/components/Pagination/index.vue
rename to admin/admin-ui/src/components/Pagination/index.vue
diff --git a/canal-admin/canal-admin-ui/src/components/SvgIcon/index.vue b/admin/admin-ui/src/components/SvgIcon/index.vue
similarity index 100%
rename from canal-admin/canal-admin-ui/src/components/SvgIcon/index.vue
rename to admin/admin-ui/src/components/SvgIcon/index.vue
diff --git a/canal-admin/canal-admin-ui/src/icons/index.js b/admin/admin-ui/src/icons/index.js
similarity index 100%
rename from canal-admin/canal-admin-ui/src/icons/index.js
rename to admin/admin-ui/src/icons/index.js
diff --git a/canal-admin/canal-admin-ui/src/icons/svg/dashboard.svg b/admin/admin-ui/src/icons/svg/dashboard.svg
similarity index 100%
rename from canal-admin/canal-admin-ui/src/icons/svg/dashboard.svg
rename to admin/admin-ui/src/icons/svg/dashboard.svg
diff --git a/canal-admin/canal-admin-ui/src/icons/svg/example.svg b/admin/admin-ui/src/icons/svg/example.svg
similarity index 100%
rename from canal-admin/canal-admin-ui/src/icons/svg/example.svg
rename to admin/admin-ui/src/icons/svg/example.svg
diff --git a/canal-admin/canal-admin-ui/src/icons/svg/eye-open.svg b/admin/admin-ui/src/icons/svg/eye-open.svg
similarity index 100%
rename from canal-admin/canal-admin-ui/src/icons/svg/eye-open.svg
rename to admin/admin-ui/src/icons/svg/eye-open.svg
diff --git a/canal-admin/canal-admin-ui/src/icons/svg/eye.svg b/admin/admin-ui/src/icons/svg/eye.svg
similarity index 100%
rename from canal-admin/canal-admin-ui/src/icons/svg/eye.svg
rename to admin/admin-ui/src/icons/svg/eye.svg
diff --git a/canal-admin/canal-admin-ui/src/icons/svg/form.svg b/admin/admin-ui/src/icons/svg/form.svg
similarity index 100%
rename from canal-admin/canal-admin-ui/src/icons/svg/form.svg
rename to admin/admin-ui/src/icons/svg/form.svg
diff --git a/canal-admin/canal-admin-ui/src/icons/svg/link.svg b/admin/admin-ui/src/icons/svg/link.svg
similarity index 100%
rename from canal-admin/canal-admin-ui/src/icons/svg/link.svg
rename to admin/admin-ui/src/icons/svg/link.svg
diff --git a/canal-admin/canal-admin-ui/src/icons/svg/nested.svg b/admin/admin-ui/src/icons/svg/nested.svg
similarity index 100%
rename from canal-admin/canal-admin-ui/src/icons/svg/nested.svg
rename to admin/admin-ui/src/icons/svg/nested.svg
diff --git a/canal-admin/canal-admin-ui/src/icons/svg/password.svg b/admin/admin-ui/src/icons/svg/password.svg
similarity index 100%
rename from canal-admin/canal-admin-ui/src/icons/svg/password.svg
rename to admin/admin-ui/src/icons/svg/password.svg
diff --git a/canal-admin/canal-admin-ui/src/icons/svg/table.svg b/admin/admin-ui/src/icons/svg/table.svg
similarity index 100%
rename from canal-admin/canal-admin-ui/src/icons/svg/table.svg
rename to admin/admin-ui/src/icons/svg/table.svg
diff --git a/canal-admin/canal-admin-ui/src/icons/svg/tree.svg b/admin/admin-ui/src/icons/svg/tree.svg
similarity index 100%
rename from canal-admin/canal-admin-ui/src/icons/svg/tree.svg
rename to admin/admin-ui/src/icons/svg/tree.svg
diff --git a/canal-admin/canal-admin-ui/src/icons/svg/user.svg b/admin/admin-ui/src/icons/svg/user.svg
similarity index 100%
rename from canal-admin/canal-admin-ui/src/icons/svg/user.svg
rename to admin/admin-ui/src/icons/svg/user.svg
diff --git a/canal-admin/canal-admin-ui/src/icons/svgo.yml b/admin/admin-ui/src/icons/svgo.yml
similarity index 100%
rename from canal-admin/canal-admin-ui/src/icons/svgo.yml
rename to admin/admin-ui/src/icons/svgo.yml
diff --git a/canal-admin/canal-admin-ui/src/layout/components/AppMain.vue b/admin/admin-ui/src/layout/components/AppMain.vue
similarity index 100%
rename from canal-admin/canal-admin-ui/src/layout/components/AppMain.vue
rename to admin/admin-ui/src/layout/components/AppMain.vue
diff --git a/canal-admin/canal-admin-ui/src/layout/components/Navbar.vue b/admin/admin-ui/src/layout/components/Navbar.vue
similarity index 100%
rename from canal-admin/canal-admin-ui/src/layout/components/Navbar.vue
rename to admin/admin-ui/src/layout/components/Navbar.vue
diff --git a/canal-admin/canal-admin-ui/src/layout/components/Sidebar/FixiOSBug.js b/admin/admin-ui/src/layout/components/Sidebar/FixiOSBug.js
similarity index 100%
rename from canal-admin/canal-admin-ui/src/layout/components/Sidebar/FixiOSBug.js
rename to admin/admin-ui/src/layout/components/Sidebar/FixiOSBug.js
diff --git a/canal-admin/canal-admin-ui/src/layout/components/Sidebar/Item.vue b/admin/admin-ui/src/layout/components/Sidebar/Item.vue
similarity index 100%
rename from canal-admin/canal-admin-ui/src/layout/components/Sidebar/Item.vue
rename to admin/admin-ui/src/layout/components/Sidebar/Item.vue
diff --git a/canal-admin/canal-admin-ui/src/layout/components/Sidebar/Link.vue b/admin/admin-ui/src/layout/components/Sidebar/Link.vue
similarity index 100%
rename from canal-admin/canal-admin-ui/src/layout/components/Sidebar/Link.vue
rename to admin/admin-ui/src/layout/components/Sidebar/Link.vue
diff --git a/canal-admin/canal-admin-ui/src/layout/components/Sidebar/Logo.vue b/admin/admin-ui/src/layout/components/Sidebar/Logo.vue
similarity index 100%
rename from canal-admin/canal-admin-ui/src/layout/components/Sidebar/Logo.vue
rename to admin/admin-ui/src/layout/components/Sidebar/Logo.vue
diff --git a/canal-admin/canal-admin-ui/src/layout/components/Sidebar/SidebarItem.vue b/admin/admin-ui/src/layout/components/Sidebar/SidebarItem.vue
similarity index 100%
rename from canal-admin/canal-admin-ui/src/layout/components/Sidebar/SidebarItem.vue
rename to admin/admin-ui/src/layout/components/Sidebar/SidebarItem.vue
diff --git a/canal-admin/canal-admin-ui/src/layout/components/Sidebar/index.vue b/admin/admin-ui/src/layout/components/Sidebar/index.vue
similarity index 100%
rename from canal-admin/canal-admin-ui/src/layout/components/Sidebar/index.vue
rename to admin/admin-ui/src/layout/components/Sidebar/index.vue
diff --git a/canal-admin/canal-admin-ui/src/layout/components/index.js b/admin/admin-ui/src/layout/components/index.js
similarity index 100%
rename from canal-admin/canal-admin-ui/src/layout/components/index.js
rename to admin/admin-ui/src/layout/components/index.js
diff --git a/canal-admin/canal-admin-ui/src/layout/index.vue b/admin/admin-ui/src/layout/index.vue
similarity index 100%
rename from canal-admin/canal-admin-ui/src/layout/index.vue
rename to admin/admin-ui/src/layout/index.vue
diff --git a/canal-admin/canal-admin-ui/src/layout/mixin/ResizeHandler.js b/admin/admin-ui/src/layout/mixin/ResizeHandler.js
similarity index 100%
rename from canal-admin/canal-admin-ui/src/layout/mixin/ResizeHandler.js
rename to admin/admin-ui/src/layout/mixin/ResizeHandler.js
diff --git a/canal-admin/canal-admin-ui/src/main.js b/admin/admin-ui/src/main.js
similarity index 100%
rename from canal-admin/canal-admin-ui/src/main.js
rename to admin/admin-ui/src/main.js
diff --git a/canal-admin/canal-admin-ui/src/permission.js b/admin/admin-ui/src/permission.js
similarity index 100%
rename from canal-admin/canal-admin-ui/src/permission.js
rename to admin/admin-ui/src/permission.js
diff --git a/canal-admin/canal-admin-ui/src/router/index.js b/admin/admin-ui/src/router/index.js
similarity index 100%
rename from canal-admin/canal-admin-ui/src/router/index.js
rename to admin/admin-ui/src/router/index.js
diff --git a/canal-admin/canal-admin-ui/src/settings.js b/admin/admin-ui/src/settings.js
similarity index 100%
rename from canal-admin/canal-admin-ui/src/settings.js
rename to admin/admin-ui/src/settings.js
diff --git a/canal-admin/canal-admin-ui/src/store/getters.js b/admin/admin-ui/src/store/getters.js
similarity index 100%
rename from canal-admin/canal-admin-ui/src/store/getters.js
rename to admin/admin-ui/src/store/getters.js
diff --git a/canal-admin/canal-admin-ui/src/store/index.js b/admin/admin-ui/src/store/index.js
similarity index 100%
rename from canal-admin/canal-admin-ui/src/store/index.js
rename to admin/admin-ui/src/store/index.js
diff --git a/canal-admin/canal-admin-ui/src/store/modules/app.js b/admin/admin-ui/src/store/modules/app.js
similarity index 100%
rename from canal-admin/canal-admin-ui/src/store/modules/app.js
rename to admin/admin-ui/src/store/modules/app.js
diff --git a/canal-admin/canal-admin-ui/src/store/modules/settings.js b/admin/admin-ui/src/store/modules/settings.js
similarity index 100%
rename from canal-admin/canal-admin-ui/src/store/modules/settings.js
rename to admin/admin-ui/src/store/modules/settings.js
diff --git a/canal-admin/canal-admin-ui/src/store/modules/user.js b/admin/admin-ui/src/store/modules/user.js
similarity index 100%
rename from canal-admin/canal-admin-ui/src/store/modules/user.js
rename to admin/admin-ui/src/store/modules/user.js
diff --git a/canal-admin/canal-admin-ui/src/styles/element-ui.scss b/admin/admin-ui/src/styles/element-ui.scss
similarity index 100%
rename from canal-admin/canal-admin-ui/src/styles/element-ui.scss
rename to admin/admin-ui/src/styles/element-ui.scss
diff --git a/canal-admin/canal-admin-ui/src/styles/index.scss b/admin/admin-ui/src/styles/index.scss
similarity index 100%
rename from canal-admin/canal-admin-ui/src/styles/index.scss
rename to admin/admin-ui/src/styles/index.scss
diff --git a/canal-admin/canal-admin-ui/src/styles/mixin.scss b/admin/admin-ui/src/styles/mixin.scss
similarity index 100%
rename from canal-admin/canal-admin-ui/src/styles/mixin.scss
rename to admin/admin-ui/src/styles/mixin.scss
diff --git a/canal-admin/canal-admin-ui/src/styles/sidebar.scss b/admin/admin-ui/src/styles/sidebar.scss
similarity index 100%
rename from canal-admin/canal-admin-ui/src/styles/sidebar.scss
rename to admin/admin-ui/src/styles/sidebar.scss
diff --git a/canal-admin/canal-admin-ui/src/styles/transition.scss b/admin/admin-ui/src/styles/transition.scss
similarity index 100%
rename from canal-admin/canal-admin-ui/src/styles/transition.scss
rename to admin/admin-ui/src/styles/transition.scss
diff --git a/canal-admin/canal-admin-ui/src/styles/variables.scss b/admin/admin-ui/src/styles/variables.scss
similarity index 100%
rename from canal-admin/canal-admin-ui/src/styles/variables.scss
rename to admin/admin-ui/src/styles/variables.scss
diff --git a/canal-admin/canal-admin-ui/src/utils/auth.js b/admin/admin-ui/src/utils/auth.js
similarity index 100%
rename from canal-admin/canal-admin-ui/src/utils/auth.js
rename to admin/admin-ui/src/utils/auth.js
diff --git a/canal-admin/canal-admin-ui/src/utils/get-page-title.js b/admin/admin-ui/src/utils/get-page-title.js
similarity index 100%
rename from canal-admin/canal-admin-ui/src/utils/get-page-title.js
rename to admin/admin-ui/src/utils/get-page-title.js
diff --git a/canal-admin/canal-admin-ui/src/utils/index.js b/admin/admin-ui/src/utils/index.js
similarity index 100%
rename from canal-admin/canal-admin-ui/src/utils/index.js
rename to admin/admin-ui/src/utils/index.js
diff --git a/canal-admin/canal-admin-ui/src/utils/request.js b/admin/admin-ui/src/utils/request.js
similarity index 100%
rename from canal-admin/canal-admin-ui/src/utils/request.js
rename to admin/admin-ui/src/utils/request.js
diff --git a/canal-admin/canal-admin-ui/src/utils/scrollTo.js b/admin/admin-ui/src/utils/scrollTo.js
similarity index 100%
rename from canal-admin/canal-admin-ui/src/utils/scrollTo.js
rename to admin/admin-ui/src/utils/scrollTo.js
diff --git a/canal-admin/canal-admin-ui/src/utils/validate.js b/admin/admin-ui/src/utils/validate.js
similarity index 100%
rename from canal-admin/canal-admin-ui/src/utils/validate.js
rename to admin/admin-ui/src/utils/validate.js
diff --git a/canal-admin/canal-admin-ui/src/views/404.vue b/admin/admin-ui/src/views/404.vue
similarity index 100%
rename from canal-admin/canal-admin-ui/src/views/404.vue
rename to admin/admin-ui/src/views/404.vue
diff --git a/canal-admin/canal-admin-ui/src/views/canalServer/CanalCluster.vue b/admin/admin-ui/src/views/canalServer/CanalCluster.vue
similarity index 100%
rename from canal-admin/canal-admin-ui/src/views/canalServer/CanalCluster.vue
rename to admin/admin-ui/src/views/canalServer/CanalCluster.vue
diff --git a/canal-admin/canal-admin-ui/src/views/canalServer/CanalConfig.vue b/admin/admin-ui/src/views/canalServer/CanalConfig.vue
similarity index 100%
rename from canal-admin/canal-admin-ui/src/views/canalServer/CanalConfig.vue
rename to admin/admin-ui/src/views/canalServer/CanalConfig.vue
diff --git a/canal-admin/canal-admin-ui/src/views/canalServer/CanalInstance.vue b/admin/admin-ui/src/views/canalServer/CanalInstance.vue
similarity index 100%
rename from canal-admin/canal-admin-ui/src/views/canalServer/CanalInstance.vue
rename to admin/admin-ui/src/views/canalServer/CanalInstance.vue
diff --git a/canal-admin/canal-admin-ui/src/views/canalServer/CanalInstanceAdd.vue b/admin/admin-ui/src/views/canalServer/CanalInstanceAdd.vue
similarity index 100%
rename from canal-admin/canal-admin-ui/src/views/canalServer/CanalInstanceAdd.vue
rename to admin/admin-ui/src/views/canalServer/CanalInstanceAdd.vue
diff --git a/canal-admin/canal-admin-ui/src/views/canalServer/CanalInstanceLogDetail.vue b/admin/admin-ui/src/views/canalServer/CanalInstanceLogDetail.vue
similarity index 100%
rename from canal-admin/canal-admin-ui/src/views/canalServer/CanalInstanceLogDetail.vue
rename to admin/admin-ui/src/views/canalServer/CanalInstanceLogDetail.vue
diff --git a/canal-admin/canal-admin-ui/src/views/canalServer/CanalInstanceUpdate.vue b/admin/admin-ui/src/views/canalServer/CanalInstanceUpdate.vue
similarity index 100%
rename from canal-admin/canal-admin-ui/src/views/canalServer/CanalInstanceUpdate.vue
rename to admin/admin-ui/src/views/canalServer/CanalInstanceUpdate.vue
diff --git a/canal-admin/canal-admin-ui/src/views/canalServer/CanalLogDetail.vue b/admin/admin-ui/src/views/canalServer/CanalLogDetail.vue
similarity index 100%
rename from canal-admin/canal-admin-ui/src/views/canalServer/CanalLogDetail.vue
rename to admin/admin-ui/src/views/canalServer/CanalLogDetail.vue
diff --git a/canal-admin/canal-admin-ui/src/views/canalServer/NodeServer.vue b/admin/admin-ui/src/views/canalServer/NodeServer.vue
similarity index 100%
rename from canal-admin/canal-admin-ui/src/views/canalServer/NodeServer.vue
rename to admin/admin-ui/src/views/canalServer/NodeServer.vue
diff --git a/canal-admin/canal-admin-ui/src/views/dashboard/index.vue b/admin/admin-ui/src/views/dashboard/index.vue
similarity index 100%
rename from canal-admin/canal-admin-ui/src/views/dashboard/index.vue
rename to admin/admin-ui/src/views/dashboard/index.vue
diff --git a/canal-admin/canal-admin-ui/src/views/login/index.vue b/admin/admin-ui/src/views/login/index.vue
similarity index 100%
rename from canal-admin/canal-admin-ui/src/views/login/index.vue
rename to admin/admin-ui/src/views/login/index.vue
diff --git a/canal-admin/canal-admin-ui/src/views/sys/UserInfo.vue b/admin/admin-ui/src/views/sys/UserInfo.vue
similarity index 100%
rename from canal-admin/canal-admin-ui/src/views/sys/UserInfo.vue
rename to admin/admin-ui/src/views/sys/UserInfo.vue
diff --git a/canal-admin/canal-admin-ui/tests/unit/.eslintrc.js b/admin/admin-ui/tests/unit/.eslintrc.js
similarity index 100%
rename from canal-admin/canal-admin-ui/tests/unit/.eslintrc.js
rename to admin/admin-ui/tests/unit/.eslintrc.js
diff --git a/canal-admin/canal-admin-ui/tests/unit/components/Breadcrumb.spec.js b/admin/admin-ui/tests/unit/components/Breadcrumb.spec.js
similarity index 100%
rename from canal-admin/canal-admin-ui/tests/unit/components/Breadcrumb.spec.js
rename to admin/admin-ui/tests/unit/components/Breadcrumb.spec.js
diff --git a/canal-admin/canal-admin-ui/tests/unit/components/Hamburger.spec.js b/admin/admin-ui/tests/unit/components/Hamburger.spec.js
similarity index 100%
rename from canal-admin/canal-admin-ui/tests/unit/components/Hamburger.spec.js
rename to admin/admin-ui/tests/unit/components/Hamburger.spec.js
diff --git a/canal-admin/canal-admin-ui/tests/unit/components/SvgIcon.spec.js b/admin/admin-ui/tests/unit/components/SvgIcon.spec.js
similarity index 100%
rename from canal-admin/canal-admin-ui/tests/unit/components/SvgIcon.spec.js
rename to admin/admin-ui/tests/unit/components/SvgIcon.spec.js
diff --git a/canal-admin/canal-admin-ui/tests/unit/utils/formatTime.spec.js b/admin/admin-ui/tests/unit/utils/formatTime.spec.js
similarity index 100%
rename from canal-admin/canal-admin-ui/tests/unit/utils/formatTime.spec.js
rename to admin/admin-ui/tests/unit/utils/formatTime.spec.js
diff --git a/canal-admin/canal-admin-ui/tests/unit/utils/parseTime.spec.js b/admin/admin-ui/tests/unit/utils/parseTime.spec.js
similarity index 100%
rename from canal-admin/canal-admin-ui/tests/unit/utils/parseTime.spec.js
rename to admin/admin-ui/tests/unit/utils/parseTime.spec.js
diff --git a/canal-admin/canal-admin-ui/tests/unit/utils/validate.spec.js b/admin/admin-ui/tests/unit/utils/validate.spec.js
similarity index 100%
rename from canal-admin/canal-admin-ui/tests/unit/utils/validate.spec.js
rename to admin/admin-ui/tests/unit/utils/validate.spec.js
diff --git a/canal-admin/canal-admin-ui/vue.config.js b/admin/admin-ui/vue.config.js
similarity index 100%
rename from canal-admin/canal-admin-ui/vue.config.js
rename to admin/admin-ui/vue.config.js
diff --git a/canal-admin/canal-admin-server/pom.xml b/admin/admin-web/pom.xml
similarity index 97%
rename from canal-admin/canal-admin-server/pom.xml
rename to admin/admin-web/pom.xml
index 39f5dbc9..83f1c8a4 100644
--- a/canal-admin/canal-admin-server/pom.xml
+++ b/admin/admin-web/pom.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>canal-admin</artifactId>
+        <artifactId>canal.admin</artifactId>
         <groupId>com.alibaba.otter</groupId>
         <version>1.1.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>canal-admin-server</artifactId>
+    <artifactId>canal.admin-web</artifactId>
+    <name>canal admin-web for otter ${project.version}</name>
     <dependencies>
     	<dependency>
 			<groupId>com.alibaba.otter</groupId>
@@ -26,7 +27,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
         </dependency>
-
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
@@ -35,13 +35,10 @@
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>
         </dependency>
-
         <dependency>
             <groupId>io.ebean</groupId>
             <artifactId>ebean</artifactId>
-            <version>11.41.1</version>
         </dependency>
-
         <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>
@@ -152,7 +149,7 @@
                                     <overwrite>true</overwrite>
                                     <resources>
                                         <resource>
-                                            <directory>${project.parent.basedir}/canal-admin-ui/target/dist</directory>
+                                            <directory>${project.parent.basedir}/admin-ui/target/dist</directory>
                                             <includes>
                                                 <include>static/</include>
                                                 <include>index.html</include>
diff --git a/canal-admin/canal-admin-server/src/main/assembly/dev.xml b/admin/admin-web/src/main/assembly/dev.xml
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/assembly/dev.xml
rename to admin/admin-web/src/main/assembly/dev.xml
diff --git a/canal-admin/canal-admin-server/src/main/assembly/release.xml b/admin/admin-web/src/main/assembly/release.xml
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/assembly/release.xml
rename to admin/admin-web/src/main/assembly/release.xml
diff --git a/canal-admin/canal-admin-server/src/main/bin/restart.sh b/admin/admin-web/src/main/bin/restart.sh
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/bin/restart.sh
rename to admin/admin-web/src/main/bin/restart.sh
diff --git a/canal-admin/canal-admin-server/src/main/bin/startup.bat b/admin/admin-web/src/main/bin/startup.bat
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/bin/startup.bat
rename to admin/admin-web/src/main/bin/startup.bat
diff --git a/canal-admin/canal-admin-server/src/main/bin/startup.sh b/admin/admin-web/src/main/bin/startup.sh
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/bin/startup.sh
rename to admin/admin-web/src/main/bin/startup.sh
diff --git a/canal-admin/canal-admin-server/src/main/bin/stop.sh b/admin/admin-web/src/main/bin/stop.sh
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/bin/stop.sh
rename to admin/admin-web/src/main/bin/stop.sh
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/CanalAdminApplication.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/CanalAdminApplication.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/CanalAdminApplication.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/CanalAdminApplication.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/DaemonThreadFactory.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/common/DaemonThreadFactory.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/DaemonThreadFactory.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/common/DaemonThreadFactory.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/TemplateConfigLoader.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/common/TemplateConfigLoader.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/TemplateConfigLoader.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/common/TemplateConfigLoader.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/Threads.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/common/Threads.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/Threads.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/common/Threads.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/exception/ServiceException.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/common/exception/ServiceException.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/exception/ServiceException.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/common/exception/ServiceException.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/config/EbeanConfig.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/config/EbeanConfig.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/config/EbeanConfig.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/config/EbeanConfig.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/config/SpringContext.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/config/SpringContext.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/config/SpringContext.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/config/SpringContext.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/config/WebConfig.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/config/WebConfig.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/config/WebConfig.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/config/WebConfig.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/connector/AdminConnector.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/connector/AdminConnector.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/connector/AdminConnector.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/connector/AdminConnector.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/connector/SimpleAdminConnector.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/connector/SimpleAdminConnector.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/connector/SimpleAdminConnector.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/connector/SimpleAdminConnector.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/connector/SimpleAdminConnectors.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/connector/SimpleAdminConnectors.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/connector/SimpleAdminConnectors.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/connector/SimpleAdminConnectors.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/controller/CanalClusterController.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/controller/CanalClusterController.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/controller/CanalClusterController.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/controller/CanalClusterController.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/controller/CanalConfigController.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/controller/CanalConfigController.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/controller/CanalConfigController.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/controller/CanalConfigController.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/controller/CanalInstanceController.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/controller/CanalInstanceController.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/controller/CanalInstanceController.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/controller/CanalInstanceController.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/controller/NodeServerController.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/controller/NodeServerController.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/controller/NodeServerController.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/controller/NodeServerController.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/controller/PollingConfigController.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/controller/PollingConfigController.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/controller/PollingConfigController.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/controller/PollingConfigController.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/controller/UserController.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/controller/UserController.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/controller/UserController.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/controller/UserController.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/handler/CustomExceptionHandler.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/handler/CustomExceptionHandler.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/handler/CustomExceptionHandler.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/handler/CustomExceptionHandler.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/BaseModel.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/model/BaseModel.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/BaseModel.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/model/BaseModel.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/CanalCluster.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/model/CanalCluster.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/CanalCluster.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/model/CanalCluster.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/CanalConfig.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/model/CanalConfig.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/CanalConfig.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/model/CanalConfig.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/CanalInstanceConfig.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/model/CanalInstanceConfig.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/CanalInstanceConfig.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/model/CanalInstanceConfig.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/Model.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/model/Model.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/Model.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/model/Model.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/NodeServer.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/model/NodeServer.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/NodeServer.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/model/NodeServer.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/Pager.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/model/Pager.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/Pager.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/model/Pager.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/User.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/model/User.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/User.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/model/User.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/CanalClusterService.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/service/CanalClusterService.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/CanalClusterService.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/service/CanalClusterService.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/CanalConfigService.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/service/CanalConfigService.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/CanalConfigService.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/service/CanalConfigService.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/CanalInstanceService.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/service/CanalInstanceService.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/CanalInstanceService.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/service/CanalInstanceService.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/NodeServerService.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/service/NodeServerService.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/NodeServerService.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/service/NodeServerService.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/PollingConfigService.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/service/PollingConfigService.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/PollingConfigService.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/service/PollingConfigService.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/UserService.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/service/UserService.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/UserService.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/service/UserService.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/impl/CanalClusterServiceImpl.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/service/impl/CanalClusterServiceImpl.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/impl/CanalClusterServiceImpl.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/service/impl/CanalClusterServiceImpl.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/impl/CanalConfigServiceImpl.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/service/impl/CanalConfigServiceImpl.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/impl/CanalConfigServiceImpl.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/service/impl/CanalConfigServiceImpl.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/impl/CanalInstanceServiceImpl.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/service/impl/CanalInstanceServiceImpl.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/impl/CanalInstanceServiceImpl.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/service/impl/CanalInstanceServiceImpl.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/impl/NodeServerServiceImpl.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/service/impl/NodeServerServiceImpl.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/impl/NodeServerServiceImpl.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/service/impl/NodeServerServiceImpl.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/impl/PollingConfigServiceImpl.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/service/impl/PollingConfigServiceImpl.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/impl/PollingConfigServiceImpl.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/service/impl/PollingConfigServiceImpl.java
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/impl/UserServiceImpl.java b/admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/service/impl/UserServiceImpl.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/impl/UserServiceImpl.java
rename to admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/service/impl/UserServiceImpl.java
diff --git a/canal-admin/canal-admin-server/src/main/resources/application.yml b/admin/admin-web/src/main/resources/application.yml
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/application.yml
rename to admin/admin-web/src/main/resources/application.yml
diff --git a/canal-admin/canal-admin-server/src/main/resources/canal-template.properties b/admin/admin-web/src/main/resources/canal-template.properties
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/canal-template.properties
rename to admin/admin-web/src/main/resources/canal-template.properties
diff --git a/canal-admin/canal-admin-server/src/main/resources/canal_manager.sql b/admin/admin-web/src/main/resources/canal_manager.sql
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/canal_manager.sql
rename to admin/admin-web/src/main/resources/canal_manager.sql
diff --git a/canal-admin/canal-admin-server/src/main/resources/instance-template.properties b/admin/admin-web/src/main/resources/instance-template.properties
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/instance-template.properties
rename to admin/admin-web/src/main/resources/instance-template.properties
diff --git a/canal-admin/canal-admin-server/src/main/resources/logback.xml b/admin/admin-web/src/main/resources/logback.xml
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/logback.xml
rename to admin/admin-web/src/main/resources/logback.xml
diff --git a/canal-admin/canal-admin-ui/public/avatar.gif b/admin/admin-web/src/main/resources/public/avatar.gif
similarity index 100%
rename from canal-admin/canal-admin-ui/public/avatar.gif
rename to admin/admin-web/src/main/resources/public/avatar.gif
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/index.html b/admin/admin-web/src/main/resources/public/index.html
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/index.html
rename to admin/admin-web/src/main/resources/public/index.html
diff --git a/canal-admin/canal-admin-ui/public/logo.png b/admin/admin-web/src/main/resources/public/logo.png
similarity index 100%
rename from canal-admin/canal-admin-ui/public/logo.png
rename to admin/admin-web/src/main/resources/public/logo.png
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/css/app.bb951cb3.css b/admin/admin-web/src/main/resources/public/static/css/app.bb951cb3.css
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/css/app.bb951cb3.css
rename to admin/admin-web/src/main/resources/public/static/css/app.bb951cb3.css
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-101fc062.fad9926f.css b/admin/admin-web/src/main/resources/public/static/css/chunk-101fc062.fad9926f.css
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-101fc062.fad9926f.css
rename to admin/admin-web/src/main/resources/public/static/css/chunk-101fc062.fad9926f.css
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-14b5f7a4.f3e06673.css b/admin/admin-web/src/main/resources/public/static/css/chunk-14b5f7a4.f3e06673.css
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-14b5f7a4.f3e06673.css
rename to admin/admin-web/src/main/resources/public/static/css/chunk-14b5f7a4.f3e06673.css
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-22553be3.f3e06673.css b/admin/admin-web/src/main/resources/public/static/css/chunk-22553be3.f3e06673.css
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-22553be3.f3e06673.css
rename to admin/admin-web/src/main/resources/public/static/css/chunk-22553be3.f3e06673.css
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-2301924a.160e7b4a.css b/admin/admin-web/src/main/resources/public/static/css/chunk-2301924a.160e7b4a.css
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-2301924a.160e7b4a.css
rename to admin/admin-web/src/main/resources/public/static/css/chunk-2301924a.160e7b4a.css
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-2b9b6c5c.c89f8844.css b/admin/admin-web/src/main/resources/public/static/css/chunk-2b9b6c5c.c89f8844.css
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-2b9b6c5c.c89f8844.css
rename to admin/admin-web/src/main/resources/public/static/css/chunk-2b9b6c5c.c89f8844.css
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-37c49cbf.efc21a9c.css b/admin/admin-web/src/main/resources/public/static/css/chunk-37c49cbf.efc21a9c.css
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-37c49cbf.efc21a9c.css
rename to admin/admin-web/src/main/resources/public/static/css/chunk-37c49cbf.efc21a9c.css
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-49959c8b.e8e2beee.css b/admin/admin-web/src/main/resources/public/static/css/chunk-49959c8b.e8e2beee.css
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-49959c8b.e8e2beee.css
rename to admin/admin-web/src/main/resources/public/static/css/chunk-49959c8b.e8e2beee.css
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-4f09fed2.70ec0b86.css b/admin/admin-web/src/main/resources/public/static/css/chunk-4f09fed2.70ec0b86.css
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-4f09fed2.70ec0b86.css
rename to admin/admin-web/src/main/resources/public/static/css/chunk-4f09fed2.70ec0b86.css
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-5afa45f5.a34bb177.css b/admin/admin-web/src/main/resources/public/static/css/chunk-5afa45f5.a34bb177.css
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-5afa45f5.a34bb177.css
rename to admin/admin-web/src/main/resources/public/static/css/chunk-5afa45f5.a34bb177.css
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-5b373aad.b966d36b.css b/admin/admin-web/src/main/resources/public/static/css/chunk-5b373aad.b966d36b.css
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-5b373aad.b966d36b.css
rename to admin/admin-web/src/main/resources/public/static/css/chunk-5b373aad.b966d36b.css
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-69386cf0.741ff14e.css b/admin/admin-web/src/main/resources/public/static/css/chunk-69386cf0.741ff14e.css
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-69386cf0.741ff14e.css
rename to admin/admin-web/src/main/resources/public/static/css/chunk-69386cf0.741ff14e.css
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-7ec889b7.c0585512.css b/admin/admin-web/src/main/resources/public/static/css/chunk-7ec889b7.c0585512.css
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-7ec889b7.c0585512.css
rename to admin/admin-web/src/main/resources/public/static/css/chunk-7ec889b7.c0585512.css
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-98f505d0.5280f88f.css b/admin/admin-web/src/main/resources/public/static/css/chunk-98f505d0.5280f88f.css
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-98f505d0.5280f88f.css
rename to admin/admin-web/src/main/resources/public/static/css/chunk-98f505d0.5280f88f.css
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-bd1d44ee.1528199a.css b/admin/admin-web/src/main/resources/public/static/css/chunk-bd1d44ee.1528199a.css
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-bd1d44ee.1528199a.css
rename to admin/admin-web/src/main/resources/public/static/css/chunk-bd1d44ee.1528199a.css
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-da289616.c89f8844.css b/admin/admin-web/src/main/resources/public/static/css/chunk-da289616.c89f8844.css
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-da289616.c89f8844.css
rename to admin/admin-web/src/main/resources/public/static/css/chunk-da289616.c89f8844.css
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-elementUI.18b11d0e.css b/admin/admin-web/src/main/resources/public/static/css/chunk-elementUI.18b11d0e.css
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-elementUI.18b11d0e.css
rename to admin/admin-web/src/main/resources/public/static/css/chunk-elementUI.18b11d0e.css
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-libs.5cf311f0.css b/admin/admin-web/src/main/resources/public/static/css/chunk-libs.5cf311f0.css
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/css/chunk-libs.5cf311f0.css
rename to admin/admin-web/src/main/resources/public/static/css/chunk-libs.5cf311f0.css
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/fonts/element-icons.2fad952a.woff b/admin/admin-web/src/main/resources/public/static/fonts/element-icons.2fad952a.woff
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/fonts/element-icons.2fad952a.woff
rename to admin/admin-web/src/main/resources/public/static/fonts/element-icons.2fad952a.woff
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/fonts/element-icons.6f0a7632.ttf b/admin/admin-web/src/main/resources/public/static/fonts/element-icons.6f0a7632.ttf
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/fonts/element-icons.6f0a7632.ttf
rename to admin/admin-web/src/main/resources/public/static/fonts/element-icons.6f0a7632.ttf
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/img/404.a57b6f31.png b/admin/admin-web/src/main/resources/public/static/img/404.a57b6f31.png
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/img/404.a57b6f31.png
rename to admin/admin-web/src/main/resources/public/static/img/404.a57b6f31.png
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/img/404_cloud.0f4bc32b.png b/admin/admin-web/src/main/resources/public/static/img/404_cloud.0f4bc32b.png
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/img/404_cloud.0f4bc32b.png
rename to admin/admin-web/src/main/resources/public/static/img/404_cloud.0f4bc32b.png
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/app.6845b228.js b/admin/admin-web/src/main/resources/public/static/js/app.6845b228.js
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/app.6845b228.js
rename to admin/admin-web/src/main/resources/public/static/js/app.6845b228.js
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/app.eee35d99.js b/admin/admin-web/src/main/resources/public/static/js/app.eee35d99.js
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/app.eee35d99.js
rename to admin/admin-web/src/main/resources/public/static/js/app.eee35d99.js
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-0dca2f22.a2bc28b8.js b/admin/admin-web/src/main/resources/public/static/js/chunk-0dca2f22.a2bc28b8.js
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-0dca2f22.a2bc28b8.js
rename to admin/admin-web/src/main/resources/public/static/js/chunk-0dca2f22.a2bc28b8.js
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-101fc062.372a5ca5.js b/admin/admin-web/src/main/resources/public/static/js/chunk-101fc062.372a5ca5.js
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-101fc062.372a5ca5.js
rename to admin/admin-web/src/main/resources/public/static/js/chunk-101fc062.372a5ca5.js
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-101fc062.bc898027.js b/admin/admin-web/src/main/resources/public/static/js/chunk-101fc062.bc898027.js
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-101fc062.bc898027.js
rename to admin/admin-web/src/main/resources/public/static/js/chunk-101fc062.bc898027.js
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-14b5f7a4.013449e9.js b/admin/admin-web/src/main/resources/public/static/js/chunk-14b5f7a4.013449e9.js
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-14b5f7a4.013449e9.js
rename to admin/admin-web/src/main/resources/public/static/js/chunk-14b5f7a4.013449e9.js
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-22553be3.e6d72de5.js b/admin/admin-web/src/main/resources/public/static/js/chunk-22553be3.e6d72de5.js
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-22553be3.e6d72de5.js
rename to admin/admin-web/src/main/resources/public/static/js/chunk-22553be3.e6d72de5.js
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-2301924a.1774b851.js b/admin/admin-web/src/main/resources/public/static/js/chunk-2301924a.1774b851.js
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-2301924a.1774b851.js
rename to admin/admin-web/src/main/resources/public/static/js/chunk-2301924a.1774b851.js
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-2b9b6c5c.cc2181b9.js b/admin/admin-web/src/main/resources/public/static/js/chunk-2b9b6c5c.cc2181b9.js
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-2b9b6c5c.cc2181b9.js
rename to admin/admin-web/src/main/resources/public/static/js/chunk-2b9b6c5c.cc2181b9.js
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-37c49cbf.64d26540.js b/admin/admin-web/src/main/resources/public/static/js/chunk-37c49cbf.64d26540.js
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-37c49cbf.64d26540.js
rename to admin/admin-web/src/main/resources/public/static/js/chunk-37c49cbf.64d26540.js
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-37c49cbf.92ebe0ae.js b/admin/admin-web/src/main/resources/public/static/js/chunk-37c49cbf.92ebe0ae.js
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-37c49cbf.92ebe0ae.js
rename to admin/admin-web/src/main/resources/public/static/js/chunk-37c49cbf.92ebe0ae.js
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-49959c8b.058266cb.js b/admin/admin-web/src/main/resources/public/static/js/chunk-49959c8b.058266cb.js
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-49959c8b.058266cb.js
rename to admin/admin-web/src/main/resources/public/static/js/chunk-49959c8b.058266cb.js
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-49959c8b.6d226f70.js b/admin/admin-web/src/main/resources/public/static/js/chunk-49959c8b.6d226f70.js
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-49959c8b.6d226f70.js
rename to admin/admin-web/src/main/resources/public/static/js/chunk-49959c8b.6d226f70.js
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-4f09fed2.d107437b.js b/admin/admin-web/src/main/resources/public/static/js/chunk-4f09fed2.d107437b.js
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-4f09fed2.d107437b.js
rename to admin/admin-web/src/main/resources/public/static/js/chunk-4f09fed2.d107437b.js
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-4f09fed2.ff28d88d.js b/admin/admin-web/src/main/resources/public/static/js/chunk-4f09fed2.ff28d88d.js
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-4f09fed2.ff28d88d.js
rename to admin/admin-web/src/main/resources/public/static/js/chunk-4f09fed2.ff28d88d.js
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-55380ff2.430ee174.js b/admin/admin-web/src/main/resources/public/static/js/chunk-55380ff2.430ee174.js
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-55380ff2.430ee174.js
rename to admin/admin-web/src/main/resources/public/static/js/chunk-55380ff2.430ee174.js
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-55380ff2.681c71c9.js b/admin/admin-web/src/main/resources/public/static/js/chunk-55380ff2.681c71c9.js
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-55380ff2.681c71c9.js
rename to admin/admin-web/src/main/resources/public/static/js/chunk-55380ff2.681c71c9.js
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-5afa45f5.79ddcc04.js b/admin/admin-web/src/main/resources/public/static/js/chunk-5afa45f5.79ddcc04.js
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-5afa45f5.79ddcc04.js
rename to admin/admin-web/src/main/resources/public/static/js/chunk-5afa45f5.79ddcc04.js
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-5b373aad.90a2d8e7.js b/admin/admin-web/src/main/resources/public/static/js/chunk-5b373aad.90a2d8e7.js
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-5b373aad.90a2d8e7.js
rename to admin/admin-web/src/main/resources/public/static/js/chunk-5b373aad.90a2d8e7.js
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-69386cf0.76d77f5c.js b/admin/admin-web/src/main/resources/public/static/js/chunk-69386cf0.76d77f5c.js
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-69386cf0.76d77f5c.js
rename to admin/admin-web/src/main/resources/public/static/js/chunk-69386cf0.76d77f5c.js
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-69386cf0.bdbe3f0c.js b/admin/admin-web/src/main/resources/public/static/js/chunk-69386cf0.bdbe3f0c.js
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-69386cf0.bdbe3f0c.js
rename to admin/admin-web/src/main/resources/public/static/js/chunk-69386cf0.bdbe3f0c.js
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-7ec889b7.5f730d9b.js b/admin/admin-web/src/main/resources/public/static/js/chunk-7ec889b7.5f730d9b.js
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-7ec889b7.5f730d9b.js
rename to admin/admin-web/src/main/resources/public/static/js/chunk-7ec889b7.5f730d9b.js
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-7ec889b7.bd1ca803.js b/admin/admin-web/src/main/resources/public/static/js/chunk-7ec889b7.bd1ca803.js
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-7ec889b7.bd1ca803.js
rename to admin/admin-web/src/main/resources/public/static/js/chunk-7ec889b7.bd1ca803.js
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-98f505d0.f3096ce7.js b/admin/admin-web/src/main/resources/public/static/js/chunk-98f505d0.f3096ce7.js
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-98f505d0.f3096ce7.js
rename to admin/admin-web/src/main/resources/public/static/js/chunk-98f505d0.f3096ce7.js
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-bd1d44ee.8c8282cc.js b/admin/admin-web/src/main/resources/public/static/js/chunk-bd1d44ee.8c8282cc.js
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-bd1d44ee.8c8282cc.js
rename to admin/admin-web/src/main/resources/public/static/js/chunk-bd1d44ee.8c8282cc.js
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-bd1d44ee.8e2c4851.js b/admin/admin-web/src/main/resources/public/static/js/chunk-bd1d44ee.8e2c4851.js
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-bd1d44ee.8e2c4851.js
rename to admin/admin-web/src/main/resources/public/static/js/chunk-bd1d44ee.8e2c4851.js
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-da289616.7def925e.js b/admin/admin-web/src/main/resources/public/static/js/chunk-da289616.7def925e.js
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-da289616.7def925e.js
rename to admin/admin-web/src/main/resources/public/static/js/chunk-da289616.7def925e.js
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-elementUI.667f4c87.js b/admin/admin-web/src/main/resources/public/static/js/chunk-elementUI.667f4c87.js
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-elementUI.667f4c87.js
rename to admin/admin-web/src/main/resources/public/static/js/chunk-elementUI.667f4c87.js
diff --git a/canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-libs.c04beefc.js b/admin/admin-web/src/main/resources/public/static/js/chunk-libs.c04beefc.js
similarity index 100%
rename from canal-admin/canal-admin-server/src/main/resources/public/static/js/chunk-libs.c04beefc.js
rename to admin/admin-web/src/main/resources/public/static/js/chunk-libs.c04beefc.js
diff --git a/canal-admin/canal-admin-server/src/test/java/com/alibaba/otter/canal/admin/SimpleAdminConnectorTest.java b/admin/admin-web/src/test/java/com/alibaba/otter/canal/admin/SimpleAdminConnectorTest.java
similarity index 100%
rename from canal-admin/canal-admin-server/src/test/java/com/alibaba/otter/canal/admin/SimpleAdminConnectorTest.java
rename to admin/admin-web/src/test/java/com/alibaba/otter/canal/admin/SimpleAdminConnectorTest.java
diff --git a/canal-admin/pom.xml b/admin/pom.xml
similarity index 57%
rename from canal-admin/pom.xml
rename to admin/pom.xml
index c5548107..5f8b45df 100644
--- a/canal-admin/pom.xml
+++ b/admin/pom.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.alibaba.otter</groupId>
-    <artifactId>canal-admin</artifactId>
+    <artifactId>canal.admin</artifactId>
     <version>1.1.5-SNAPSHOT</version>
-
     <packaging>pom</packaging>
+    <name>canal admin module for otter ${project.version}</name>
     <modules>
-        <module>canal-admin-ui</module>
-        <module>canal-admin-server</module>
+        <module>admin-ui</module>
+        <module>admin-web</module>
     </modules>
 
     <properties>
@@ -23,6 +22,43 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-context</artifactId>
+                <version>2.0.0.RELEASE</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-core</artifactId>
+                <version>5.0.5.RELEASE</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-aop</artifactId>
+                <version>5.0.5.RELEASE</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-context</artifactId>
+                <version>5.0.5.RELEASE</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-jdbc</artifactId>
+                <version>5.0.5.RELEASE</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-orm</artifactId>
+                <version>5.0.5.RELEASE</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-test</artifactId>
+                <version>5.0.5.RELEASE</version>
+                <scope>test</scope>
+            </dependency>
+
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
@@ -30,7 +66,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-
             <dependency>
                 <groupId>mysql</groupId>
                 <artifactId>mysql-connector-java</artifactId>
@@ -51,6 +86,11 @@
                 <artifactId>commons-lang</artifactId>
                 <version>2.6</version>
             </dependency>
+            <dependency>
+                <groupId>io.ebean</groupId>
+                <artifactId>ebean</artifactId>
+                <version>11.41.1</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/client-adapter/common/pom.xml b/client-adapter/common/pom.xml
index b11b6fa6..8775623e 100644
--- a/client-adapter/common/pom.xml
+++ b/client-adapter/common/pom.xml
@@ -17,40 +17,29 @@
             <artifactId>canal.protocol</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>5.0.5.RELEASE</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>5.0.5.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aop</artifactId>
-            <version>5.0.5.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>5.0.5.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
-            <version>5.0.5.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-orm</artifactId>
-            <version>5.0.5.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>5.0.5.RELEASE</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/client-adapter/pom.xml b/client-adapter/pom.xml
index 1aae9305..0f724203 100644
--- a/client-adapter/pom.xml
+++ b/client-adapter/pom.xml
@@ -108,11 +108,6 @@
                 <artifactId>spring-cloud-context</artifactId>
                 <version>2.0.0.RELEASE</version>
             </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-context</artifactId>
-                <version>5.0.5.RELEASE</version>
-            </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-core</artifactId>
diff --git a/pom.xml b/pom.xml
index f6afb333..6ddd9fae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,8 +127,8 @@
         <module>deployer</module>
         <module>example</module>
         <module>prometheus</module>
+        <module>admin</module>
         <module>client-adapter</module>
-        <module>canal-admin</module>
     </modules>
 
     <dependencyManagement>