You are viewing a plain text version of this content. The canonical link for it is here.
Posted to submarine-dev@hadoop.apache.org by zt...@apache.org on 2019/09/27 09:47:51 UTC
[hadoop-submarine] branch master updated: [SUBMARINE-201] Modify
module name submairne-web\server to workbench-web\server
This is an automated email from the ASF dual-hosted git repository.
ztang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-submarine.git
The following commit(s) were added to refs/heads/master by this push:
new 54c2d5c [SUBMARINE-201] Modify module name submairne-web\server to workbench-web\server
54c2d5c is described below
commit 54c2d5cf78221bceab31ab829f0ee85afbc3002a
Author: Xun Liu <li...@apache.org>
AuthorDate: Fri Sep 27 15:59:53 2019 +0800
[SUBMARINE-201] Modify module name submairne-web\server to workbench-web\server
### What is this PR for?
1. In fact, the submarine-server just the server of Submarine workbench's server.
not server of the submarine.
2. submarine will add new module `submarine-server`, It's real submarine server.
Therefore, we need to change the module name.
1. submarine-server -> workbench-server
2. submarine-web -> workbench-web
### What type of PR is it?
[Refactoring]
### What is the Jira issue?
* https://issues.apache.org/jira/browse/SUBMARINE-201
### How should this be tested?
* [CI Pass](https://travis-ci.org/liuxunorg/hadoop-submarine/builds/590302172)
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? Yes
Author: Xun Liu <li...@apache.org>
Closes #18 from liuxunorg/SUBMARINE-201 and squashes the following commits:
c3b33a1 [Xun Liu] [SUBMARINE-201] Modify submairne-web\submairne-server to workbench-web\workbench-server 1. In fact, the submarine-server just the server of submarine-workbench's server. not server of the submarine.
---
.gitignore | 16 +++---
.travis.yml | 28 ++++-----
dev-support/bin/submarine-daemon.sh | 2 +-
docs/database/README.md | 2 +-
docs/development/README.md | 38 ++++++------
docs/helper/MybatisGenerator.md | 4 +-
submarine-dist/pom.xml | 2 +-
submarine-dist/src/assembly/distribution.xml | 8 +--
submarine-dist/src/assembly/src-distribution.xml | 6 +-
submarine-workbench/pom.xml | 4 +-
.../src/main/resources/log4j.properties | 21 -------
.../{submarine-server => workbench-server}/pom.xml | 2 +-
.../java/org/apache/submarine/annotation/Dict.java | 0
.../apache/submarine/annotation/SubmarineApi.java | 0
.../org/apache/submarine/database/MyBatisUtil.java | 6 +-
.../submarine/database/entity/BaseEntity.java | 0
.../apache/submarine/database/entity/Project.java | 0
.../submarine/database/entity/ProjectFiles.java | 0
.../apache/submarine/database/entity/SysDept.java | 0
.../submarine/database/entity/SysDeptSelect.java | 2 +-
.../submarine/database/entity/SysDeptTree.java | 2 +-
.../apache/submarine/database/entity/SysDict.java | 0
.../submarine/database/entity/SysDictItem.java | 0
.../submarine/database/entity/SysMessage.java | 0
.../apache/submarine/database/entity/SysUser.java | 0
.../org/apache/submarine/database/entity/Team.java | 0
.../submarine/database/entity/TeamMember.java | 0
.../database/mappers/ProjectFilesMapper.java | 0
.../submarine/database/mappers/ProjectMapper.java | 0
.../submarine/database/mappers/SysDeptMapper.java | 0
.../database/mappers/SysDictItemMapper.java | 0
.../submarine/database/mappers/SysDictMapper.java | 0
.../database/mappers/SysMessageMapper.java | 0
.../submarine/database/mappers/SysUserMapper.java | 0
.../submarine/database/mappers/SystemMapper.java | 0
.../submarine/database/mappers/TeamMapper.java | 0
.../database/mappers/TeamMemberMapper.java | 0
.../database/service/ProjectFilesService.java | 0
.../submarine/database/service/ProjectService.java | 0
.../database/service/SysDictItemService.java | 0
.../database/service/SysMessageService.java | 0
.../submarine/database/service/SysUserService.java | 0
.../database/service/TeamMemberService.java | 0
.../submarine/database/service/TeamService.java | 0
.../database/utils/CustomJsonDateDeserializer.java | 0
.../submarine/database/utils/DepartmentUtil.java | 0
.../submarine/database/utils/DictAnnotation.java | 0
.../database/utils/MybatisGeneratorMain.java | 0
.../java/org/apache/submarine/entity/Action.java | 0
.../org/apache/submarine/entity/Permission.java | 0
.../java/org/apache/submarine/entity/Role.java | 0
.../java/org/apache/submarine/entity/User.java | 0
.../java/org/apache/submarine/entity/UserInfo.java | 0
.../org/apache/submarine/rest/LoginRestApi.java | 0
.../org/apache/submarine/rest/ProjectRestApi.java | 0
.../org/apache/submarine/rest/SysDeptRestApi.java | 0
.../apache/submarine/rest/SysDictItemRestApi.java | 0
.../org/apache/submarine/rest/SysDictRestApi.java | 0
.../org/apache/submarine/rest/SysUserRestApi.java | 0
.../org/apache/submarine/rest/SystemRestApi.java | 0
.../org/apache/submarine/rest/TeamRestApi.java | 0
.../submarine/server/JsonExclusionStrategy.java | 0
.../org/apache/submarine/server/JsonResponse.java | 0
.../submarine/server/WorkbenchConfiguration.java} | 64 ++++++++++-----------
.../apache/submarine/server/WorkbenchServer.java} | 30 +++++-----
.../src/main/resources/mbgConfiguration.xml | 0
.../src/main/resources/mybatis-config.xml | 0
.../database/mappers/ProjectFilesMapper.xml | 0
.../submarine/database/mappers/ProjectMapper.xml | 0
.../submarine/database/mappers/SysDeptMapper.xml | 0
.../database/mappers/SysDictItemMapper.xml | 0
.../submarine/database/mappers/SysDictMapper.xml | 0
.../database/mappers/SysMessageMapper.xml | 0
.../submarine/database/mappers/SysUserMapper.xml | 0
.../submarine/database/mappers/SystemMapper.xml | 0
.../submarine/database/mappers/TeamMapper.xml | 0
.../database/mappers/TeamMemberMapper.xml | 0
.../database/service/ProjectServiceTest.java | 0
.../database/service/SysUserServiceTest.java | 0
.../database/service/TeamServiceTest.java | 0
.../database/utils/DepartmentUtilTest.java | 0
.../database/utils/DictAnnotationTest.java | 0
.../org/apache/submarine/rest/CommonDataTest.java | 0
.../apache/submarine/rest/SysDeptRestApiTest.java | 0
.../submarine/rest/SysDictItemRestApiTest.java | 0
.../apache/submarine/rest/SysDictRestApiTest.java | 0
.../apache/submarine/rest/SysUserRestApiTest.java | 0
.../apache/submarine/server/JsonResponseTest.java | 0
.../{submarine-web => workbench-web}/.editorconfig | 0
.../{submarine-web => workbench-web}/.env | 0
.../{submarine-web => workbench-web}/.env.preview | 0
.../.gitattributes | 0
.../{submarine-web => workbench-web}/.prettierrc | 0
.../{submarine-web => workbench-web}/LICENSE | 0
.../{submarine-web => workbench-web}/README.md | 2 +-
.../README.zh-CN.md | 2 +-
.../babel.config.js | 0
.../docs/add-page-loading-animate.md | 0
.../docs/load-on-demand.md | 0
.../docs/multi-tabs.md | 0
.../docs/webpack-bundle-analyzer.md | 0
.../jest.config.js | 0
.../{submarine-web => workbench-web}/jsconfig.json | 0
.../{submarine-web => workbench-web}/package.json | 0
.../{submarine-web => workbench-web}/pom.xml | 2 +-
.../public/assets/pytorch_logo.png | Bin
.../public/assets/tensorflow_logo.png | Bin
.../public/avatar2.jpg | Bin
.../public/color.less | 0
.../public/index.html | 0
.../public/loading/loading.css | 0
.../public/loading/loading.html | 0
.../public/loading/option2/html_code_segment.html | 0
.../public/loading/option2/loading.css | 0
.../public/loading/option2/loading.svg | 0
.../public/logo.png | Bin
.../{submarine-web => workbench-web}/src/App.vue | 0
.../src/WEB-INF/web.xml | 2 +-
.../src/api/index.js | 0
.../src/api/login.js | 0
.../src/api/manage.js | 0
.../src/api/system.js | 0
.../src/api/workbench.js | 0
.../src/assets/background.svg | 0
.../src/assets/icons/bx-analyse.svg | 0
.../src/assets/logo-128.png | Bin
.../src/assets/logo.png | Bin
.../src/assets/logo.svg | 0
.../src/assets/submarine-logo.svg | 0
.../ArticleListContent/ArticleListContent.vue | 0
.../src/components/ArticleListContent/index.js | 0
.../src/components/AvatarList/Item.vue | 0
.../src/components/AvatarList/List.vue | 0
.../src/components/AvatarList/index.js | 0
.../src/components/AvatarList/index.less | 0
.../src/components/AvatarList/index.md | 0
.../src/components/Charts/Bar.vue | 0
.../src/components/Charts/ChartCard.vue | 0
.../src/components/Charts/Liquid.vue | 0
.../src/components/Charts/MiniArea.vue | 0
.../src/components/Charts/MiniBar.vue | 0
.../src/components/Charts/MiniProgress.vue | 0
.../src/components/Charts/MiniSmoothArea.vue | 0
.../src/components/Charts/Radar.vue | 0
.../src/components/Charts/RankList.vue | 0
.../src/components/Charts/TagCloud.vue | 0
.../src/components/Charts/TransferBar.vue | 0
.../src/components/Charts/Trend.vue | 0
.../src/components/Charts/chart.less | 0
.../src/components/Charts/smooth.area.less | 0
.../src/components/CountDown/CountDown.vue | 0
.../src/components/CountDown/index.js | 0
.../src/components/CountDown/index.md | 0
.../components/DescriptionList/DescriptionList.vue | 0
.../src/components/DescriptionList/index.js | 0
.../src/components/Dict/DictSelectTag.vue | 0
.../src/components/Dict/README.md | 0
.../src/components/Dict/SearchSelect.vue | 0
.../src/components/Dict/index.js | 0
.../src/components/Editor/QuillEditor.vue | 0
.../src/components/Editor/WangEditor.vue | 0
.../src/components/Ellipsis/Ellipsis.vue | 0
.../src/components/Ellipsis/index.js | 0
.../src/components/Ellipsis/index.md | 0
.../src/components/Exception/ExceptionPage.vue | 0
.../src/components/Exception/index.js | 0
.../src/components/Exception/type.js | 0
.../src/components/FooterToolbar/FooterToolBar.vue | 0
.../src/components/FooterToolbar/index.js | 0
.../src/components/FooterToolbar/index.less | 0
.../src/components/FooterToolbar/index.md | 0
.../src/components/GlobalFooter/GlobalFooter.vue | 0
.../src/components/GlobalFooter/index.js | 0
.../src/components/GlobalHeader/GlobalHeader.vue | 0
.../src/components/GlobalHeader/index.js | 0
.../src/components/IconSelector/IconSelector.vue | 0
.../src/components/IconSelector/README.md | 0
.../src/components/IconSelector/icons.js | 0
.../src/components/IconSelector/index.js | 0
.../src/components/Menu/SideMenu.vue | 0
.../src/components/Menu/index.js | 0
.../src/components/Menu/menu.js | 0
.../src/components/Menu/menu.render.js | 0
.../src/components/MultiTab/MultiTab.vue | 0
.../src/components/MultiTab/index.js | 0
.../src/components/MultiTab/index.less | 0
.../src/components/NoticeIcon/NoticeIcon.vue | 0
.../src/components/NoticeIcon/index.js | 0
.../src/components/NumberInfo/NumberInfo.vue | 0
.../src/components/NumberInfo/index.js | 0
.../src/components/NumberInfo/index.less | 0
.../src/components/NumberInfo/index.md | 0
.../src/components/PageHeader/PageHeader.vue | 0
.../src/components/PageHeader/index.js | 0
.../src/components/PageLoading/index.jsx | 0
.../src/components/Result/Result.vue | 0
.../src/components/Result/index.js | 0
.../src/components/SettingDrawer/SettingDrawer.vue | 0
.../src/components/SettingDrawer/SettingItem.vue | 0
.../src/components/SettingDrawer/index.js | 0
.../src/components/SettingDrawer/settingConfig.js | 0
.../src/components/SettingDrawer/themeColor.js | 0
.../components/StandardFormRow/StandardFormRow.vue | 0
.../src/components/StandardFormRow/index.js | 0
.../src/components/Table/README.md | 0
.../src/components/Table/index.js | 0
.../src/components/TagSelect/TagSelectOption.jsx | 0
.../src/components/TagSelect/index.jsx | 0
.../src/components/Tree/Tree.jsx | 0
.../src/components/Trend/Trend.vue | 0
.../src/components/Trend/index.js | 0
.../src/components/Trend/index.less | 0
.../src/components/Trend/index.md | 0
.../src/components/_util/util.js | 0
.../src/components/global.less | 0
.../src/components/index.js | 0
.../src/components/index.less | 0
.../src/components/tools/Breadcrumb.vue | 0
.../src/components/tools/DetailList.vue | 0
.../src/components/tools/HeadInfo.vue | 0
.../src/components/tools/Logo.vue | 0
.../src/components/tools/TwoStepCaptcha.vue | 0
.../src/components/tools/UserMenu.vue | 0
.../src/components/tools/index.js | 0
.../src/config/defaultSettings.js | 0
.../src/config/router.config.js | 0
.../src/core/bootstrap.js | 0
.../src/core/directives/action.js | 0
.../src/core/icons.js | 0
.../src/core/lazy_lib/components_use.js | 0
.../src/core/lazy_use.js | 0
.../src/core/use.js | 0
.../src/layouts/BasicLayout.vue | 0
.../src/layouts/BlankLayout.vue | 0
.../src/layouts/PageView.vue | 0
.../src/layouts/RouteView.vue | 0
.../src/layouts/UserLayout.vue | 0
.../src/layouts/index.js | 0
.../{submarine-web => workbench-web}/src/main.js | 0
.../src/mixins/ListMixin.js | 0
.../src/mock/index.js | 0
.../src/mock/services/article.js | 0
.../src/mock/services/auth.js | 0
.../src/mock/services/manage.js | 0
.../src/mock/services/other.js | 0
.../src/mock/services/tagCloud.js | 0
.../src/mock/services/user.js | 0
.../src/mock/services/workbench.js | 0
.../src/mock/util.js | 0
.../src/permission.js | 0
.../src/router/README.md | 0
.../src/router/index.js | 0
.../src/store/getters.js | 0
.../src/store/index.js | 0
.../src/store/modules/app.js | 0
.../src/store/modules/permission.js | 0
.../src/store/modules/user.js | 0
.../src/store/mutation-types.js | 0
.../src/utils/axios.js | 0
.../src/utils/device.js | 0
.../src/utils/domUtil.js | 0
.../src/utils/filter.js | 0
.../src/utils/helper/permission.js | 0
.../src/utils/mixin.js | 0
.../src/utils/permissions.js | 0
.../src/utils/request.js | 0
.../src/utils/util.js | 0
.../src/utils/utils.less | 0
.../src/views/404.vue | 0
.../src/views/Home.vue | 0
.../src/views/account/center/Index.vue | 0
.../src/views/account/center/page/App.vue | 0
.../src/views/account/center/page/Article.vue | 0
.../src/views/account/center/page/Project.vue | 0
.../src/views/account/center/page/index.js | 0
.../src/views/account/settings/AvatarModal.vue | 0
.../src/views/account/settings/BaseSetting.vue | 0
.../src/views/account/settings/Binding.vue | 0
.../src/views/account/settings/Custom.vue | 0
.../src/views/account/settings/Index.vue | 0
.../src/views/account/settings/Notification.vue | 0
.../src/views/account/settings/Security.vue | 0
.../src/views/account/settings/Team.vue | 0
.../src/views/dashboard/Analysis.vue | 0
.../src/views/dashboard/Monitor.vue | 0
.../src/views/dashboard/Workplace.vue | 0
.../src/views/exception/403.vue | 0
.../src/views/exception/404.vue | 0
.../src/views/exception/500.vue | 0
.../src/views/form/BasicForm.vue | 0
.../src/views/form/advancedForm/AdvancedForm.vue | 0
.../src/views/form/advancedForm/RepositoryForm.vue | 0
.../src/views/form/advancedForm/TaskForm.vue | 0
.../src/views/form/stepForm/Step1.vue | 0
.../src/views/form/stepForm/Step2.vue | 0
.../src/views/form/stepForm/Step3.vue | 0
.../src/views/form/stepForm/StepForm.vue | 0
.../src/views/list/CardList.vue | 0
.../src/views/list/QueryList.vue | 0
.../src/views/list/StandardList.vue | 0
.../src/views/list/TableList.vue | 0
.../src/views/list}/modules/CreateForm.vue | 0
.../src/views/list/modules/StepByStepModal.vue | 0
.../src/views/list}/modules/TaskForm.vue | 0
.../src/views/list/search/Applications.vue | 0
.../src/views/list/search/Article.vue | 0
.../src/views/list/search/Projects.vue | 0
.../src/views/list/search/SearchLayout.vue | 0
.../src/views/list/search/components/CardInfo.vue | 0
.../src/views/list/search/components/IconText.vue | 0
.../src/views/list/table/Edit.vue | 0
.../src/views/list/table/List.vue | 0
.../src/views/other/IconSelectorView.vue | 0
.../src/views/other/PermissionList.vue | 0
.../src/views/other/RoleList.vue | 0
.../src/views/other/TableInnerEditList.vue | 0
.../src/views/other/TreeList.vue | 0
.../src/views/other/UserList.vue | 0
.../src/views/other/modules/OrgModal.vue | 0
.../src/views/other/modules/RoleModal.vue | 0
.../src/views/profile/advanced/Advanced.vue | 0
.../src/views/profile/basic/Index.vue | 0
.../src/views/result/Error.vue | 0
.../src/views/result/Success.vue | 0
.../src/views/role/RoleList.vue | 0
.../src/views/system/DeptList.vue | 0
.../src/views/system/DictItemList.vue | 0
.../src/views/system/DictList.vue | 0
.../src/views/system/UserList.vue | 0
.../src/views/system/modules/DeptModal.vue | 0
.../src/views/system/modules/DictItemModal.vue | 0
.../src/views/system/modules/DictModal.vue | 0
.../src/views/system/modules/PasswordModal.vue | 0
.../src/views/system/modules/UserModal.vue | 0
.../src/views/user/Login.vue | 0
.../src/views/user/Register.vue | 0
.../src/views/user/RegisterResult.vue | 0
.../src/views/workbench/Home.vue | 0
.../src/views/workbench/actuator/Actuator.vue | 0
.../workbench/actuator/modules/CreateActuator.vue | 0
.../workbench/actuator}/modules/CreateForm.vue | 0
.../views/workbench/actuator}/modules/TaskForm.vue | 0
.../src/views/workbench/data/Data.vue | 0
.../src/views/workbench/data/NewTable.vue | 0
.../src/views/workbench/data/Step1.vue | 0
.../src/views/workbench/data/Step2.vue | 0
.../src/views/workbench/data/Step3.vue | 0
.../src/views/workbench/job/Job.vue | 0
.../src/views/workbench/job/modules/CreateJob.vue | 0
.../src/views/workbench/workspace/Index.vue | 0
.../src/views/workbench/workspace/Release.vue | 0
.../src/views/workbench/workspace/Shared.vue | 0
.../src/views/workbench/workspace/Team.vue | 0
.../src/views/workbench/workspace/Training.vue | 0
.../views/workbench/workspace/WorkspaceLayout.vue | 0
.../views/workbench/workspace/project/Index.vue | 0
.../src/views/workbench/workspace/project/List.vue | 0
.../workbench/workspace/project/NewProject.vue | 0
.../workspace/project/NewProjectStep1.vue | 0
.../workspace/project/NewProjectStep2.vue | 0
.../workspace/project/NewProjectStep3.vue | 0
.../workbench/workspace/project/ProjectList.vue | 0
.../tests/unit/.eslintrc.js | 0
.../{submarine-web => workbench-web}/vue.config.js | 0
.../webstorm.config.js | 0
.../{submarine-web => workbench-web}/yarn.lock | 0
366 files changed, 112 insertions(+), 133 deletions(-)
diff --git a/.gitignore b/.gitignore
index 776cd37..fa80ba1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,11 +8,11 @@
*.jar
target
submodules/tony/tony-core/build
-submarine-workbench/submarine-web/node
-submarine-workbench/submarine-web/node_modules
-submarine-workbench/submarine-web/dist
-submarine-workbench/submarine-web/.env.local
-submarine-workbench/submarine-web/.env.*.local
-submarine-workbench/submarine-web/npm-debug.log*
-submarine-workbench/submarine-web/yarn-debug.log*
-submarine-workbench/submarine-web/yarn-error.log*
+submarine-workbench/workbench-web/node
+submarine-workbench/workbench-web/node_modules
+submarine-workbench/workbench-web/dist
+submarine-workbench/workbench-web/.env.local
+submarine-workbench/workbench-web/.env.*.local
+submarine-workbench/workbench-web/npm-debug.log*
+submarine-workbench/workbench-web/yarn-debug.log*
+submarine-workbench/workbench-web/yarn-error.log*
diff --git a/.travis.yml b/.travis.yml
index 0a35813..a8f8f1b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,8 +22,8 @@ cache:
apt: true
directories:
- ${HOME}/.m2
- - submarine-workbench/submarine-web/node
- - submarine-workbench/submarine-web/node_modules
+ - submarine-workbench/workbench-web/node
+ - submarine-workbench/workbench-web/node_modules
addons:
apt:
@@ -38,7 +38,7 @@ services:
env:
global:
- # submarine core does not required by submarine-server integration tests
+ # submarine core does not required by workbench-server integration tests
# If you need to compile Phadoop-3.1 or Phadoop-3.2, you need to add `!submarine-runtime/yarnservice-runtime` in EXCLUDE_SUBMARINE_CORE
- EXCLUDE_SUBMARINE_CORE="\"!submarine-all,!submarine-core,!submarine-dist,!submarine-runtime/tony-runtime,!submodules/tony,!submodules/tony/tony-mini,!submodules/tony/tony-core,!submodules/tony/tony-proxy,!submodules/tony/tony-portal,!submodules/tony/tony-azkaban,!submodules/tony/tony-cli\""
@@ -61,50 +61,50 @@ matrix:
- language: java
jdk: "openjdk8"
dist: xenial
- env: NAME="Build hadoop-2.7" PROFILE="-Phadoop-2.7" BUILD_FLAG="clean package install -DskipTests -DskipRat" TEST_FLAG="test -DskipRat -am" MODULES="-pl \"!submarine-workbench,!submarine-workbench/submarine-web,!submarine-workbench/submarine-server,!submarine-dist\"" TEST_PROJECTS=""
+ env: NAME="Build hadoop-2.7" PROFILE="-Phadoop-2.7" BUILD_FLAG="clean package install -DskipTests -DskipRat" TEST_FLAG="test -DskipRat -am" MODULES="-pl \"!submarine-workbench,!submarine-workbench/workbench-web,!submarine-workbench/workbench-server,!submarine-dist\"" TEST_PROJECTS=""
# Build hadoop-2.9(default)
- language: java
jdk: "openjdk8"
dist: xenial
- env: NAME="Build hadoop-2.9" PROFILE="-Phadoop-2.9" BUILD_FLAG="clean package install -DskipTests -DskipRat" TEST_FLAG="test -DskipRat -am" MODULES="-pl \"!submarine-workbench,!submarine-workbench/submarine-web,!submarine-workbench/submarine-server,!submarine-dist\"" TEST_PROJECTS=""
+ env: NAME="Build hadoop-2.9" PROFILE="-Phadoop-2.9" BUILD_FLAG="clean package install -DskipTests -DskipRat" TEST_FLAG="test -DskipRat -am" MODULES="-pl \"!submarine-workbench,!submarine-workbench/workbench-web,!submarine-workbench/workbench-server,!submarine-dist\"" TEST_PROJECTS=""
# Build hadoop-3.1
- language: java
jdk: "openjdk8"
dist: xenial
- env: NAME="Build hadoop-3.1" PROFILE="-Phadoop-3.1" BUILD_FLAG="clean package install -DskipTests -DskipRat" TEST_FLAG="test -DskipRat -am" MODULES="-pl \"!submarine-workbench,!submarine-workbench/submarine-web,!submarine-workbench/submarine-server,!submarine-dist\"" TEST_PROJECTS=""
+ env: NAME="Build hadoop-3.1" PROFILE="-Phadoop-3.1" BUILD_FLAG="clean package install -DskipTests -DskipRat" TEST_FLAG="test -DskipRat -am" MODULES="-pl \"!submarine-workbench,!submarine-workbench/workbench-web,!submarine-workbench/workbench-server,!submarine-dist\"" TEST_PROJECTS=""
# Build hadoop-3.2
- language: java
jdk: "openjdk8"
dist: xenial
- env: NAME="Build hadoop-3.2" PROFILE="-Phadoop-3.2" BUILD_FLAG="clean package install -DskipTests -DskipRat" TEST_FLAG="test -DskipRat -am" MODULES="-pl \"!submarine-workbench,!submarine-workbench/submarine-web,!submarine-workbench/submarine-server,!submarine-dist\"" TEST_PROJECTS=""
+ env: NAME="Build hadoop-3.2" PROFILE="-Phadoop-3.2" BUILD_FLAG="clean package install -DskipTests -DskipRat" TEST_FLAG="test -DskipRat -am" MODULES="-pl \"!submarine-workbench,!submarine-workbench/workbench-web,!submarine-workbench/workbench-server,!submarine-dist\"" TEST_PROJECTS=""
- # Build submarine-web
+ # Build workbench-web
- language: node_js
node_js:
- 10.15.0
before_install:
- - cd submarine-workbench/submarine-web
+ - cd submarine-workbench/workbench-web
install:
- yarn install
script:
- yarn
- yarn run lint --no-fix && yarn run build
- env: NAME="Build submarine-web"
+ env: NAME="Build workbench-web"
- # Test submarine-server
+ # Test workbench-server
- language: java
jdk: "openjdk8"
dist: xenial
- env: NAME="Test submarine-server" PROFILE="-Phadoop-2.9" BUILD_FLAG="clean package install -DskipTests" TEST_FLAG="test -DskipRat -am" MODULES="-pl ${EXCLUDE_SUBMARINE_CORE}" TEST_MODULES="-pl submarine-workbench/submarine-server" TEST_PROJECTS=""
+ env: NAME="Test workbench-server" PROFILE="-Phadoop-2.9" BUILD_FLAG="clean package install -DskipTests" TEST_FLAG="test -DskipRat -am" MODULES="-pl ${EXCLUDE_SUBMARINE_CORE}" TEST_MODULES="-pl submarine-workbench/workbench-server" TEST_PROJECTS=""
- # Test submarine-web
+ # Test workbench-web
- language: java
jdk: "openjdk8"
dist: xenial
- env: NAME="Test submarine-web" PROFILE="-Phadoop-2.9" BUILD_FLAG="clean package install -DskipTests" TEST_FLAG="test -DskipRat -am" MODULES="-pl ${EXCLUDE_SUBMARINE_CORE}" TEST_MODULES="-pl submarine-workbench/submarine-web" TEST_PROJECTS=""
+ env: NAME="Test workbench-web" PROFILE="-Phadoop-2.9" BUILD_FLAG="clean package install -DskipTests" TEST_FLAG="test -DskipRat -am" MODULES="-pl ${EXCLUDE_SUBMARINE_CORE}" TEST_MODULES="-pl submarine-workbench/workbench-web" TEST_PROJECTS=""
# Test submarine distribution
- language: java
diff --git a/dev-support/bin/submarine-daemon.sh b/dev-support/bin/submarine-daemon.sh
index 94f1c16..35fe6aa 100755
--- a/dev-support/bin/submarine-daemon.sh
+++ b/dev-support/bin/submarine-daemon.sh
@@ -19,4 +19,4 @@
# description: Start and stop daemon script for.
#
-${JAVA_HOME}/bin/java -cp "../../submarine-server/target/submarine-server-0.3.0-SNAPSHOT-shade.jar" org.apache.submarine.server.SubmarineServer
+${JAVA_HOME}/bin/java -cp "../../workbench-server/target/workbench-server-0.3.0-SNAPSHOT-shade.jar" org.apache.submarine.server.WorkbenchServer
diff --git a/docs/database/README.md b/docs/database/README.md
index 6a35eae..68fc592 100644
--- a/docs/database/README.md
+++ b/docs/database/README.md
@@ -128,4 +128,4 @@ mysqldump -uroot -ppassword --databases submarineDB > submarineDB.sql;
2. In the mysql database in Travis, the `submarine.sql` are executed to create the submarine database table structure and test data.
-3. The submarine database test case written in the `submarine-server` module will also be unit tested in the mysql database in travis.
+3. The submarine database test case written in the `workbench-server` module will also be unit tested in the mysql database in travis.
diff --git a/docs/development/README.md b/docs/development/README.md
index 4ff3894..cac73b7 100644
--- a/docs/development/README.md
+++ b/docs/development/README.md
@@ -56,18 +56,18 @@ metrics such as metrics when the algorithm is executed in your python program by
importing pysubmarine during the development of the machine learning algorithm.
### 2.7. submarine-workbench
-+ **submarine-server**: is a Jetty-based web server service. Submarine-server
++ **workbench-server**: is a Jetty-based web server service. Workbench-server
provides RESTful interface and Websocket interface. The RESTful interface
-provides submarine-web with management capabilities for databases such as
+provides workbench-web with management capabilities for databases such as
project, department, user, and role.
-+ **submarine-web**: is a web front-end service based on `VUE.js` framework.
-With `submarine-web` users can manage submarine project, department, user, role
++ **workbench-web**: is a web front-end service based on `VUE.js` framework.
+With `workbench-web` users can manage submarine project, department, user, role
through browser. You can also use the notebook to develop machine learning
algorithms, model release and other lifecycle management.
## 3. Submarine Workbench Development Guide
-Submarine workbench consists of three modules: submarine-server, submarine-web
+Submarine workbench consists of three modules: workbench-server, workbench-web
and database.
First, you need to clone the entire submarine project:
@@ -84,16 +84,16 @@ the project's [Submarine Database Guide](../database/) documentation and follow
the instructions to install a mysql database via docker in your development and
test environment.
-## 3.2 Submarine-web
+## 3.2 Workbench-web
+ **Install dependencies**
-You only need to execute the following command when you run submarine-web for
+You only need to execute the following command when you run workbench-web for
the first time, so you can follow the depend. environment of node.js in the
-submarine-web directory.
+workbench-web directory.
```bash
-cd submarine/submarine-web
+cd submarine/workbench-web
yarn install
```
@@ -105,23 +105,23 @@ The node.js dependency library will be installed in the node_modules directory.
yarn run build
```
-By executing the above command, `submarine-web` will publish the web page to the `submarine-web/dist` directory. Later we will also add the feature of `submarine-web` to a WAR package, which only requires a `submarine-web.war` file. Package can release submarine workbench.
+By executing the above command, `workbench-web` will publish the web page to the `workbench-web/dist` directory. Later we will also add the feature of `workbench-web` to a WAR package, which only requires a `workbench-web.war` file. Package can release submarine workbench.
+ **Lints and fixes files**
-When you write the `vue, js` file in `submarine-web` through IDEA, because IDEA can't format these files well, you need to execute the following command to format the vue and js files to avoid some warnings during the yarn build.
+When you write the `vue, js` file in `workbench-web` through IDEA, because IDEA can't format these files well, you need to execute the following command to format the vue and js files to avoid some warnings during the yarn build.
```
yarn run lint
```
-In fact, you must execute this command when you develop and submit any submarine-web feture. Otherwise, chances are that you won't be able to check the code specification we set up in Travis.
+In fact, you must execute this command when you develop and submit any workbench-web feture. Otherwise, chances are that you won't be able to check the code specification we set up in Travis.
-## 3.3 Submarine-server
+## 3.3 Workbench-server
-Submarine-server has a built-in jetty server service, so you don't need to install any web container service. You can start submarine workbench by launching `submarine-server` directly in IDEA.
+Workbench-server has a built-in jetty server service, so you don't need to install any web container service. You can start submarine workbench by launching `workbench-server` directly in IDEA.
-+ **Run / Debug** : In the IDEA, add a Run/Debug Configuration, `Main Class:` select `org.apache.submarine.server.SubmarineServer`, `Use classpath of module:` select `submarine-server`.
++ **Run / Debug** : In the IDEA, add a Run/Debug Configuration, `Main Class:` select `org.apache.submarine.server.WorkbenchServer`, `Use classpath of module:` select `workbench-server`.
@@ -129,10 +129,10 @@ So you can pass http://127.0.0.1:8080 debugging or running to submarine-workbenc
+ **It should be noted**:
-1. Because `submarine-web/dist` is the webapp default directory of the submarine-server Jetty Server, the submarine-server will automatically load the `submarine-web/dist` directory after startup.
+1. Because `workbench-web/dist` is the webapp default directory of the workbench-server Jetty Server, the workbench-server will automatically load the `workbench-web/dist` directory after startup.
-2. The `submarine-web/dist` used by `submarine-server` is used as the webapp directory, which is configured via `Submarine-site.xml`, but we do not recommend you to modify it.
+2. The `workbench-web/dist` used by `workbench-server` is used as the webapp directory, which is configured via `workbench-site.xml`, but we do not recommend you to modify it.
-3. The submarine-workbench, IP and 8080 ports that are accessible locally through the port 8080 of 127.0.0.1 are configured via `Submarine-site.xml`, but we do not recommend you to modify it.
+3. The submarine-workbench, IP and 8080 ports that are accessible locally through the port 8080 of 127.0.0.1 are configured via `workbench-site.xml`, but we do not recommend you to modify it.
-4. When you modify the `vue` or `js` of submarine-web, you need to execute the yarn run build command in the submarine-web directory, and let your modified code update to the dist directory, so that you can see the effect of your code modification in the workbench.
\ No newline at end of file
+4. When you modify the `vue` or `js` of workbench-web, you need to execute the yarn run build command in the workbench-web directory, and let your modified code update to the dist directory, so that you can see the effect of your code modification in the workbench.
diff --git a/docs/helper/MybatisGenerator.md b/docs/helper/MybatisGenerator.md
index deffe9d..4c2d0f3 100644
--- a/docs/helper/MybatisGenerator.md
+++ b/docs/helper/MybatisGenerator.md
@@ -31,7 +31,7 @@ You will still need to hand code SQL and objects for join queries, or stored pro
## Quick Start
### Add plug-in dependencies in pom.xml
-The plug-in has been added in the pom.xml of the _submarine-server_.
+The plug-in has been added in the pom.xml of the _workbench-server_.
```
<dependency>
@@ -49,7 +49,7 @@ connectionURL, userId, password.
3. **tableName** and **domainObjectName**: List all the table to generate the code.
### Add main class
-We have been added main class named _MybatisGeneratorMain_ in the _submarine-server_
+We have been added main class named _MybatisGeneratorMain_ in the _workbench-server_
project _org.apache.submarine.database.utils_ package path.
### Generator file
diff --git a/submarine-dist/pom.xml b/submarine-dist/pom.xml
index d2a448c..c35f086 100644
--- a/submarine-dist/pom.xml
+++ b/submarine-dist/pom.xml
@@ -52,7 +52,7 @@
</dependency>
<dependency>
<groupId>org.apache.submarine</groupId>
- <artifactId>submarine-web</artifactId>
+ <artifactId>workbench-web</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
diff --git a/submarine-dist/src/assembly/distribution.xml b/submarine-dist/src/assembly/distribution.xml
index 083711c..516c233 100644
--- a/submarine-dist/src/assembly/distribution.xml
+++ b/submarine-dist/src/assembly/distribution.xml
@@ -49,7 +49,7 @@
<dependencySet>
<outputDirectory>/workbench</outputDirectory>
<includes>
- <include>org.apache.submarine:submarine-web</include>
+ <include>org.apache.submarine:workbench-web</include>
</includes>
</dependencySet>
</dependencySets>
@@ -80,14 +80,14 @@
</includes>
</fileSet>
<fileSet>
- <directory>../submarine-workbench/submarine-server/target</directory>
+ <directory>../submarine-workbench/workbench-server/target</directory>
<outputDirectory>/workbench</outputDirectory>
<includes>
- <include>submarine-server-${project.version}.jar</include>
+ <include>workbench-server-${project.version}.jar</include>
</includes>
</fileSet>
<fileSet>
- <directory>../submarine-workbench/submarine-server/target/dependency</directory>
+ <directory>../submarine-workbench/workbench-server/target/dependency</directory>
<outputDirectory>/workbench/lib</outputDirectory>
</fileSet>
</fileSets>
diff --git a/submarine-dist/src/assembly/src-distribution.xml b/submarine-dist/src/assembly/src-distribution.xml
index 33de12e..fcdb2bd 100644
--- a/submarine-dist/src/assembly/src-distribution.xml
+++ b/submarine-dist/src/assembly/src-distribution.xml
@@ -37,9 +37,9 @@
<exclude>**/.settings</exclude>
<exclude>**/target/**</exclude>
<exclude>submodules/**/target/**</exclude>
- <exclude>submarine-workbench/submarine-web/dist/**</exclude>
- <exclude>submarine-workbench/submarine-web/node_modules/**</exclude>
- <exclude>submarine-workbench/submarine-web/node/**</exclude>
+ <exclude>submarine-workbench/workbench-web/dist/**</exclude>
+ <exclude>submarine-workbench/workbench-web/node_modules/**</exclude>
+ <exclude>submarine-workbench/workbench-web/node/**</exclude>
<!-- until the code that does this is fixed -->
<exclude>**/*.log</exclude>
<exclude>**/build/**</exclude>
diff --git a/submarine-workbench/pom.xml b/submarine-workbench/pom.xml
index 3aa54c2..cf28df3 100644
--- a/submarine-workbench/pom.xml
+++ b/submarine-workbench/pom.xml
@@ -32,8 +32,8 @@
<description>Submarine Workbench</description>
<modules>
- <module>submarine-web</module>
- <module>submarine-server</module>
+ <module>workbench-web</module>
+ <module>workbench-server</module>
</modules>
</project>
diff --git a/submarine-workbench/submarine-server/src/main/resources/log4j.properties b/submarine-workbench/submarine-server/src/main/resources/log4j.properties
deleted file mode 100644
index aad8799..0000000
--- a/submarine-workbench/submarine-server/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-log4j.rootLogger = info, stdout
-
-log4j.appender.stdout = org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target = System.out
-log4j.appender.stdout.layout = org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern = [%-5p] %d{yyyy-MM-dd HH:mm:ss,SSS} method:%l%n%m%n
diff --git a/submarine-workbench/submarine-server/pom.xml b/submarine-workbench/workbench-server/pom.xml
similarity index 99%
rename from submarine-workbench/submarine-server/pom.xml
rename to submarine-workbench/workbench-server/pom.xml
index 93e31c2..9be455e 100644
--- a/submarine-workbench/submarine-server/pom.xml
+++ b/submarine-workbench/workbench-server/pom.xml
@@ -27,7 +27,7 @@
</parent>
<groupId>org.apache.submarine</groupId>
- <artifactId>submarine-server</artifactId>
+ <artifactId>workbench-server</artifactId>
<packaging>jar</packaging>
<version>0.3.0-SNAPSHOT</version>
<name>Submarine: Workbench Server</name>
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/annotation/Dict.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/annotation/Dict.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/annotation/Dict.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/annotation/Dict.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/annotation/SubmarineApi.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/annotation/SubmarineApi.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/annotation/SubmarineApi.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/annotation/SubmarineApi.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/MyBatisUtil.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/MyBatisUtil.java
similarity index 94%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/MyBatisUtil.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/MyBatisUtil.java
index 1ddad2d..0cb6d8c 100755
--- a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/MyBatisUtil.java
+++ b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/MyBatisUtil.java
@@ -17,7 +17,7 @@ import org.apache.ibatis.io.Resources;
import org.apache.ibatis.session.SqlSession;
import org.apache.ibatis.session.SqlSessionFactory;
import org.apache.ibatis.session.SqlSessionFactoryBuilder;
-import org.apache.submarine.server.SubmarineConfiguration;
+import org.apache.submarine.server.WorkbenchConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,7 +42,7 @@ public class MyBatisUtil {
checkCalledByTestMethod();
- SubmarineConfiguration conf = SubmarineConfiguration.create();
+ WorkbenchConfiguration conf = WorkbenchConfiguration.create();
String jdbcClassName = conf.getJdbcDriverClassName();
String jdbcUrl = conf.getJdbcUrl();
String jdbcUserName = conf.getJdbcUserName();
@@ -90,7 +90,7 @@ public class MyBatisUtil {
private static void usingTestDatabase() {
LOG.info("Run the test unit using the test database");
// Run the test unit using the test database
- SubmarineConfiguration conf = SubmarineConfiguration.create();
+ WorkbenchConfiguration conf = WorkbenchConfiguration.create();
conf.setJdbcUrl("jdbc:mysql://127.0.0.1:3306/submarineDB_test?" +
"useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&" +
"failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false");
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/entity/BaseEntity.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/entity/BaseEntity.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/entity/BaseEntity.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/entity/BaseEntity.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/entity/Project.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/entity/Project.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/entity/Project.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/entity/Project.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/entity/ProjectFiles.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/entity/ProjectFiles.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/entity/ProjectFiles.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/entity/ProjectFiles.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/entity/SysDept.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/entity/SysDept.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/entity/SysDept.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/entity/SysDept.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/entity/SysDeptSelect.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/entity/SysDeptSelect.java
similarity index 96%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/entity/SysDeptSelect.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/entity/SysDeptSelect.java
index 64b38af..581a98e 100644
--- a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/entity/SysDeptSelect.java
+++ b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/entity/SysDeptSelect.java
@@ -16,7 +16,7 @@ package org.apache.submarine.database.entity;
import java.util.ArrayList;
import java.util.List;
-// Corresponding to the submarine-web front-end tree select control
+// Corresponding to the workbench-web front-end tree select control
public class SysDeptSelect {
// TreeSelect key
private String key;
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/entity/SysDeptTree.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/entity/SysDeptTree.java
similarity index 96%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/entity/SysDeptTree.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/entity/SysDeptTree.java
index fe7e79c..6771831 100644
--- a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/entity/SysDeptTree.java
+++ b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/entity/SysDeptTree.java
@@ -16,7 +16,7 @@ package org.apache.submarine.database.entity;
import java.util.ArrayList;
import java.util.List;
-// Corresponding to the submarine-web front-end tree table control
+// Corresponding to the workbench-web front-end tree table control
public class SysDeptTree extends SysDept {
// Use the SysDept.id field as the key in the front-end data tree
private String key;
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/entity/SysDict.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/entity/SysDict.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/entity/SysDict.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/entity/SysDict.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/entity/SysDictItem.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/entity/SysDictItem.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/entity/SysDictItem.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/entity/SysDictItem.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/entity/SysMessage.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/entity/SysMessage.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/entity/SysMessage.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/entity/SysMessage.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/entity/SysUser.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/entity/SysUser.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/entity/SysUser.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/entity/SysUser.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/entity/Team.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/entity/Team.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/entity/Team.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/entity/Team.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/entity/TeamMember.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/entity/TeamMember.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/entity/TeamMember.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/entity/TeamMember.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/mappers/ProjectFilesMapper.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/mappers/ProjectFilesMapper.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/mappers/ProjectFilesMapper.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/mappers/ProjectFilesMapper.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/mappers/ProjectMapper.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/mappers/ProjectMapper.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/mappers/ProjectMapper.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/mappers/ProjectMapper.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/mappers/SysDeptMapper.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/mappers/SysDeptMapper.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/mappers/SysDeptMapper.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/mappers/SysDeptMapper.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/mappers/SysDictItemMapper.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/mappers/SysDictItemMapper.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/mappers/SysDictItemMapper.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/mappers/SysDictItemMapper.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/mappers/SysDictMapper.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/mappers/SysDictMapper.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/mappers/SysDictMapper.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/mappers/SysDictMapper.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/mappers/SysMessageMapper.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/mappers/SysMessageMapper.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/mappers/SysMessageMapper.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/mappers/SysMessageMapper.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/mappers/SysUserMapper.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/mappers/SysUserMapper.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/mappers/SysUserMapper.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/mappers/SysUserMapper.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/mappers/SystemMapper.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/mappers/SystemMapper.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/mappers/SystemMapper.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/mappers/SystemMapper.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/mappers/TeamMapper.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/mappers/TeamMapper.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/mappers/TeamMapper.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/mappers/TeamMapper.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/mappers/TeamMemberMapper.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/mappers/TeamMemberMapper.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/mappers/TeamMemberMapper.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/mappers/TeamMemberMapper.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/service/ProjectFilesService.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/ProjectFilesService.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/service/ProjectFilesService.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/ProjectFilesService.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/service/ProjectService.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/ProjectService.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/service/ProjectService.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/ProjectService.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/service/SysDictItemService.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/SysDictItemService.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/service/SysDictItemService.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/SysDictItemService.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/service/SysMessageService.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/SysMessageService.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/service/SysMessageService.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/SysMessageService.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/service/SysUserService.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/SysUserService.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/service/SysUserService.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/SysUserService.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/service/TeamMemberService.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/TeamMemberService.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/service/TeamMemberService.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/TeamMemberService.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/service/TeamService.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/TeamService.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/service/TeamService.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/TeamService.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/utils/CustomJsonDateDeserializer.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/utils/CustomJsonDateDeserializer.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/utils/CustomJsonDateDeserializer.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/utils/CustomJsonDateDeserializer.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/utils/DepartmentUtil.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/utils/DepartmentUtil.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/utils/DepartmentUtil.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/utils/DepartmentUtil.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/utils/DictAnnotation.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/utils/DictAnnotation.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/utils/DictAnnotation.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/utils/DictAnnotation.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/utils/MybatisGeneratorMain.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/utils/MybatisGeneratorMain.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/database/utils/MybatisGeneratorMain.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/utils/MybatisGeneratorMain.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/entity/Action.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/entity/Action.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/entity/Action.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/entity/Action.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/entity/Permission.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/entity/Permission.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/entity/Permission.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/entity/Permission.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/entity/Role.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/entity/Role.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/entity/Role.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/entity/Role.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/entity/User.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/entity/User.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/entity/User.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/entity/User.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/entity/UserInfo.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/entity/UserInfo.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/entity/UserInfo.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/entity/UserInfo.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/rest/LoginRestApi.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/rest/LoginRestApi.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/rest/LoginRestApi.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/rest/LoginRestApi.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/rest/ProjectRestApi.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/rest/ProjectRestApi.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/rest/ProjectRestApi.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/rest/ProjectRestApi.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/rest/SysDeptRestApi.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/rest/SysDeptRestApi.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/rest/SysDeptRestApi.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/rest/SysDeptRestApi.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/rest/SysDictItemRestApi.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/rest/SysDictItemRestApi.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/rest/SysDictItemRestApi.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/rest/SysDictItemRestApi.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/rest/SysDictRestApi.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/rest/SysDictRestApi.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/rest/SysDictRestApi.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/rest/SysDictRestApi.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/rest/SysUserRestApi.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/rest/SysUserRestApi.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/rest/SysUserRestApi.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/rest/SysUserRestApi.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/rest/SystemRestApi.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/rest/SystemRestApi.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/rest/SystemRestApi.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/rest/SystemRestApi.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/rest/TeamRestApi.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/rest/TeamRestApi.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/rest/TeamRestApi.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/rest/TeamRestApi.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/server/JsonExclusionStrategy.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/server/JsonExclusionStrategy.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/server/JsonExclusionStrategy.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/server/JsonExclusionStrategy.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/server/JsonResponse.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/server/JsonResponse.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/server/JsonResponse.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/server/JsonResponse.java
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/server/SubmarineConfiguration.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/server/WorkbenchConfiguration.java
similarity index 87%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/server/SubmarineConfiguration.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/server/WorkbenchConfiguration.java
index 350fdea..dd06785 100644
--- a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/server/SubmarineConfiguration.java
+++ b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/server/WorkbenchConfiguration.java
@@ -27,17 +27,17 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-public class SubmarineConfiguration extends XMLConfiguration {
- private static final Logger LOG = LoggerFactory.getLogger(SubmarineConfiguration.class);
+public class WorkbenchConfiguration extends XMLConfiguration {
+ private static final Logger LOG = LoggerFactory.getLogger(WorkbenchConfiguration.class);
private static final long serialVersionUID = 4749303235693848035L;
- private static final String SUBMARINE_SITE_XML = "submarine-site.xml";
+ private static final String WORKBENCH_SITE_XML = "workbench-site.xml";
- private static SubmarineConfiguration conf;
+ private static WorkbenchConfiguration conf;
private Map<String, String> properties = new HashMap<>();
- public SubmarineConfiguration(URL url) throws ConfigurationException {
+ public WorkbenchConfiguration(URL url) throws ConfigurationException {
setDelimiterParsingDisabled(true);
load(url);
initProperties();
@@ -57,7 +57,7 @@ public class SubmarineConfiguration extends XMLConfiguration {
}
}
- public SubmarineConfiguration() {
+ public WorkbenchConfiguration() {
ConfVars[] vars = ConfVars.values();
for (ConfVars v : vars) {
if (v.getType() == ConfVars.VarType.BOOLEAN) {
@@ -76,7 +76,7 @@ public class SubmarineConfiguration extends XMLConfiguration {
}
}
- public static synchronized SubmarineConfiguration create() {
+ public static synchronized WorkbenchConfiguration create() {
if (conf != null) {
return conf;
}
@@ -84,27 +84,27 @@ public class SubmarineConfiguration extends XMLConfiguration {
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
URL url;
- url = SubmarineConfiguration.class.getResource(SUBMARINE_SITE_XML);
+ url = WorkbenchConfiguration.class.getResource(WORKBENCH_SITE_XML);
if (url == null) {
- ClassLoader cl = SubmarineConfiguration.class.getClassLoader();
+ ClassLoader cl = WorkbenchConfiguration.class.getClassLoader();
if (cl != null) {
- url = cl.getResource(SUBMARINE_SITE_XML);
+ url = cl.getResource(WORKBENCH_SITE_XML);
}
}
if (url == null) {
- url = classLoader.getResource(SUBMARINE_SITE_XML);
+ url = classLoader.getResource(WORKBENCH_SITE_XML);
}
if (url == null) {
LOG.warn("Failed to load configuration, proceeding with a default");
- conf = new SubmarineConfiguration();
+ conf = new WorkbenchConfiguration();
} else {
try {
LOG.info("Load configuration from " + url);
- conf = new SubmarineConfiguration(url);
+ conf = new WorkbenchConfiguration(url);
} catch (ConfigurationException e) {
LOG.warn("Failed to load configuration from " + url + " proceeding with a default", e);
- conf = new SubmarineConfiguration();
+ conf = new WorkbenchConfiguration();
}
}
@@ -355,30 +355,30 @@ public class SubmarineConfiguration extends XMLConfiguration {
}
public enum ConfVars {
- SERVER_ADDR("submarine.server.addr", "0.0.0.0"),
- SERVER_PORT("submarine.server.port", 8080),
- SERVER_SSL("submarine.server.ssl", false),
- SERVER_SSL_PORT("submarine.server.ssl.port", 8443),
- SERVER_JETTY_THREAD_POOL_MAX("submarine.server.jetty.thread.pool.max", 400),
- SERVER_JETTY_THREAD_POOL_MIN("submarine.server.jetty.thread.pool.min", 8),
- SERVER_JETTY_THREAD_POOL_TIMEOUT("submarine.server.jetty.thread.pool.timeout", 30),
- SERVER_JETTY_REQUEST_HEADER_SIZE("submarine.server.jetty.request.header.size", 8192),
- SSL_CLIENT_AUTH("submarine.ssl.client.auth", false),
- SSL_KEYSTORE_PATH("submarine.ssl.keystore.path", "keystore"),
- SERVER_SSL_KEYSTORE_TYPE("submarine.ssl.keystore.type", "JKS"),
- SERVER_SSL_KEYSTORE_PASSWORD("submarine.ssl.keystore.password", ""),
- SERVER_SSL_KEY_MANAGER_PASSWORD("submarine.ssl.key.manager.password", null),
- SERVER_SSL_TRUSTSTORE_PATH("submarine.ssl.truststore.path", null),
- SERVER_SSL_TRUSTSTORE_TYPE("submarine.ssl.truststore.type", null),
- SERVER_SSL_TRUSTSTORE_PASSWORD("submarine.ssl.truststore.password", null),
+ SERVER_ADDR("workbench.server.addr", "0.0.0.0"),
+ SERVER_PORT("workbench.server.port", 8080),
+ SERVER_SSL("workbench.server.ssl", false),
+ SERVER_SSL_PORT("workbench.server.ssl.port", 8443),
+ SERVER_JETTY_THREAD_POOL_MAX("workbench.server.jetty.thread.pool.max", 400),
+ SERVER_JETTY_THREAD_POOL_MIN("workbench.server.jetty.thread.pool.min", 8),
+ SERVER_JETTY_THREAD_POOL_TIMEOUT("workbench.server.jetty.thread.pool.timeout", 30),
+ SERVER_JETTY_REQUEST_HEADER_SIZE("workbench.server.jetty.request.header.size", 8192),
+ SSL_CLIENT_AUTH("workbench.ssl.client.auth", false),
+ SSL_KEYSTORE_PATH("workbench.ssl.keystore.path", "keystore"),
+ SERVER_SSL_KEYSTORE_TYPE("workbench.ssl.keystore.type", "JKS"),
+ SERVER_SSL_KEYSTORE_PASSWORD("workbench.ssl.keystore.password", ""),
+ SERVER_SSL_KEY_MANAGER_PASSWORD("workbench.ssl.key.manager.password", null),
+ SERVER_SSL_TRUSTSTORE_PATH("workbench.ssl.truststore.path", null),
+ SERVER_SSL_TRUSTSTORE_TYPE("workbench.ssl.truststore.type", null),
+ SERVER_SSL_TRUSTSTORE_PASSWORD("workbench.ssl.truststore.password", null),
JDBC_DRIVERCLASSNAME("jdbc.driverClassName", "com.mysql.jdbc.Driver"),
JDBC_URL("jdbc.url", "jdbc:mysql://127.0.0.1:3306/submarineDB" +
"?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&" +
"failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false"),
JDBC_USERNAME("jdbc.username", "submarine"),
JDBC_PASSWORD("jdbc.password", "password"),
- SUBMARINE_WAR("submarine.war", "submarine-workbench/submarine-web/dist"),
- SUBMARINE_WAR_TEMPDIR("submarine.war.tempdir", "webapps");
+ SUBMARINE_WAR("workbench.war", "submarine-workbench/workbench-web/dist"),
+ WAR_TEMPDIR("workbench.war.tempdir", "webapps");
private String varName;
@SuppressWarnings("rawtypes")
diff --git a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/server/SubmarineServer.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/server/WorkbenchServer.java
similarity index 88%
rename from submarine-workbench/submarine-server/src/main/java/org/apache/submarine/server/SubmarineServer.java
rename to submarine-workbench/workbench-server/src/main/java/org/apache/submarine/server/WorkbenchServer.java
index f242e0a..304c60a 100644
--- a/submarine-workbench/submarine-server/src/main/java/org/apache/submarine/server/SubmarineServer.java
+++ b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/server/WorkbenchServer.java
@@ -33,22 +33,22 @@ import org.glassfish.jersey.server.ResourceConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.submarine.server.SubmarineConfiguration.ConfVars;
+import org.apache.submarine.server.WorkbenchConfiguration.ConfVars;
import javax.inject.Inject;
import java.io.File;
-public class SubmarineServer extends ResourceConfig {
- private static final Logger LOG = LoggerFactory.getLogger(SubmarineServer.class);
+public class WorkbenchServer extends ResourceConfig {
+ private static final Logger LOG = LoggerFactory.getLogger(WorkbenchServer.class);
public static Server jettyWebServer;
- private static SubmarineConfiguration conf = SubmarineConfiguration.create();
+ private static WorkbenchConfiguration conf = WorkbenchConfiguration.create();
public static void main(String[] args) throws InterruptedException {
PropertyConfigurator.configure(ClassLoader.getSystemResource("log4j.properties"));
- final SubmarineConfiguration conf = SubmarineConfiguration.create();
+ final WorkbenchConfiguration conf = WorkbenchConfiguration.create();
jettyWebServer = setupJettyServer(conf);
@@ -64,14 +64,14 @@ public class SubmarineServer extends ResourceConfig {
}
@Inject
- public SubmarineServer() {
+ public WorkbenchServer() {
packages("org.apache.submarine.rest");
}
private static void startServer() throws InterruptedException {
LOG.info("Starting submarine server");
try {
- jettyWebServer.start(); // Instantiates submarineServer
+ jettyWebServer.start(); // Instantiates WorkbenchServer
} catch (Exception e) {
LOG.error("Error while running jettyServer", e);
System.exit(-1);
@@ -82,7 +82,7 @@ public class SubmarineServer extends ResourceConfig {
.addShutdownHook(
new Thread(
() -> {
- LOG.info("Shutting down submarine Server ... ");
+ LOG.info("Shutting down Submarine Workbench Server ... ");
try {
jettyWebServer.stop();
Thread.sleep(3000);
@@ -95,11 +95,11 @@ public class SubmarineServer extends ResourceConfig {
jettyWebServer.join();
}
- private static void setupRestApiContextHandler(WebAppContext webapp, SubmarineConfiguration conf) {
+ private static void setupRestApiContextHandler(WebAppContext webapp, WorkbenchConfiguration conf) {
final ServletHolder servletHolder =
new ServletHolder(new org.glassfish.jersey.servlet.ServletContainer());
- servletHolder.setInitParameter("javax.ws.rs.Application", SubmarineServer.class.getName());
+ servletHolder.setInitParameter("javax.ws.rs.Application", WorkbenchServer.class.getName());
servletHolder.setName("rest");
servletHolder.setForcedPath("rest");
webapp.setSessionHandler(new SessionHandler());
@@ -107,7 +107,7 @@ public class SubmarineServer extends ResourceConfig {
}
private static WebAppContext setupWebAppContext(ContextHandlerCollection contexts,
- SubmarineConfiguration conf) {
+ WorkbenchConfiguration conf) {
WebAppContext webApp = new WebAppContext();
webApp.setContextPath("/");
File warPath = new File(conf.getString(ConfVars.SUBMARINE_WAR));
@@ -119,7 +119,7 @@ public class SubmarineServer extends ResourceConfig {
} else {
// use packaged WAR
webApp.setWar(warPath.getAbsolutePath());
- File warTempDirectory = new File(conf.getRelativeDir(ConfVars.SUBMARINE_WAR_TEMPDIR));
+ File warTempDirectory = new File(conf.getRelativeDir(ConfVars.WAR_TEMPDIR));
warTempDirectory.mkdir();
LOG.info("submarineServer Webapp path: {}", warTempDirectory.getPath());
webApp.setTempDirectory(warTempDirectory);
@@ -131,7 +131,7 @@ public class SubmarineServer extends ResourceConfig {
return webApp;
}
- private static Server setupJettyServer(SubmarineConfiguration conf) {
+ private static Server setupJettyServer(WorkbenchConfiguration conf) {
ThreadPool threadPool =
new QueuedThreadPool(conf.getInt(ConfVars.SERVER_JETTY_THREAD_POOL_MAX),
conf.getInt(ConfVars.SERVER_JETTY_THREAD_POOL_MIN),
@@ -178,7 +178,7 @@ public class SubmarineServer extends ResourceConfig {
return server;
}
- private static SslContextFactory getSslContextFactory(SubmarineConfiguration conf) {
+ private static SslContextFactory getSslContextFactory(WorkbenchConfiguration conf) {
SslContextFactory sslContextFactory = new SslContextFactory();
// Set keystore
@@ -200,7 +200,7 @@ public class SubmarineServer extends ResourceConfig {
}
private static void configureRequestHeaderSize(
- SubmarineConfiguration conf, ServerConnector connector) {
+ WorkbenchConfiguration conf, ServerConnector connector) {
HttpConnectionFactory cf =
(HttpConnectionFactory) connector.getConnectionFactory(HttpVersion.HTTP_1_1.toString());
int requestHeaderSize = conf.getJettyRequestHeaderSize();
diff --git a/submarine-workbench/submarine-server/src/main/resources/mbgConfiguration.xml b/submarine-workbench/workbench-server/src/main/resources/mbgConfiguration.xml
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/resources/mbgConfiguration.xml
rename to submarine-workbench/workbench-server/src/main/resources/mbgConfiguration.xml
diff --git a/submarine-workbench/submarine-server/src/main/resources/mybatis-config.xml b/submarine-workbench/workbench-server/src/main/resources/mybatis-config.xml
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/resources/mybatis-config.xml
rename to submarine-workbench/workbench-server/src/main/resources/mybatis-config.xml
diff --git a/submarine-workbench/submarine-server/src/main/resources/org/apache/submarine/database/mappers/ProjectFilesMapper.xml b/submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/ProjectFilesMapper.xml
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/resources/org/apache/submarine/database/mappers/ProjectFilesMapper.xml
rename to submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/ProjectFilesMapper.xml
diff --git a/submarine-workbench/submarine-server/src/main/resources/org/apache/submarine/database/mappers/ProjectMapper.xml b/submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/ProjectMapper.xml
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/resources/org/apache/submarine/database/mappers/ProjectMapper.xml
rename to submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/ProjectMapper.xml
diff --git a/submarine-workbench/submarine-server/src/main/resources/org/apache/submarine/database/mappers/SysDeptMapper.xml b/submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/SysDeptMapper.xml
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/resources/org/apache/submarine/database/mappers/SysDeptMapper.xml
rename to submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/SysDeptMapper.xml
diff --git a/submarine-workbench/submarine-server/src/main/resources/org/apache/submarine/database/mappers/SysDictItemMapper.xml b/submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/SysDictItemMapper.xml
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/resources/org/apache/submarine/database/mappers/SysDictItemMapper.xml
rename to submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/SysDictItemMapper.xml
diff --git a/submarine-workbench/submarine-server/src/main/resources/org/apache/submarine/database/mappers/SysDictMapper.xml b/submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/SysDictMapper.xml
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/resources/org/apache/submarine/database/mappers/SysDictMapper.xml
rename to submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/SysDictMapper.xml
diff --git a/submarine-workbench/submarine-server/src/main/resources/org/apache/submarine/database/mappers/SysMessageMapper.xml b/submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/SysMessageMapper.xml
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/resources/org/apache/submarine/database/mappers/SysMessageMapper.xml
rename to submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/SysMessageMapper.xml
diff --git a/submarine-workbench/submarine-server/src/main/resources/org/apache/submarine/database/mappers/SysUserMapper.xml b/submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/SysUserMapper.xml
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/resources/org/apache/submarine/database/mappers/SysUserMapper.xml
rename to submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/SysUserMapper.xml
diff --git a/submarine-workbench/submarine-server/src/main/resources/org/apache/submarine/database/mappers/SystemMapper.xml b/submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/SystemMapper.xml
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/resources/org/apache/submarine/database/mappers/SystemMapper.xml
rename to submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/SystemMapper.xml
diff --git a/submarine-workbench/submarine-server/src/main/resources/org/apache/submarine/database/mappers/TeamMapper.xml b/submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/TeamMapper.xml
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/resources/org/apache/submarine/database/mappers/TeamMapper.xml
rename to submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/TeamMapper.xml
diff --git a/submarine-workbench/submarine-server/src/main/resources/org/apache/submarine/database/mappers/TeamMemberMapper.xml b/submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/TeamMemberMapper.xml
similarity index 100%
rename from submarine-workbench/submarine-server/src/main/resources/org/apache/submarine/database/mappers/TeamMemberMapper.xml
rename to submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/TeamMemberMapper.xml
diff --git a/submarine-workbench/submarine-server/src/test/java/org/apache/submarine/database/service/ProjectServiceTest.java b/submarine-workbench/workbench-server/src/test/java/org/apache/submarine/database/service/ProjectServiceTest.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/test/java/org/apache/submarine/database/service/ProjectServiceTest.java
rename to submarine-workbench/workbench-server/src/test/java/org/apache/submarine/database/service/ProjectServiceTest.java
diff --git a/submarine-workbench/submarine-server/src/test/java/org/apache/submarine/database/service/SysUserServiceTest.java b/submarine-workbench/workbench-server/src/test/java/org/apache/submarine/database/service/SysUserServiceTest.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/test/java/org/apache/submarine/database/service/SysUserServiceTest.java
rename to submarine-workbench/workbench-server/src/test/java/org/apache/submarine/database/service/SysUserServiceTest.java
diff --git a/submarine-workbench/submarine-server/src/test/java/org/apache/submarine/database/service/TeamServiceTest.java b/submarine-workbench/workbench-server/src/test/java/org/apache/submarine/database/service/TeamServiceTest.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/test/java/org/apache/submarine/database/service/TeamServiceTest.java
rename to submarine-workbench/workbench-server/src/test/java/org/apache/submarine/database/service/TeamServiceTest.java
diff --git a/submarine-workbench/submarine-server/src/test/java/org/apache/submarine/database/utils/DepartmentUtilTest.java b/submarine-workbench/workbench-server/src/test/java/org/apache/submarine/database/utils/DepartmentUtilTest.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/test/java/org/apache/submarine/database/utils/DepartmentUtilTest.java
rename to submarine-workbench/workbench-server/src/test/java/org/apache/submarine/database/utils/DepartmentUtilTest.java
diff --git a/submarine-workbench/submarine-server/src/test/java/org/apache/submarine/database/utils/DictAnnotationTest.java b/submarine-workbench/workbench-server/src/test/java/org/apache/submarine/database/utils/DictAnnotationTest.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/test/java/org/apache/submarine/database/utils/DictAnnotationTest.java
rename to submarine-workbench/workbench-server/src/test/java/org/apache/submarine/database/utils/DictAnnotationTest.java
diff --git a/submarine-workbench/submarine-server/src/test/java/org/apache/submarine/rest/CommonDataTest.java b/submarine-workbench/workbench-server/src/test/java/org/apache/submarine/rest/CommonDataTest.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/test/java/org/apache/submarine/rest/CommonDataTest.java
rename to submarine-workbench/workbench-server/src/test/java/org/apache/submarine/rest/CommonDataTest.java
diff --git a/submarine-workbench/submarine-server/src/test/java/org/apache/submarine/rest/SysDeptRestApiTest.java b/submarine-workbench/workbench-server/src/test/java/org/apache/submarine/rest/SysDeptRestApiTest.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/test/java/org/apache/submarine/rest/SysDeptRestApiTest.java
rename to submarine-workbench/workbench-server/src/test/java/org/apache/submarine/rest/SysDeptRestApiTest.java
diff --git a/submarine-workbench/submarine-server/src/test/java/org/apache/submarine/rest/SysDictItemRestApiTest.java b/submarine-workbench/workbench-server/src/test/java/org/apache/submarine/rest/SysDictItemRestApiTest.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/test/java/org/apache/submarine/rest/SysDictItemRestApiTest.java
rename to submarine-workbench/workbench-server/src/test/java/org/apache/submarine/rest/SysDictItemRestApiTest.java
diff --git a/submarine-workbench/submarine-server/src/test/java/org/apache/submarine/rest/SysDictRestApiTest.java b/submarine-workbench/workbench-server/src/test/java/org/apache/submarine/rest/SysDictRestApiTest.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/test/java/org/apache/submarine/rest/SysDictRestApiTest.java
rename to submarine-workbench/workbench-server/src/test/java/org/apache/submarine/rest/SysDictRestApiTest.java
diff --git a/submarine-workbench/submarine-server/src/test/java/org/apache/submarine/rest/SysUserRestApiTest.java b/submarine-workbench/workbench-server/src/test/java/org/apache/submarine/rest/SysUserRestApiTest.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/test/java/org/apache/submarine/rest/SysUserRestApiTest.java
rename to submarine-workbench/workbench-server/src/test/java/org/apache/submarine/rest/SysUserRestApiTest.java
diff --git a/submarine-workbench/submarine-server/src/test/java/org/apache/submarine/server/JsonResponseTest.java b/submarine-workbench/workbench-server/src/test/java/org/apache/submarine/server/JsonResponseTest.java
similarity index 100%
rename from submarine-workbench/submarine-server/src/test/java/org/apache/submarine/server/JsonResponseTest.java
rename to submarine-workbench/workbench-server/src/test/java/org/apache/submarine/server/JsonResponseTest.java
diff --git a/submarine-workbench/submarine-web/.editorconfig b/submarine-workbench/workbench-web/.editorconfig
similarity index 100%
rename from submarine-workbench/submarine-web/.editorconfig
rename to submarine-workbench/workbench-web/.editorconfig
diff --git a/submarine-workbench/submarine-web/.env b/submarine-workbench/workbench-web/.env
similarity index 100%
rename from submarine-workbench/submarine-web/.env
rename to submarine-workbench/workbench-web/.env
diff --git a/submarine-workbench/submarine-web/.env.preview b/submarine-workbench/workbench-web/.env.preview
similarity index 100%
rename from submarine-workbench/submarine-web/.env.preview
rename to submarine-workbench/workbench-web/.env.preview
diff --git a/submarine-workbench/submarine-web/.gitattributes b/submarine-workbench/workbench-web/.gitattributes
similarity index 100%
rename from submarine-workbench/submarine-web/.gitattributes
rename to submarine-workbench/workbench-web/.gitattributes
diff --git a/submarine-workbench/submarine-web/.prettierrc b/submarine-workbench/workbench-web/.prettierrc
similarity index 100%
rename from submarine-workbench/submarine-web/.prettierrc
rename to submarine-workbench/workbench-web/.prettierrc
diff --git a/submarine-workbench/submarine-web/LICENSE b/submarine-workbench/workbench-web/LICENSE
similarity index 100%
rename from submarine-workbench/submarine-web/LICENSE
rename to submarine-workbench/workbench-web/LICENSE
diff --git a/submarine-workbench/submarine-web/README.md b/submarine-workbench/workbench-web/README.md
similarity index 95%
rename from submarine-workbench/submarine-web/README.md
rename to submarine-workbench/workbench-web/README.md
index cc62b22..3d41e78 100644
--- a/submarine-workbench/submarine-web/README.md
+++ b/submarine-workbench/workbench-web/README.md
@@ -21,7 +21,7 @@ English | [简体中文](./README.zh-CN.md)
- Clone repo
```bash
git https://github.com/hadoopsubmarine/submarine.git
-cd submarine/submarine-workbench/submarine-web
+cd submarine/submarine-workbench/workbench-web
```
- Install dependencies
diff --git a/submarine-workbench/submarine-web/README.zh-CN.md b/submarine-workbench/workbench-web/README.zh-CN.md
similarity index 96%
rename from submarine-workbench/submarine-web/README.zh-CN.md
rename to submarine-workbench/workbench-web/README.zh-CN.md
index 7b9cb95..d00d460 100644
--- a/submarine-workbench/submarine-web/README.zh-CN.md
+++ b/submarine-workbench/workbench-web/README.zh-CN.md
@@ -26,7 +26,7 @@
- 拉取项目代码
```bash
git https://github.com/hadoopsubmarine/submarine.git
-cd submarine/submarine-web
+cd submarine/submarine-workbench/workbench-web
```
- 安装依赖
diff --git a/submarine-workbench/submarine-web/babel.config.js b/submarine-workbench/workbench-web/babel.config.js
similarity index 100%
rename from submarine-workbench/submarine-web/babel.config.js
rename to submarine-workbench/workbench-web/babel.config.js
diff --git a/submarine-workbench/submarine-web/docs/add-page-loading-animate.md b/submarine-workbench/workbench-web/docs/add-page-loading-animate.md
similarity index 100%
rename from submarine-workbench/submarine-web/docs/add-page-loading-animate.md
rename to submarine-workbench/workbench-web/docs/add-page-loading-animate.md
diff --git a/submarine-workbench/submarine-web/docs/load-on-demand.md b/submarine-workbench/workbench-web/docs/load-on-demand.md
similarity index 100%
rename from submarine-workbench/submarine-web/docs/load-on-demand.md
rename to submarine-workbench/workbench-web/docs/load-on-demand.md
diff --git a/submarine-workbench/submarine-web/docs/multi-tabs.md b/submarine-workbench/workbench-web/docs/multi-tabs.md
similarity index 100%
rename from submarine-workbench/submarine-web/docs/multi-tabs.md
rename to submarine-workbench/workbench-web/docs/multi-tabs.md
diff --git a/submarine-workbench/submarine-web/docs/webpack-bundle-analyzer.md b/submarine-workbench/workbench-web/docs/webpack-bundle-analyzer.md
similarity index 100%
rename from submarine-workbench/submarine-web/docs/webpack-bundle-analyzer.md
rename to submarine-workbench/workbench-web/docs/webpack-bundle-analyzer.md
diff --git a/submarine-workbench/submarine-web/jest.config.js b/submarine-workbench/workbench-web/jest.config.js
similarity index 100%
rename from submarine-workbench/submarine-web/jest.config.js
rename to submarine-workbench/workbench-web/jest.config.js
diff --git a/submarine-workbench/submarine-web/jsconfig.json b/submarine-workbench/workbench-web/jsconfig.json
similarity index 100%
rename from submarine-workbench/submarine-web/jsconfig.json
rename to submarine-workbench/workbench-web/jsconfig.json
diff --git a/submarine-workbench/submarine-web/package.json b/submarine-workbench/workbench-web/package.json
similarity index 100%
rename from submarine-workbench/submarine-web/package.json
rename to submarine-workbench/workbench-web/package.json
diff --git a/submarine-workbench/submarine-web/pom.xml b/submarine-workbench/workbench-web/pom.xml
similarity index 99%
rename from submarine-workbench/submarine-web/pom.xml
rename to submarine-workbench/workbench-web/pom.xml
index 9133dae..6919c20 100644
--- a/submarine-workbench/submarine-web/pom.xml
+++ b/submarine-workbench/workbench-web/pom.xml
@@ -28,7 +28,7 @@
</parent>
<groupId>org.apache.submarine</groupId>
- <artifactId>submarine-web</artifactId>
+ <artifactId>workbench-web</artifactId>
<packaging>war</packaging>
<version>0.3.0-SNAPSHOT</version>
<name>Submarine: Workbench Web</name>
diff --git a/submarine-workbench/submarine-web/public/assets/pytorch_logo.png b/submarine-workbench/workbench-web/public/assets/pytorch_logo.png
similarity index 100%
rename from submarine-workbench/submarine-web/public/assets/pytorch_logo.png
rename to submarine-workbench/workbench-web/public/assets/pytorch_logo.png
diff --git a/submarine-workbench/submarine-web/public/assets/tensorflow_logo.png b/submarine-workbench/workbench-web/public/assets/tensorflow_logo.png
similarity index 100%
rename from submarine-workbench/submarine-web/public/assets/tensorflow_logo.png
rename to submarine-workbench/workbench-web/public/assets/tensorflow_logo.png
diff --git a/submarine-workbench/submarine-web/public/avatar2.jpg b/submarine-workbench/workbench-web/public/avatar2.jpg
similarity index 100%
rename from submarine-workbench/submarine-web/public/avatar2.jpg
rename to submarine-workbench/workbench-web/public/avatar2.jpg
diff --git a/submarine-workbench/submarine-web/public/color.less b/submarine-workbench/workbench-web/public/color.less
similarity index 100%
rename from submarine-workbench/submarine-web/public/color.less
rename to submarine-workbench/workbench-web/public/color.less
diff --git a/submarine-workbench/submarine-web/public/index.html b/submarine-workbench/workbench-web/public/index.html
similarity index 100%
rename from submarine-workbench/submarine-web/public/index.html
rename to submarine-workbench/workbench-web/public/index.html
diff --git a/submarine-workbench/submarine-web/public/loading/loading.css b/submarine-workbench/workbench-web/public/loading/loading.css
similarity index 100%
rename from submarine-workbench/submarine-web/public/loading/loading.css
rename to submarine-workbench/workbench-web/public/loading/loading.css
diff --git a/submarine-workbench/submarine-web/public/loading/loading.html b/submarine-workbench/workbench-web/public/loading/loading.html
similarity index 100%
rename from submarine-workbench/submarine-web/public/loading/loading.html
rename to submarine-workbench/workbench-web/public/loading/loading.html
diff --git a/submarine-workbench/submarine-web/public/loading/option2/html_code_segment.html b/submarine-workbench/workbench-web/public/loading/option2/html_code_segment.html
similarity index 100%
rename from submarine-workbench/submarine-web/public/loading/option2/html_code_segment.html
rename to submarine-workbench/workbench-web/public/loading/option2/html_code_segment.html
diff --git a/submarine-workbench/submarine-web/public/loading/option2/loading.css b/submarine-workbench/workbench-web/public/loading/option2/loading.css
similarity index 100%
rename from submarine-workbench/submarine-web/public/loading/option2/loading.css
rename to submarine-workbench/workbench-web/public/loading/option2/loading.css
diff --git a/submarine-workbench/submarine-web/public/loading/option2/loading.svg b/submarine-workbench/workbench-web/public/loading/option2/loading.svg
similarity index 100%
rename from submarine-workbench/submarine-web/public/loading/option2/loading.svg
rename to submarine-workbench/workbench-web/public/loading/option2/loading.svg
diff --git a/submarine-workbench/submarine-web/public/logo.png b/submarine-workbench/workbench-web/public/logo.png
similarity index 100%
rename from submarine-workbench/submarine-web/public/logo.png
rename to submarine-workbench/workbench-web/public/logo.png
diff --git a/submarine-workbench/submarine-web/src/App.vue b/submarine-workbench/workbench-web/src/App.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/App.vue
rename to submarine-workbench/workbench-web/src/App.vue
diff --git a/submarine-workbench/submarine-web/src/WEB-INF/web.xml b/submarine-workbench/workbench-web/src/WEB-INF/web.xml
similarity index 97%
rename from submarine-workbench/submarine-web/src/WEB-INF/web.xml
rename to submarine-workbench/workbench-web/src/WEB-INF/web.xml
index 9cd3168..592cb76 100644
--- a/submarine-workbench/submarine-web/src/WEB-INF/web.xml
+++ b/submarine-workbench/workbench-web/src/WEB-INF/web.xml
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
version="3.0">
- <display-name>submarine-web</display-name>
+ <display-name>workbench-web</display-name>
<servlet>
<servlet-name>default</servlet-name>
<servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
diff --git a/submarine-workbench/submarine-web/src/api/index.js b/submarine-workbench/workbench-web/src/api/index.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/api/index.js
rename to submarine-workbench/workbench-web/src/api/index.js
diff --git a/submarine-workbench/submarine-web/src/api/login.js b/submarine-workbench/workbench-web/src/api/login.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/api/login.js
rename to submarine-workbench/workbench-web/src/api/login.js
diff --git a/submarine-workbench/submarine-web/src/api/manage.js b/submarine-workbench/workbench-web/src/api/manage.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/api/manage.js
rename to submarine-workbench/workbench-web/src/api/manage.js
diff --git a/submarine-workbench/submarine-web/src/api/system.js b/submarine-workbench/workbench-web/src/api/system.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/api/system.js
rename to submarine-workbench/workbench-web/src/api/system.js
diff --git a/submarine-workbench/submarine-web/src/api/workbench.js b/submarine-workbench/workbench-web/src/api/workbench.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/api/workbench.js
rename to submarine-workbench/workbench-web/src/api/workbench.js
diff --git a/submarine-workbench/submarine-web/src/assets/background.svg b/submarine-workbench/workbench-web/src/assets/background.svg
similarity index 100%
rename from submarine-workbench/submarine-web/src/assets/background.svg
rename to submarine-workbench/workbench-web/src/assets/background.svg
diff --git a/submarine-workbench/submarine-web/src/assets/icons/bx-analyse.svg b/submarine-workbench/workbench-web/src/assets/icons/bx-analyse.svg
similarity index 100%
rename from submarine-workbench/submarine-web/src/assets/icons/bx-analyse.svg
rename to submarine-workbench/workbench-web/src/assets/icons/bx-analyse.svg
diff --git a/submarine-workbench/submarine-web/src/assets/logo-128.png b/submarine-workbench/workbench-web/src/assets/logo-128.png
similarity index 100%
rename from submarine-workbench/submarine-web/src/assets/logo-128.png
rename to submarine-workbench/workbench-web/src/assets/logo-128.png
diff --git a/submarine-workbench/submarine-web/src/assets/logo.png b/submarine-workbench/workbench-web/src/assets/logo.png
similarity index 100%
rename from submarine-workbench/submarine-web/src/assets/logo.png
rename to submarine-workbench/workbench-web/src/assets/logo.png
diff --git a/submarine-workbench/submarine-web/src/assets/logo.svg b/submarine-workbench/workbench-web/src/assets/logo.svg
similarity index 100%
rename from submarine-workbench/submarine-web/src/assets/logo.svg
rename to submarine-workbench/workbench-web/src/assets/logo.svg
diff --git a/submarine-workbench/submarine-web/src/assets/submarine-logo.svg b/submarine-workbench/workbench-web/src/assets/submarine-logo.svg
similarity index 100%
rename from submarine-workbench/submarine-web/src/assets/submarine-logo.svg
rename to submarine-workbench/workbench-web/src/assets/submarine-logo.svg
diff --git a/submarine-workbench/submarine-web/src/components/ArticleListContent/ArticleListContent.vue b/submarine-workbench/workbench-web/src/components/ArticleListContent/ArticleListContent.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/ArticleListContent/ArticleListContent.vue
rename to submarine-workbench/workbench-web/src/components/ArticleListContent/ArticleListContent.vue
diff --git a/submarine-workbench/submarine-web/src/components/ArticleListContent/index.js b/submarine-workbench/workbench-web/src/components/ArticleListContent/index.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/ArticleListContent/index.js
rename to submarine-workbench/workbench-web/src/components/ArticleListContent/index.js
diff --git a/submarine-workbench/submarine-web/src/components/AvatarList/Item.vue b/submarine-workbench/workbench-web/src/components/AvatarList/Item.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/AvatarList/Item.vue
rename to submarine-workbench/workbench-web/src/components/AvatarList/Item.vue
diff --git a/submarine-workbench/submarine-web/src/components/AvatarList/List.vue b/submarine-workbench/workbench-web/src/components/AvatarList/List.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/AvatarList/List.vue
rename to submarine-workbench/workbench-web/src/components/AvatarList/List.vue
diff --git a/submarine-workbench/submarine-web/src/components/AvatarList/index.js b/submarine-workbench/workbench-web/src/components/AvatarList/index.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/AvatarList/index.js
rename to submarine-workbench/workbench-web/src/components/AvatarList/index.js
diff --git a/submarine-workbench/submarine-web/src/components/AvatarList/index.less b/submarine-workbench/workbench-web/src/components/AvatarList/index.less
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/AvatarList/index.less
rename to submarine-workbench/workbench-web/src/components/AvatarList/index.less
diff --git a/submarine-workbench/submarine-web/src/components/AvatarList/index.md b/submarine-workbench/workbench-web/src/components/AvatarList/index.md
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/AvatarList/index.md
rename to submarine-workbench/workbench-web/src/components/AvatarList/index.md
diff --git a/submarine-workbench/submarine-web/src/components/Charts/Bar.vue b/submarine-workbench/workbench-web/src/components/Charts/Bar.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Charts/Bar.vue
rename to submarine-workbench/workbench-web/src/components/Charts/Bar.vue
diff --git a/submarine-workbench/submarine-web/src/components/Charts/ChartCard.vue b/submarine-workbench/workbench-web/src/components/Charts/ChartCard.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Charts/ChartCard.vue
rename to submarine-workbench/workbench-web/src/components/Charts/ChartCard.vue
diff --git a/submarine-workbench/submarine-web/src/components/Charts/Liquid.vue b/submarine-workbench/workbench-web/src/components/Charts/Liquid.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Charts/Liquid.vue
rename to submarine-workbench/workbench-web/src/components/Charts/Liquid.vue
diff --git a/submarine-workbench/submarine-web/src/components/Charts/MiniArea.vue b/submarine-workbench/workbench-web/src/components/Charts/MiniArea.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Charts/MiniArea.vue
rename to submarine-workbench/workbench-web/src/components/Charts/MiniArea.vue
diff --git a/submarine-workbench/submarine-web/src/components/Charts/MiniBar.vue b/submarine-workbench/workbench-web/src/components/Charts/MiniBar.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Charts/MiniBar.vue
rename to submarine-workbench/workbench-web/src/components/Charts/MiniBar.vue
diff --git a/submarine-workbench/submarine-web/src/components/Charts/MiniProgress.vue b/submarine-workbench/workbench-web/src/components/Charts/MiniProgress.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Charts/MiniProgress.vue
rename to submarine-workbench/workbench-web/src/components/Charts/MiniProgress.vue
diff --git a/submarine-workbench/submarine-web/src/components/Charts/MiniSmoothArea.vue b/submarine-workbench/workbench-web/src/components/Charts/MiniSmoothArea.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Charts/MiniSmoothArea.vue
rename to submarine-workbench/workbench-web/src/components/Charts/MiniSmoothArea.vue
diff --git a/submarine-workbench/submarine-web/src/components/Charts/Radar.vue b/submarine-workbench/workbench-web/src/components/Charts/Radar.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Charts/Radar.vue
rename to submarine-workbench/workbench-web/src/components/Charts/Radar.vue
diff --git a/submarine-workbench/submarine-web/src/components/Charts/RankList.vue b/submarine-workbench/workbench-web/src/components/Charts/RankList.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Charts/RankList.vue
rename to submarine-workbench/workbench-web/src/components/Charts/RankList.vue
diff --git a/submarine-workbench/submarine-web/src/components/Charts/TagCloud.vue b/submarine-workbench/workbench-web/src/components/Charts/TagCloud.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Charts/TagCloud.vue
rename to submarine-workbench/workbench-web/src/components/Charts/TagCloud.vue
diff --git a/submarine-workbench/submarine-web/src/components/Charts/TransferBar.vue b/submarine-workbench/workbench-web/src/components/Charts/TransferBar.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Charts/TransferBar.vue
rename to submarine-workbench/workbench-web/src/components/Charts/TransferBar.vue
diff --git a/submarine-workbench/submarine-web/src/components/Charts/Trend.vue b/submarine-workbench/workbench-web/src/components/Charts/Trend.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Charts/Trend.vue
rename to submarine-workbench/workbench-web/src/components/Charts/Trend.vue
diff --git a/submarine-workbench/submarine-web/src/components/Charts/chart.less b/submarine-workbench/workbench-web/src/components/Charts/chart.less
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Charts/chart.less
rename to submarine-workbench/workbench-web/src/components/Charts/chart.less
diff --git a/submarine-workbench/submarine-web/src/components/Charts/smooth.area.less b/submarine-workbench/workbench-web/src/components/Charts/smooth.area.less
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Charts/smooth.area.less
rename to submarine-workbench/workbench-web/src/components/Charts/smooth.area.less
diff --git a/submarine-workbench/submarine-web/src/components/CountDown/CountDown.vue b/submarine-workbench/workbench-web/src/components/CountDown/CountDown.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/CountDown/CountDown.vue
rename to submarine-workbench/workbench-web/src/components/CountDown/CountDown.vue
diff --git a/submarine-workbench/submarine-web/src/components/CountDown/index.js b/submarine-workbench/workbench-web/src/components/CountDown/index.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/CountDown/index.js
rename to submarine-workbench/workbench-web/src/components/CountDown/index.js
diff --git a/submarine-workbench/submarine-web/src/components/CountDown/index.md b/submarine-workbench/workbench-web/src/components/CountDown/index.md
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/CountDown/index.md
rename to submarine-workbench/workbench-web/src/components/CountDown/index.md
diff --git a/submarine-workbench/submarine-web/src/components/DescriptionList/DescriptionList.vue b/submarine-workbench/workbench-web/src/components/DescriptionList/DescriptionList.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/DescriptionList/DescriptionList.vue
rename to submarine-workbench/workbench-web/src/components/DescriptionList/DescriptionList.vue
diff --git a/submarine-workbench/submarine-web/src/components/DescriptionList/index.js b/submarine-workbench/workbench-web/src/components/DescriptionList/index.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/DescriptionList/index.js
rename to submarine-workbench/workbench-web/src/components/DescriptionList/index.js
diff --git a/submarine-workbench/submarine-web/src/components/Dict/DictSelectTag.vue b/submarine-workbench/workbench-web/src/components/Dict/DictSelectTag.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Dict/DictSelectTag.vue
rename to submarine-workbench/workbench-web/src/components/Dict/DictSelectTag.vue
diff --git a/submarine-workbench/submarine-web/src/components/Dict/README.md b/submarine-workbench/workbench-web/src/components/Dict/README.md
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Dict/README.md
rename to submarine-workbench/workbench-web/src/components/Dict/README.md
diff --git a/submarine-workbench/submarine-web/src/components/Dict/SearchSelect.vue b/submarine-workbench/workbench-web/src/components/Dict/SearchSelect.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Dict/SearchSelect.vue
rename to submarine-workbench/workbench-web/src/components/Dict/SearchSelect.vue
diff --git a/submarine-workbench/submarine-web/src/components/Dict/index.js b/submarine-workbench/workbench-web/src/components/Dict/index.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Dict/index.js
rename to submarine-workbench/workbench-web/src/components/Dict/index.js
diff --git a/submarine-workbench/submarine-web/src/components/Editor/QuillEditor.vue b/submarine-workbench/workbench-web/src/components/Editor/QuillEditor.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Editor/QuillEditor.vue
rename to submarine-workbench/workbench-web/src/components/Editor/QuillEditor.vue
diff --git a/submarine-workbench/submarine-web/src/components/Editor/WangEditor.vue b/submarine-workbench/workbench-web/src/components/Editor/WangEditor.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Editor/WangEditor.vue
rename to submarine-workbench/workbench-web/src/components/Editor/WangEditor.vue
diff --git a/submarine-workbench/submarine-web/src/components/Ellipsis/Ellipsis.vue b/submarine-workbench/workbench-web/src/components/Ellipsis/Ellipsis.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Ellipsis/Ellipsis.vue
rename to submarine-workbench/workbench-web/src/components/Ellipsis/Ellipsis.vue
diff --git a/submarine-workbench/submarine-web/src/components/Ellipsis/index.js b/submarine-workbench/workbench-web/src/components/Ellipsis/index.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Ellipsis/index.js
rename to submarine-workbench/workbench-web/src/components/Ellipsis/index.js
diff --git a/submarine-workbench/submarine-web/src/components/Ellipsis/index.md b/submarine-workbench/workbench-web/src/components/Ellipsis/index.md
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Ellipsis/index.md
rename to submarine-workbench/workbench-web/src/components/Ellipsis/index.md
diff --git a/submarine-workbench/submarine-web/src/components/Exception/ExceptionPage.vue b/submarine-workbench/workbench-web/src/components/Exception/ExceptionPage.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Exception/ExceptionPage.vue
rename to submarine-workbench/workbench-web/src/components/Exception/ExceptionPage.vue
diff --git a/submarine-workbench/submarine-web/src/components/Exception/index.js b/submarine-workbench/workbench-web/src/components/Exception/index.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Exception/index.js
rename to submarine-workbench/workbench-web/src/components/Exception/index.js
diff --git a/submarine-workbench/submarine-web/src/components/Exception/type.js b/submarine-workbench/workbench-web/src/components/Exception/type.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Exception/type.js
rename to submarine-workbench/workbench-web/src/components/Exception/type.js
diff --git a/submarine-workbench/submarine-web/src/components/FooterToolbar/FooterToolBar.vue b/submarine-workbench/workbench-web/src/components/FooterToolbar/FooterToolBar.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/FooterToolbar/FooterToolBar.vue
rename to submarine-workbench/workbench-web/src/components/FooterToolbar/FooterToolBar.vue
diff --git a/submarine-workbench/submarine-web/src/components/FooterToolbar/index.js b/submarine-workbench/workbench-web/src/components/FooterToolbar/index.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/FooterToolbar/index.js
rename to submarine-workbench/workbench-web/src/components/FooterToolbar/index.js
diff --git a/submarine-workbench/submarine-web/src/components/FooterToolbar/index.less b/submarine-workbench/workbench-web/src/components/FooterToolbar/index.less
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/FooterToolbar/index.less
rename to submarine-workbench/workbench-web/src/components/FooterToolbar/index.less
diff --git a/submarine-workbench/submarine-web/src/components/FooterToolbar/index.md b/submarine-workbench/workbench-web/src/components/FooterToolbar/index.md
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/FooterToolbar/index.md
rename to submarine-workbench/workbench-web/src/components/FooterToolbar/index.md
diff --git a/submarine-workbench/submarine-web/src/components/GlobalFooter/GlobalFooter.vue b/submarine-workbench/workbench-web/src/components/GlobalFooter/GlobalFooter.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/GlobalFooter/GlobalFooter.vue
rename to submarine-workbench/workbench-web/src/components/GlobalFooter/GlobalFooter.vue
diff --git a/submarine-workbench/submarine-web/src/components/GlobalFooter/index.js b/submarine-workbench/workbench-web/src/components/GlobalFooter/index.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/GlobalFooter/index.js
rename to submarine-workbench/workbench-web/src/components/GlobalFooter/index.js
diff --git a/submarine-workbench/submarine-web/src/components/GlobalHeader/GlobalHeader.vue b/submarine-workbench/workbench-web/src/components/GlobalHeader/GlobalHeader.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/GlobalHeader/GlobalHeader.vue
rename to submarine-workbench/workbench-web/src/components/GlobalHeader/GlobalHeader.vue
diff --git a/submarine-workbench/submarine-web/src/components/GlobalHeader/index.js b/submarine-workbench/workbench-web/src/components/GlobalHeader/index.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/GlobalHeader/index.js
rename to submarine-workbench/workbench-web/src/components/GlobalHeader/index.js
diff --git a/submarine-workbench/submarine-web/src/components/IconSelector/IconSelector.vue b/submarine-workbench/workbench-web/src/components/IconSelector/IconSelector.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/IconSelector/IconSelector.vue
rename to submarine-workbench/workbench-web/src/components/IconSelector/IconSelector.vue
diff --git a/submarine-workbench/submarine-web/src/components/IconSelector/README.md b/submarine-workbench/workbench-web/src/components/IconSelector/README.md
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/IconSelector/README.md
rename to submarine-workbench/workbench-web/src/components/IconSelector/README.md
diff --git a/submarine-workbench/submarine-web/src/components/IconSelector/icons.js b/submarine-workbench/workbench-web/src/components/IconSelector/icons.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/IconSelector/icons.js
rename to submarine-workbench/workbench-web/src/components/IconSelector/icons.js
diff --git a/submarine-workbench/submarine-web/src/components/IconSelector/index.js b/submarine-workbench/workbench-web/src/components/IconSelector/index.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/IconSelector/index.js
rename to submarine-workbench/workbench-web/src/components/IconSelector/index.js
diff --git a/submarine-workbench/submarine-web/src/components/Menu/SideMenu.vue b/submarine-workbench/workbench-web/src/components/Menu/SideMenu.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Menu/SideMenu.vue
rename to submarine-workbench/workbench-web/src/components/Menu/SideMenu.vue
diff --git a/submarine-workbench/submarine-web/src/components/Menu/index.js b/submarine-workbench/workbench-web/src/components/Menu/index.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Menu/index.js
rename to submarine-workbench/workbench-web/src/components/Menu/index.js
diff --git a/submarine-workbench/submarine-web/src/components/Menu/menu.js b/submarine-workbench/workbench-web/src/components/Menu/menu.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Menu/menu.js
rename to submarine-workbench/workbench-web/src/components/Menu/menu.js
diff --git a/submarine-workbench/submarine-web/src/components/Menu/menu.render.js b/submarine-workbench/workbench-web/src/components/Menu/menu.render.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Menu/menu.render.js
rename to submarine-workbench/workbench-web/src/components/Menu/menu.render.js
diff --git a/submarine-workbench/submarine-web/src/components/MultiTab/MultiTab.vue b/submarine-workbench/workbench-web/src/components/MultiTab/MultiTab.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/MultiTab/MultiTab.vue
rename to submarine-workbench/workbench-web/src/components/MultiTab/MultiTab.vue
diff --git a/submarine-workbench/submarine-web/src/components/MultiTab/index.js b/submarine-workbench/workbench-web/src/components/MultiTab/index.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/MultiTab/index.js
rename to submarine-workbench/workbench-web/src/components/MultiTab/index.js
diff --git a/submarine-workbench/submarine-web/src/components/MultiTab/index.less b/submarine-workbench/workbench-web/src/components/MultiTab/index.less
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/MultiTab/index.less
rename to submarine-workbench/workbench-web/src/components/MultiTab/index.less
diff --git a/submarine-workbench/submarine-web/src/components/NoticeIcon/NoticeIcon.vue b/submarine-workbench/workbench-web/src/components/NoticeIcon/NoticeIcon.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/NoticeIcon/NoticeIcon.vue
rename to submarine-workbench/workbench-web/src/components/NoticeIcon/NoticeIcon.vue
diff --git a/submarine-workbench/submarine-web/src/components/NoticeIcon/index.js b/submarine-workbench/workbench-web/src/components/NoticeIcon/index.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/NoticeIcon/index.js
rename to submarine-workbench/workbench-web/src/components/NoticeIcon/index.js
diff --git a/submarine-workbench/submarine-web/src/components/NumberInfo/NumberInfo.vue b/submarine-workbench/workbench-web/src/components/NumberInfo/NumberInfo.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/NumberInfo/NumberInfo.vue
rename to submarine-workbench/workbench-web/src/components/NumberInfo/NumberInfo.vue
diff --git a/submarine-workbench/submarine-web/src/components/NumberInfo/index.js b/submarine-workbench/workbench-web/src/components/NumberInfo/index.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/NumberInfo/index.js
rename to submarine-workbench/workbench-web/src/components/NumberInfo/index.js
diff --git a/submarine-workbench/submarine-web/src/components/NumberInfo/index.less b/submarine-workbench/workbench-web/src/components/NumberInfo/index.less
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/NumberInfo/index.less
rename to submarine-workbench/workbench-web/src/components/NumberInfo/index.less
diff --git a/submarine-workbench/submarine-web/src/components/NumberInfo/index.md b/submarine-workbench/workbench-web/src/components/NumberInfo/index.md
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/NumberInfo/index.md
rename to submarine-workbench/workbench-web/src/components/NumberInfo/index.md
diff --git a/submarine-workbench/submarine-web/src/components/PageHeader/PageHeader.vue b/submarine-workbench/workbench-web/src/components/PageHeader/PageHeader.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/PageHeader/PageHeader.vue
rename to submarine-workbench/workbench-web/src/components/PageHeader/PageHeader.vue
diff --git a/submarine-workbench/submarine-web/src/components/PageHeader/index.js b/submarine-workbench/workbench-web/src/components/PageHeader/index.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/PageHeader/index.js
rename to submarine-workbench/workbench-web/src/components/PageHeader/index.js
diff --git a/submarine-workbench/submarine-web/src/components/PageLoading/index.jsx b/submarine-workbench/workbench-web/src/components/PageLoading/index.jsx
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/PageLoading/index.jsx
rename to submarine-workbench/workbench-web/src/components/PageLoading/index.jsx
diff --git a/submarine-workbench/submarine-web/src/components/Result/Result.vue b/submarine-workbench/workbench-web/src/components/Result/Result.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Result/Result.vue
rename to submarine-workbench/workbench-web/src/components/Result/Result.vue
diff --git a/submarine-workbench/submarine-web/src/components/Result/index.js b/submarine-workbench/workbench-web/src/components/Result/index.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Result/index.js
rename to submarine-workbench/workbench-web/src/components/Result/index.js
diff --git a/submarine-workbench/submarine-web/src/components/SettingDrawer/SettingDrawer.vue b/submarine-workbench/workbench-web/src/components/SettingDrawer/SettingDrawer.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/SettingDrawer/SettingDrawer.vue
rename to submarine-workbench/workbench-web/src/components/SettingDrawer/SettingDrawer.vue
diff --git a/submarine-workbench/submarine-web/src/components/SettingDrawer/SettingItem.vue b/submarine-workbench/workbench-web/src/components/SettingDrawer/SettingItem.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/SettingDrawer/SettingItem.vue
rename to submarine-workbench/workbench-web/src/components/SettingDrawer/SettingItem.vue
diff --git a/submarine-workbench/submarine-web/src/components/SettingDrawer/index.js b/submarine-workbench/workbench-web/src/components/SettingDrawer/index.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/SettingDrawer/index.js
rename to submarine-workbench/workbench-web/src/components/SettingDrawer/index.js
diff --git a/submarine-workbench/submarine-web/src/components/SettingDrawer/settingConfig.js b/submarine-workbench/workbench-web/src/components/SettingDrawer/settingConfig.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/SettingDrawer/settingConfig.js
rename to submarine-workbench/workbench-web/src/components/SettingDrawer/settingConfig.js
diff --git a/submarine-workbench/submarine-web/src/components/SettingDrawer/themeColor.js b/submarine-workbench/workbench-web/src/components/SettingDrawer/themeColor.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/SettingDrawer/themeColor.js
rename to submarine-workbench/workbench-web/src/components/SettingDrawer/themeColor.js
diff --git a/submarine-workbench/submarine-web/src/components/StandardFormRow/StandardFormRow.vue b/submarine-workbench/workbench-web/src/components/StandardFormRow/StandardFormRow.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/StandardFormRow/StandardFormRow.vue
rename to submarine-workbench/workbench-web/src/components/StandardFormRow/StandardFormRow.vue
diff --git a/submarine-workbench/submarine-web/src/components/StandardFormRow/index.js b/submarine-workbench/workbench-web/src/components/StandardFormRow/index.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/StandardFormRow/index.js
rename to submarine-workbench/workbench-web/src/components/StandardFormRow/index.js
diff --git a/submarine-workbench/submarine-web/src/components/Table/README.md b/submarine-workbench/workbench-web/src/components/Table/README.md
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Table/README.md
rename to submarine-workbench/workbench-web/src/components/Table/README.md
diff --git a/submarine-workbench/submarine-web/src/components/Table/index.js b/submarine-workbench/workbench-web/src/components/Table/index.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Table/index.js
rename to submarine-workbench/workbench-web/src/components/Table/index.js
diff --git a/submarine-workbench/submarine-web/src/components/TagSelect/TagSelectOption.jsx b/submarine-workbench/workbench-web/src/components/TagSelect/TagSelectOption.jsx
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/TagSelect/TagSelectOption.jsx
rename to submarine-workbench/workbench-web/src/components/TagSelect/TagSelectOption.jsx
diff --git a/submarine-workbench/submarine-web/src/components/TagSelect/index.jsx b/submarine-workbench/workbench-web/src/components/TagSelect/index.jsx
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/TagSelect/index.jsx
rename to submarine-workbench/workbench-web/src/components/TagSelect/index.jsx
diff --git a/submarine-workbench/submarine-web/src/components/Tree/Tree.jsx b/submarine-workbench/workbench-web/src/components/Tree/Tree.jsx
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Tree/Tree.jsx
rename to submarine-workbench/workbench-web/src/components/Tree/Tree.jsx
diff --git a/submarine-workbench/submarine-web/src/components/Trend/Trend.vue b/submarine-workbench/workbench-web/src/components/Trend/Trend.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Trend/Trend.vue
rename to submarine-workbench/workbench-web/src/components/Trend/Trend.vue
diff --git a/submarine-workbench/submarine-web/src/components/Trend/index.js b/submarine-workbench/workbench-web/src/components/Trend/index.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Trend/index.js
rename to submarine-workbench/workbench-web/src/components/Trend/index.js
diff --git a/submarine-workbench/submarine-web/src/components/Trend/index.less b/submarine-workbench/workbench-web/src/components/Trend/index.less
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Trend/index.less
rename to submarine-workbench/workbench-web/src/components/Trend/index.less
diff --git a/submarine-workbench/submarine-web/src/components/Trend/index.md b/submarine-workbench/workbench-web/src/components/Trend/index.md
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/Trend/index.md
rename to submarine-workbench/workbench-web/src/components/Trend/index.md
diff --git a/submarine-workbench/submarine-web/src/components/_util/util.js b/submarine-workbench/workbench-web/src/components/_util/util.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/_util/util.js
rename to submarine-workbench/workbench-web/src/components/_util/util.js
diff --git a/submarine-workbench/submarine-web/src/components/global.less b/submarine-workbench/workbench-web/src/components/global.less
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/global.less
rename to submarine-workbench/workbench-web/src/components/global.less
diff --git a/submarine-workbench/submarine-web/src/components/index.js b/submarine-workbench/workbench-web/src/components/index.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/index.js
rename to submarine-workbench/workbench-web/src/components/index.js
diff --git a/submarine-workbench/submarine-web/src/components/index.less b/submarine-workbench/workbench-web/src/components/index.less
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/index.less
rename to submarine-workbench/workbench-web/src/components/index.less
diff --git a/submarine-workbench/submarine-web/src/components/tools/Breadcrumb.vue b/submarine-workbench/workbench-web/src/components/tools/Breadcrumb.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/tools/Breadcrumb.vue
rename to submarine-workbench/workbench-web/src/components/tools/Breadcrumb.vue
diff --git a/submarine-workbench/submarine-web/src/components/tools/DetailList.vue b/submarine-workbench/workbench-web/src/components/tools/DetailList.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/tools/DetailList.vue
rename to submarine-workbench/workbench-web/src/components/tools/DetailList.vue
diff --git a/submarine-workbench/submarine-web/src/components/tools/HeadInfo.vue b/submarine-workbench/workbench-web/src/components/tools/HeadInfo.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/tools/HeadInfo.vue
rename to submarine-workbench/workbench-web/src/components/tools/HeadInfo.vue
diff --git a/submarine-workbench/submarine-web/src/components/tools/Logo.vue b/submarine-workbench/workbench-web/src/components/tools/Logo.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/tools/Logo.vue
rename to submarine-workbench/workbench-web/src/components/tools/Logo.vue
diff --git a/submarine-workbench/submarine-web/src/components/tools/TwoStepCaptcha.vue b/submarine-workbench/workbench-web/src/components/tools/TwoStepCaptcha.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/tools/TwoStepCaptcha.vue
rename to submarine-workbench/workbench-web/src/components/tools/TwoStepCaptcha.vue
diff --git a/submarine-workbench/submarine-web/src/components/tools/UserMenu.vue b/submarine-workbench/workbench-web/src/components/tools/UserMenu.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/tools/UserMenu.vue
rename to submarine-workbench/workbench-web/src/components/tools/UserMenu.vue
diff --git a/submarine-workbench/submarine-web/src/components/tools/index.js b/submarine-workbench/workbench-web/src/components/tools/index.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/components/tools/index.js
rename to submarine-workbench/workbench-web/src/components/tools/index.js
diff --git a/submarine-workbench/submarine-web/src/config/defaultSettings.js b/submarine-workbench/workbench-web/src/config/defaultSettings.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/config/defaultSettings.js
rename to submarine-workbench/workbench-web/src/config/defaultSettings.js
diff --git a/submarine-workbench/submarine-web/src/config/router.config.js b/submarine-workbench/workbench-web/src/config/router.config.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/config/router.config.js
rename to submarine-workbench/workbench-web/src/config/router.config.js
diff --git a/submarine-workbench/submarine-web/src/core/bootstrap.js b/submarine-workbench/workbench-web/src/core/bootstrap.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/core/bootstrap.js
rename to submarine-workbench/workbench-web/src/core/bootstrap.js
diff --git a/submarine-workbench/submarine-web/src/core/directives/action.js b/submarine-workbench/workbench-web/src/core/directives/action.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/core/directives/action.js
rename to submarine-workbench/workbench-web/src/core/directives/action.js
diff --git a/submarine-workbench/submarine-web/src/core/icons.js b/submarine-workbench/workbench-web/src/core/icons.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/core/icons.js
rename to submarine-workbench/workbench-web/src/core/icons.js
diff --git a/submarine-workbench/submarine-web/src/core/lazy_lib/components_use.js b/submarine-workbench/workbench-web/src/core/lazy_lib/components_use.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/core/lazy_lib/components_use.js
rename to submarine-workbench/workbench-web/src/core/lazy_lib/components_use.js
diff --git a/submarine-workbench/submarine-web/src/core/lazy_use.js b/submarine-workbench/workbench-web/src/core/lazy_use.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/core/lazy_use.js
rename to submarine-workbench/workbench-web/src/core/lazy_use.js
diff --git a/submarine-workbench/submarine-web/src/core/use.js b/submarine-workbench/workbench-web/src/core/use.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/core/use.js
rename to submarine-workbench/workbench-web/src/core/use.js
diff --git a/submarine-workbench/submarine-web/src/layouts/BasicLayout.vue b/submarine-workbench/workbench-web/src/layouts/BasicLayout.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/layouts/BasicLayout.vue
rename to submarine-workbench/workbench-web/src/layouts/BasicLayout.vue
diff --git a/submarine-workbench/submarine-web/src/layouts/BlankLayout.vue b/submarine-workbench/workbench-web/src/layouts/BlankLayout.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/layouts/BlankLayout.vue
rename to submarine-workbench/workbench-web/src/layouts/BlankLayout.vue
diff --git a/submarine-workbench/submarine-web/src/layouts/PageView.vue b/submarine-workbench/workbench-web/src/layouts/PageView.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/layouts/PageView.vue
rename to submarine-workbench/workbench-web/src/layouts/PageView.vue
diff --git a/submarine-workbench/submarine-web/src/layouts/RouteView.vue b/submarine-workbench/workbench-web/src/layouts/RouteView.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/layouts/RouteView.vue
rename to submarine-workbench/workbench-web/src/layouts/RouteView.vue
diff --git a/submarine-workbench/submarine-web/src/layouts/UserLayout.vue b/submarine-workbench/workbench-web/src/layouts/UserLayout.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/layouts/UserLayout.vue
rename to submarine-workbench/workbench-web/src/layouts/UserLayout.vue
diff --git a/submarine-workbench/submarine-web/src/layouts/index.js b/submarine-workbench/workbench-web/src/layouts/index.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/layouts/index.js
rename to submarine-workbench/workbench-web/src/layouts/index.js
diff --git a/submarine-workbench/submarine-web/src/main.js b/submarine-workbench/workbench-web/src/main.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/main.js
rename to submarine-workbench/workbench-web/src/main.js
diff --git a/submarine-workbench/submarine-web/src/mixins/ListMixin.js b/submarine-workbench/workbench-web/src/mixins/ListMixin.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/mixins/ListMixin.js
rename to submarine-workbench/workbench-web/src/mixins/ListMixin.js
diff --git a/submarine-workbench/submarine-web/src/mock/index.js b/submarine-workbench/workbench-web/src/mock/index.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/mock/index.js
rename to submarine-workbench/workbench-web/src/mock/index.js
diff --git a/submarine-workbench/submarine-web/src/mock/services/article.js b/submarine-workbench/workbench-web/src/mock/services/article.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/mock/services/article.js
rename to submarine-workbench/workbench-web/src/mock/services/article.js
diff --git a/submarine-workbench/submarine-web/src/mock/services/auth.js b/submarine-workbench/workbench-web/src/mock/services/auth.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/mock/services/auth.js
rename to submarine-workbench/workbench-web/src/mock/services/auth.js
diff --git a/submarine-workbench/submarine-web/src/mock/services/manage.js b/submarine-workbench/workbench-web/src/mock/services/manage.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/mock/services/manage.js
rename to submarine-workbench/workbench-web/src/mock/services/manage.js
diff --git a/submarine-workbench/submarine-web/src/mock/services/other.js b/submarine-workbench/workbench-web/src/mock/services/other.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/mock/services/other.js
rename to submarine-workbench/workbench-web/src/mock/services/other.js
diff --git a/submarine-workbench/submarine-web/src/mock/services/tagCloud.js b/submarine-workbench/workbench-web/src/mock/services/tagCloud.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/mock/services/tagCloud.js
rename to submarine-workbench/workbench-web/src/mock/services/tagCloud.js
diff --git a/submarine-workbench/submarine-web/src/mock/services/user.js b/submarine-workbench/workbench-web/src/mock/services/user.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/mock/services/user.js
rename to submarine-workbench/workbench-web/src/mock/services/user.js
diff --git a/submarine-workbench/submarine-web/src/mock/services/workbench.js b/submarine-workbench/workbench-web/src/mock/services/workbench.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/mock/services/workbench.js
rename to submarine-workbench/workbench-web/src/mock/services/workbench.js
diff --git a/submarine-workbench/submarine-web/src/mock/util.js b/submarine-workbench/workbench-web/src/mock/util.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/mock/util.js
rename to submarine-workbench/workbench-web/src/mock/util.js
diff --git a/submarine-workbench/submarine-web/src/permission.js b/submarine-workbench/workbench-web/src/permission.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/permission.js
rename to submarine-workbench/workbench-web/src/permission.js
diff --git a/submarine-workbench/submarine-web/src/router/README.md b/submarine-workbench/workbench-web/src/router/README.md
similarity index 100%
rename from submarine-workbench/submarine-web/src/router/README.md
rename to submarine-workbench/workbench-web/src/router/README.md
diff --git a/submarine-workbench/submarine-web/src/router/index.js b/submarine-workbench/workbench-web/src/router/index.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/router/index.js
rename to submarine-workbench/workbench-web/src/router/index.js
diff --git a/submarine-workbench/submarine-web/src/store/getters.js b/submarine-workbench/workbench-web/src/store/getters.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/store/getters.js
rename to submarine-workbench/workbench-web/src/store/getters.js
diff --git a/submarine-workbench/submarine-web/src/store/index.js b/submarine-workbench/workbench-web/src/store/index.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/store/index.js
rename to submarine-workbench/workbench-web/src/store/index.js
diff --git a/submarine-workbench/submarine-web/src/store/modules/app.js b/submarine-workbench/workbench-web/src/store/modules/app.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/store/modules/app.js
rename to submarine-workbench/workbench-web/src/store/modules/app.js
diff --git a/submarine-workbench/submarine-web/src/store/modules/permission.js b/submarine-workbench/workbench-web/src/store/modules/permission.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/store/modules/permission.js
rename to submarine-workbench/workbench-web/src/store/modules/permission.js
diff --git a/submarine-workbench/submarine-web/src/store/modules/user.js b/submarine-workbench/workbench-web/src/store/modules/user.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/store/modules/user.js
rename to submarine-workbench/workbench-web/src/store/modules/user.js
diff --git a/submarine-workbench/submarine-web/src/store/mutation-types.js b/submarine-workbench/workbench-web/src/store/mutation-types.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/store/mutation-types.js
rename to submarine-workbench/workbench-web/src/store/mutation-types.js
diff --git a/submarine-workbench/submarine-web/src/utils/axios.js b/submarine-workbench/workbench-web/src/utils/axios.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/utils/axios.js
rename to submarine-workbench/workbench-web/src/utils/axios.js
diff --git a/submarine-workbench/submarine-web/src/utils/device.js b/submarine-workbench/workbench-web/src/utils/device.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/utils/device.js
rename to submarine-workbench/workbench-web/src/utils/device.js
diff --git a/submarine-workbench/submarine-web/src/utils/domUtil.js b/submarine-workbench/workbench-web/src/utils/domUtil.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/utils/domUtil.js
rename to submarine-workbench/workbench-web/src/utils/domUtil.js
diff --git a/submarine-workbench/submarine-web/src/utils/filter.js b/submarine-workbench/workbench-web/src/utils/filter.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/utils/filter.js
rename to submarine-workbench/workbench-web/src/utils/filter.js
diff --git a/submarine-workbench/submarine-web/src/utils/helper/permission.js b/submarine-workbench/workbench-web/src/utils/helper/permission.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/utils/helper/permission.js
rename to submarine-workbench/workbench-web/src/utils/helper/permission.js
diff --git a/submarine-workbench/submarine-web/src/utils/mixin.js b/submarine-workbench/workbench-web/src/utils/mixin.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/utils/mixin.js
rename to submarine-workbench/workbench-web/src/utils/mixin.js
diff --git a/submarine-workbench/submarine-web/src/utils/permissions.js b/submarine-workbench/workbench-web/src/utils/permissions.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/utils/permissions.js
rename to submarine-workbench/workbench-web/src/utils/permissions.js
diff --git a/submarine-workbench/submarine-web/src/utils/request.js b/submarine-workbench/workbench-web/src/utils/request.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/utils/request.js
rename to submarine-workbench/workbench-web/src/utils/request.js
diff --git a/submarine-workbench/submarine-web/src/utils/util.js b/submarine-workbench/workbench-web/src/utils/util.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/utils/util.js
rename to submarine-workbench/workbench-web/src/utils/util.js
diff --git a/submarine-workbench/submarine-web/src/utils/utils.less b/submarine-workbench/workbench-web/src/utils/utils.less
similarity index 100%
rename from submarine-workbench/submarine-web/src/utils/utils.less
rename to submarine-workbench/workbench-web/src/utils/utils.less
diff --git a/submarine-workbench/submarine-web/src/views/404.vue b/submarine-workbench/workbench-web/src/views/404.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/404.vue
rename to submarine-workbench/workbench-web/src/views/404.vue
diff --git a/submarine-workbench/submarine-web/src/views/Home.vue b/submarine-workbench/workbench-web/src/views/Home.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/Home.vue
rename to submarine-workbench/workbench-web/src/views/Home.vue
diff --git a/submarine-workbench/submarine-web/src/views/account/center/Index.vue b/submarine-workbench/workbench-web/src/views/account/center/Index.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/account/center/Index.vue
rename to submarine-workbench/workbench-web/src/views/account/center/Index.vue
diff --git a/submarine-workbench/submarine-web/src/views/account/center/page/App.vue b/submarine-workbench/workbench-web/src/views/account/center/page/App.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/account/center/page/App.vue
rename to submarine-workbench/workbench-web/src/views/account/center/page/App.vue
diff --git a/submarine-workbench/submarine-web/src/views/account/center/page/Article.vue b/submarine-workbench/workbench-web/src/views/account/center/page/Article.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/account/center/page/Article.vue
rename to submarine-workbench/workbench-web/src/views/account/center/page/Article.vue
diff --git a/submarine-workbench/submarine-web/src/views/account/center/page/Project.vue b/submarine-workbench/workbench-web/src/views/account/center/page/Project.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/account/center/page/Project.vue
rename to submarine-workbench/workbench-web/src/views/account/center/page/Project.vue
diff --git a/submarine-workbench/submarine-web/src/views/account/center/page/index.js b/submarine-workbench/workbench-web/src/views/account/center/page/index.js
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/account/center/page/index.js
rename to submarine-workbench/workbench-web/src/views/account/center/page/index.js
diff --git a/submarine-workbench/submarine-web/src/views/account/settings/AvatarModal.vue b/submarine-workbench/workbench-web/src/views/account/settings/AvatarModal.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/account/settings/AvatarModal.vue
rename to submarine-workbench/workbench-web/src/views/account/settings/AvatarModal.vue
diff --git a/submarine-workbench/submarine-web/src/views/account/settings/BaseSetting.vue b/submarine-workbench/workbench-web/src/views/account/settings/BaseSetting.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/account/settings/BaseSetting.vue
rename to submarine-workbench/workbench-web/src/views/account/settings/BaseSetting.vue
diff --git a/submarine-workbench/submarine-web/src/views/account/settings/Binding.vue b/submarine-workbench/workbench-web/src/views/account/settings/Binding.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/account/settings/Binding.vue
rename to submarine-workbench/workbench-web/src/views/account/settings/Binding.vue
diff --git a/submarine-workbench/submarine-web/src/views/account/settings/Custom.vue b/submarine-workbench/workbench-web/src/views/account/settings/Custom.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/account/settings/Custom.vue
rename to submarine-workbench/workbench-web/src/views/account/settings/Custom.vue
diff --git a/submarine-workbench/submarine-web/src/views/account/settings/Index.vue b/submarine-workbench/workbench-web/src/views/account/settings/Index.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/account/settings/Index.vue
rename to submarine-workbench/workbench-web/src/views/account/settings/Index.vue
diff --git a/submarine-workbench/submarine-web/src/views/account/settings/Notification.vue b/submarine-workbench/workbench-web/src/views/account/settings/Notification.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/account/settings/Notification.vue
rename to submarine-workbench/workbench-web/src/views/account/settings/Notification.vue
diff --git a/submarine-workbench/submarine-web/src/views/account/settings/Security.vue b/submarine-workbench/workbench-web/src/views/account/settings/Security.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/account/settings/Security.vue
rename to submarine-workbench/workbench-web/src/views/account/settings/Security.vue
diff --git a/submarine-workbench/submarine-web/src/views/account/settings/Team.vue b/submarine-workbench/workbench-web/src/views/account/settings/Team.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/account/settings/Team.vue
rename to submarine-workbench/workbench-web/src/views/account/settings/Team.vue
diff --git a/submarine-workbench/submarine-web/src/views/dashboard/Analysis.vue b/submarine-workbench/workbench-web/src/views/dashboard/Analysis.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/dashboard/Analysis.vue
rename to submarine-workbench/workbench-web/src/views/dashboard/Analysis.vue
diff --git a/submarine-workbench/submarine-web/src/views/dashboard/Monitor.vue b/submarine-workbench/workbench-web/src/views/dashboard/Monitor.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/dashboard/Monitor.vue
rename to submarine-workbench/workbench-web/src/views/dashboard/Monitor.vue
diff --git a/submarine-workbench/submarine-web/src/views/dashboard/Workplace.vue b/submarine-workbench/workbench-web/src/views/dashboard/Workplace.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/dashboard/Workplace.vue
rename to submarine-workbench/workbench-web/src/views/dashboard/Workplace.vue
diff --git a/submarine-workbench/submarine-web/src/views/exception/403.vue b/submarine-workbench/workbench-web/src/views/exception/403.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/exception/403.vue
rename to submarine-workbench/workbench-web/src/views/exception/403.vue
diff --git a/submarine-workbench/submarine-web/src/views/exception/404.vue b/submarine-workbench/workbench-web/src/views/exception/404.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/exception/404.vue
rename to submarine-workbench/workbench-web/src/views/exception/404.vue
diff --git a/submarine-workbench/submarine-web/src/views/exception/500.vue b/submarine-workbench/workbench-web/src/views/exception/500.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/exception/500.vue
rename to submarine-workbench/workbench-web/src/views/exception/500.vue
diff --git a/submarine-workbench/submarine-web/src/views/form/BasicForm.vue b/submarine-workbench/workbench-web/src/views/form/BasicForm.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/form/BasicForm.vue
rename to submarine-workbench/workbench-web/src/views/form/BasicForm.vue
diff --git a/submarine-workbench/submarine-web/src/views/form/advancedForm/AdvancedForm.vue b/submarine-workbench/workbench-web/src/views/form/advancedForm/AdvancedForm.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/form/advancedForm/AdvancedForm.vue
rename to submarine-workbench/workbench-web/src/views/form/advancedForm/AdvancedForm.vue
diff --git a/submarine-workbench/submarine-web/src/views/form/advancedForm/RepositoryForm.vue b/submarine-workbench/workbench-web/src/views/form/advancedForm/RepositoryForm.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/form/advancedForm/RepositoryForm.vue
rename to submarine-workbench/workbench-web/src/views/form/advancedForm/RepositoryForm.vue
diff --git a/submarine-workbench/submarine-web/src/views/form/advancedForm/TaskForm.vue b/submarine-workbench/workbench-web/src/views/form/advancedForm/TaskForm.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/form/advancedForm/TaskForm.vue
rename to submarine-workbench/workbench-web/src/views/form/advancedForm/TaskForm.vue
diff --git a/submarine-workbench/submarine-web/src/views/form/stepForm/Step1.vue b/submarine-workbench/workbench-web/src/views/form/stepForm/Step1.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/form/stepForm/Step1.vue
rename to submarine-workbench/workbench-web/src/views/form/stepForm/Step1.vue
diff --git a/submarine-workbench/submarine-web/src/views/form/stepForm/Step2.vue b/submarine-workbench/workbench-web/src/views/form/stepForm/Step2.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/form/stepForm/Step2.vue
rename to submarine-workbench/workbench-web/src/views/form/stepForm/Step2.vue
diff --git a/submarine-workbench/submarine-web/src/views/form/stepForm/Step3.vue b/submarine-workbench/workbench-web/src/views/form/stepForm/Step3.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/form/stepForm/Step3.vue
rename to submarine-workbench/workbench-web/src/views/form/stepForm/Step3.vue
diff --git a/submarine-workbench/submarine-web/src/views/form/stepForm/StepForm.vue b/submarine-workbench/workbench-web/src/views/form/stepForm/StepForm.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/form/stepForm/StepForm.vue
rename to submarine-workbench/workbench-web/src/views/form/stepForm/StepForm.vue
diff --git a/submarine-workbench/submarine-web/src/views/list/CardList.vue b/submarine-workbench/workbench-web/src/views/list/CardList.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/list/CardList.vue
rename to submarine-workbench/workbench-web/src/views/list/CardList.vue
diff --git a/submarine-workbench/submarine-web/src/views/list/QueryList.vue b/submarine-workbench/workbench-web/src/views/list/QueryList.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/list/QueryList.vue
rename to submarine-workbench/workbench-web/src/views/list/QueryList.vue
diff --git a/submarine-workbench/submarine-web/src/views/list/StandardList.vue b/submarine-workbench/workbench-web/src/views/list/StandardList.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/list/StandardList.vue
rename to submarine-workbench/workbench-web/src/views/list/StandardList.vue
diff --git a/submarine-workbench/submarine-web/src/views/list/TableList.vue b/submarine-workbench/workbench-web/src/views/list/TableList.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/list/TableList.vue
rename to submarine-workbench/workbench-web/src/views/list/TableList.vue
diff --git a/submarine-workbench/submarine-web/src/views/workbench/actuator/modules/CreateForm.vue b/submarine-workbench/workbench-web/src/views/list/modules/CreateForm.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/workbench/actuator/modules/CreateForm.vue
rename to submarine-workbench/workbench-web/src/views/list/modules/CreateForm.vue
diff --git a/submarine-workbench/submarine-web/src/views/list/modules/StepByStepModal.vue b/submarine-workbench/workbench-web/src/views/list/modules/StepByStepModal.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/list/modules/StepByStepModal.vue
rename to submarine-workbench/workbench-web/src/views/list/modules/StepByStepModal.vue
diff --git a/submarine-workbench/submarine-web/src/views/workbench/actuator/modules/TaskForm.vue b/submarine-workbench/workbench-web/src/views/list/modules/TaskForm.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/workbench/actuator/modules/TaskForm.vue
rename to submarine-workbench/workbench-web/src/views/list/modules/TaskForm.vue
diff --git a/submarine-workbench/submarine-web/src/views/list/search/Applications.vue b/submarine-workbench/workbench-web/src/views/list/search/Applications.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/list/search/Applications.vue
rename to submarine-workbench/workbench-web/src/views/list/search/Applications.vue
diff --git a/submarine-workbench/submarine-web/src/views/list/search/Article.vue b/submarine-workbench/workbench-web/src/views/list/search/Article.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/list/search/Article.vue
rename to submarine-workbench/workbench-web/src/views/list/search/Article.vue
diff --git a/submarine-workbench/submarine-web/src/views/list/search/Projects.vue b/submarine-workbench/workbench-web/src/views/list/search/Projects.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/list/search/Projects.vue
rename to submarine-workbench/workbench-web/src/views/list/search/Projects.vue
diff --git a/submarine-workbench/submarine-web/src/views/list/search/SearchLayout.vue b/submarine-workbench/workbench-web/src/views/list/search/SearchLayout.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/list/search/SearchLayout.vue
rename to submarine-workbench/workbench-web/src/views/list/search/SearchLayout.vue
diff --git a/submarine-workbench/submarine-web/src/views/list/search/components/CardInfo.vue b/submarine-workbench/workbench-web/src/views/list/search/components/CardInfo.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/list/search/components/CardInfo.vue
rename to submarine-workbench/workbench-web/src/views/list/search/components/CardInfo.vue
diff --git a/submarine-workbench/submarine-web/src/views/list/search/components/IconText.vue b/submarine-workbench/workbench-web/src/views/list/search/components/IconText.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/list/search/components/IconText.vue
rename to submarine-workbench/workbench-web/src/views/list/search/components/IconText.vue
diff --git a/submarine-workbench/submarine-web/src/views/list/table/Edit.vue b/submarine-workbench/workbench-web/src/views/list/table/Edit.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/list/table/Edit.vue
rename to submarine-workbench/workbench-web/src/views/list/table/Edit.vue
diff --git a/submarine-workbench/submarine-web/src/views/list/table/List.vue b/submarine-workbench/workbench-web/src/views/list/table/List.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/list/table/List.vue
rename to submarine-workbench/workbench-web/src/views/list/table/List.vue
diff --git a/submarine-workbench/submarine-web/src/views/other/IconSelectorView.vue b/submarine-workbench/workbench-web/src/views/other/IconSelectorView.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/other/IconSelectorView.vue
rename to submarine-workbench/workbench-web/src/views/other/IconSelectorView.vue
diff --git a/submarine-workbench/submarine-web/src/views/other/PermissionList.vue b/submarine-workbench/workbench-web/src/views/other/PermissionList.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/other/PermissionList.vue
rename to submarine-workbench/workbench-web/src/views/other/PermissionList.vue
diff --git a/submarine-workbench/submarine-web/src/views/other/RoleList.vue b/submarine-workbench/workbench-web/src/views/other/RoleList.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/other/RoleList.vue
rename to submarine-workbench/workbench-web/src/views/other/RoleList.vue
diff --git a/submarine-workbench/submarine-web/src/views/other/TableInnerEditList.vue b/submarine-workbench/workbench-web/src/views/other/TableInnerEditList.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/other/TableInnerEditList.vue
rename to submarine-workbench/workbench-web/src/views/other/TableInnerEditList.vue
diff --git a/submarine-workbench/submarine-web/src/views/other/TreeList.vue b/submarine-workbench/workbench-web/src/views/other/TreeList.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/other/TreeList.vue
rename to submarine-workbench/workbench-web/src/views/other/TreeList.vue
diff --git a/submarine-workbench/submarine-web/src/views/other/UserList.vue b/submarine-workbench/workbench-web/src/views/other/UserList.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/other/UserList.vue
rename to submarine-workbench/workbench-web/src/views/other/UserList.vue
diff --git a/submarine-workbench/submarine-web/src/views/other/modules/OrgModal.vue b/submarine-workbench/workbench-web/src/views/other/modules/OrgModal.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/other/modules/OrgModal.vue
rename to submarine-workbench/workbench-web/src/views/other/modules/OrgModal.vue
diff --git a/submarine-workbench/submarine-web/src/views/other/modules/RoleModal.vue b/submarine-workbench/workbench-web/src/views/other/modules/RoleModal.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/other/modules/RoleModal.vue
rename to submarine-workbench/workbench-web/src/views/other/modules/RoleModal.vue
diff --git a/submarine-workbench/submarine-web/src/views/profile/advanced/Advanced.vue b/submarine-workbench/workbench-web/src/views/profile/advanced/Advanced.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/profile/advanced/Advanced.vue
rename to submarine-workbench/workbench-web/src/views/profile/advanced/Advanced.vue
diff --git a/submarine-workbench/submarine-web/src/views/profile/basic/Index.vue b/submarine-workbench/workbench-web/src/views/profile/basic/Index.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/profile/basic/Index.vue
rename to submarine-workbench/workbench-web/src/views/profile/basic/Index.vue
diff --git a/submarine-workbench/submarine-web/src/views/result/Error.vue b/submarine-workbench/workbench-web/src/views/result/Error.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/result/Error.vue
rename to submarine-workbench/workbench-web/src/views/result/Error.vue
diff --git a/submarine-workbench/submarine-web/src/views/result/Success.vue b/submarine-workbench/workbench-web/src/views/result/Success.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/result/Success.vue
rename to submarine-workbench/workbench-web/src/views/result/Success.vue
diff --git a/submarine-workbench/submarine-web/src/views/role/RoleList.vue b/submarine-workbench/workbench-web/src/views/role/RoleList.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/role/RoleList.vue
rename to submarine-workbench/workbench-web/src/views/role/RoleList.vue
diff --git a/submarine-workbench/submarine-web/src/views/system/DeptList.vue b/submarine-workbench/workbench-web/src/views/system/DeptList.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/system/DeptList.vue
rename to submarine-workbench/workbench-web/src/views/system/DeptList.vue
diff --git a/submarine-workbench/submarine-web/src/views/system/DictItemList.vue b/submarine-workbench/workbench-web/src/views/system/DictItemList.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/system/DictItemList.vue
rename to submarine-workbench/workbench-web/src/views/system/DictItemList.vue
diff --git a/submarine-workbench/submarine-web/src/views/system/DictList.vue b/submarine-workbench/workbench-web/src/views/system/DictList.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/system/DictList.vue
rename to submarine-workbench/workbench-web/src/views/system/DictList.vue
diff --git a/submarine-workbench/submarine-web/src/views/system/UserList.vue b/submarine-workbench/workbench-web/src/views/system/UserList.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/system/UserList.vue
rename to submarine-workbench/workbench-web/src/views/system/UserList.vue
diff --git a/submarine-workbench/submarine-web/src/views/system/modules/DeptModal.vue b/submarine-workbench/workbench-web/src/views/system/modules/DeptModal.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/system/modules/DeptModal.vue
rename to submarine-workbench/workbench-web/src/views/system/modules/DeptModal.vue
diff --git a/submarine-workbench/submarine-web/src/views/system/modules/DictItemModal.vue b/submarine-workbench/workbench-web/src/views/system/modules/DictItemModal.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/system/modules/DictItemModal.vue
rename to submarine-workbench/workbench-web/src/views/system/modules/DictItemModal.vue
diff --git a/submarine-workbench/submarine-web/src/views/system/modules/DictModal.vue b/submarine-workbench/workbench-web/src/views/system/modules/DictModal.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/system/modules/DictModal.vue
rename to submarine-workbench/workbench-web/src/views/system/modules/DictModal.vue
diff --git a/submarine-workbench/submarine-web/src/views/system/modules/PasswordModal.vue b/submarine-workbench/workbench-web/src/views/system/modules/PasswordModal.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/system/modules/PasswordModal.vue
rename to submarine-workbench/workbench-web/src/views/system/modules/PasswordModal.vue
diff --git a/submarine-workbench/submarine-web/src/views/system/modules/UserModal.vue b/submarine-workbench/workbench-web/src/views/system/modules/UserModal.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/system/modules/UserModal.vue
rename to submarine-workbench/workbench-web/src/views/system/modules/UserModal.vue
diff --git a/submarine-workbench/submarine-web/src/views/user/Login.vue b/submarine-workbench/workbench-web/src/views/user/Login.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/user/Login.vue
rename to submarine-workbench/workbench-web/src/views/user/Login.vue
diff --git a/submarine-workbench/submarine-web/src/views/user/Register.vue b/submarine-workbench/workbench-web/src/views/user/Register.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/user/Register.vue
rename to submarine-workbench/workbench-web/src/views/user/Register.vue
diff --git a/submarine-workbench/submarine-web/src/views/user/RegisterResult.vue b/submarine-workbench/workbench-web/src/views/user/RegisterResult.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/user/RegisterResult.vue
rename to submarine-workbench/workbench-web/src/views/user/RegisterResult.vue
diff --git a/submarine-workbench/submarine-web/src/views/workbench/Home.vue b/submarine-workbench/workbench-web/src/views/workbench/Home.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/workbench/Home.vue
rename to submarine-workbench/workbench-web/src/views/workbench/Home.vue
diff --git a/submarine-workbench/submarine-web/src/views/workbench/actuator/Actuator.vue b/submarine-workbench/workbench-web/src/views/workbench/actuator/Actuator.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/workbench/actuator/Actuator.vue
rename to submarine-workbench/workbench-web/src/views/workbench/actuator/Actuator.vue
diff --git a/submarine-workbench/submarine-web/src/views/workbench/actuator/modules/CreateActuator.vue b/submarine-workbench/workbench-web/src/views/workbench/actuator/modules/CreateActuator.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/workbench/actuator/modules/CreateActuator.vue
rename to submarine-workbench/workbench-web/src/views/workbench/actuator/modules/CreateActuator.vue
diff --git a/submarine-workbench/submarine-web/src/views/list/modules/CreateForm.vue b/submarine-workbench/workbench-web/src/views/workbench/actuator/modules/CreateForm.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/list/modules/CreateForm.vue
rename to submarine-workbench/workbench-web/src/views/workbench/actuator/modules/CreateForm.vue
diff --git a/submarine-workbench/submarine-web/src/views/list/modules/TaskForm.vue b/submarine-workbench/workbench-web/src/views/workbench/actuator/modules/TaskForm.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/list/modules/TaskForm.vue
rename to submarine-workbench/workbench-web/src/views/workbench/actuator/modules/TaskForm.vue
diff --git a/submarine-workbench/submarine-web/src/views/workbench/data/Data.vue b/submarine-workbench/workbench-web/src/views/workbench/data/Data.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/workbench/data/Data.vue
rename to submarine-workbench/workbench-web/src/views/workbench/data/Data.vue
diff --git a/submarine-workbench/submarine-web/src/views/workbench/data/NewTable.vue b/submarine-workbench/workbench-web/src/views/workbench/data/NewTable.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/workbench/data/NewTable.vue
rename to submarine-workbench/workbench-web/src/views/workbench/data/NewTable.vue
diff --git a/submarine-workbench/submarine-web/src/views/workbench/data/Step1.vue b/submarine-workbench/workbench-web/src/views/workbench/data/Step1.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/workbench/data/Step1.vue
rename to submarine-workbench/workbench-web/src/views/workbench/data/Step1.vue
diff --git a/submarine-workbench/submarine-web/src/views/workbench/data/Step2.vue b/submarine-workbench/workbench-web/src/views/workbench/data/Step2.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/workbench/data/Step2.vue
rename to submarine-workbench/workbench-web/src/views/workbench/data/Step2.vue
diff --git a/submarine-workbench/submarine-web/src/views/workbench/data/Step3.vue b/submarine-workbench/workbench-web/src/views/workbench/data/Step3.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/workbench/data/Step3.vue
rename to submarine-workbench/workbench-web/src/views/workbench/data/Step3.vue
diff --git a/submarine-workbench/submarine-web/src/views/workbench/job/Job.vue b/submarine-workbench/workbench-web/src/views/workbench/job/Job.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/workbench/job/Job.vue
rename to submarine-workbench/workbench-web/src/views/workbench/job/Job.vue
diff --git a/submarine-workbench/submarine-web/src/views/workbench/job/modules/CreateJob.vue b/submarine-workbench/workbench-web/src/views/workbench/job/modules/CreateJob.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/workbench/job/modules/CreateJob.vue
rename to submarine-workbench/workbench-web/src/views/workbench/job/modules/CreateJob.vue
diff --git a/submarine-workbench/submarine-web/src/views/workbench/workspace/Index.vue b/submarine-workbench/workbench-web/src/views/workbench/workspace/Index.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/workbench/workspace/Index.vue
rename to submarine-workbench/workbench-web/src/views/workbench/workspace/Index.vue
diff --git a/submarine-workbench/submarine-web/src/views/workbench/workspace/Release.vue b/submarine-workbench/workbench-web/src/views/workbench/workspace/Release.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/workbench/workspace/Release.vue
rename to submarine-workbench/workbench-web/src/views/workbench/workspace/Release.vue
diff --git a/submarine-workbench/submarine-web/src/views/workbench/workspace/Shared.vue b/submarine-workbench/workbench-web/src/views/workbench/workspace/Shared.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/workbench/workspace/Shared.vue
rename to submarine-workbench/workbench-web/src/views/workbench/workspace/Shared.vue
diff --git a/submarine-workbench/submarine-web/src/views/workbench/workspace/Team.vue b/submarine-workbench/workbench-web/src/views/workbench/workspace/Team.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/workbench/workspace/Team.vue
rename to submarine-workbench/workbench-web/src/views/workbench/workspace/Team.vue
diff --git a/submarine-workbench/submarine-web/src/views/workbench/workspace/Training.vue b/submarine-workbench/workbench-web/src/views/workbench/workspace/Training.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/workbench/workspace/Training.vue
rename to submarine-workbench/workbench-web/src/views/workbench/workspace/Training.vue
diff --git a/submarine-workbench/submarine-web/src/views/workbench/workspace/WorkspaceLayout.vue b/submarine-workbench/workbench-web/src/views/workbench/workspace/WorkspaceLayout.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/workbench/workspace/WorkspaceLayout.vue
rename to submarine-workbench/workbench-web/src/views/workbench/workspace/WorkspaceLayout.vue
diff --git a/submarine-workbench/submarine-web/src/views/workbench/workspace/project/Index.vue b/submarine-workbench/workbench-web/src/views/workbench/workspace/project/Index.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/workbench/workspace/project/Index.vue
rename to submarine-workbench/workbench-web/src/views/workbench/workspace/project/Index.vue
diff --git a/submarine-workbench/submarine-web/src/views/workbench/workspace/project/List.vue b/submarine-workbench/workbench-web/src/views/workbench/workspace/project/List.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/workbench/workspace/project/List.vue
rename to submarine-workbench/workbench-web/src/views/workbench/workspace/project/List.vue
diff --git a/submarine-workbench/submarine-web/src/views/workbench/workspace/project/NewProject.vue b/submarine-workbench/workbench-web/src/views/workbench/workspace/project/NewProject.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/workbench/workspace/project/NewProject.vue
rename to submarine-workbench/workbench-web/src/views/workbench/workspace/project/NewProject.vue
diff --git a/submarine-workbench/submarine-web/src/views/workbench/workspace/project/NewProjectStep1.vue b/submarine-workbench/workbench-web/src/views/workbench/workspace/project/NewProjectStep1.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/workbench/workspace/project/NewProjectStep1.vue
rename to submarine-workbench/workbench-web/src/views/workbench/workspace/project/NewProjectStep1.vue
diff --git a/submarine-workbench/submarine-web/src/views/workbench/workspace/project/NewProjectStep2.vue b/submarine-workbench/workbench-web/src/views/workbench/workspace/project/NewProjectStep2.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/workbench/workspace/project/NewProjectStep2.vue
rename to submarine-workbench/workbench-web/src/views/workbench/workspace/project/NewProjectStep2.vue
diff --git a/submarine-workbench/submarine-web/src/views/workbench/workspace/project/NewProjectStep3.vue b/submarine-workbench/workbench-web/src/views/workbench/workspace/project/NewProjectStep3.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/workbench/workspace/project/NewProjectStep3.vue
rename to submarine-workbench/workbench-web/src/views/workbench/workspace/project/NewProjectStep3.vue
diff --git a/submarine-workbench/submarine-web/src/views/workbench/workspace/project/ProjectList.vue b/submarine-workbench/workbench-web/src/views/workbench/workspace/project/ProjectList.vue
similarity index 100%
rename from submarine-workbench/submarine-web/src/views/workbench/workspace/project/ProjectList.vue
rename to submarine-workbench/workbench-web/src/views/workbench/workspace/project/ProjectList.vue
diff --git a/submarine-workbench/submarine-web/tests/unit/.eslintrc.js b/submarine-workbench/workbench-web/tests/unit/.eslintrc.js
similarity index 100%
rename from submarine-workbench/submarine-web/tests/unit/.eslintrc.js
rename to submarine-workbench/workbench-web/tests/unit/.eslintrc.js
diff --git a/submarine-workbench/submarine-web/vue.config.js b/submarine-workbench/workbench-web/vue.config.js
similarity index 100%
rename from submarine-workbench/submarine-web/vue.config.js
rename to submarine-workbench/workbench-web/vue.config.js
diff --git a/submarine-workbench/submarine-web/webstorm.config.js b/submarine-workbench/workbench-web/webstorm.config.js
similarity index 100%
rename from submarine-workbench/submarine-web/webstorm.config.js
rename to submarine-workbench/workbench-web/webstorm.config.js
diff --git a/submarine-workbench/submarine-web/yarn.lock b/submarine-workbench/workbench-web/yarn.lock
similarity index 100%
rename from submarine-workbench/submarine-web/yarn.lock
rename to submarine-workbench/workbench-web/yarn.lock