diff --git a/.gitignore b/.gitignore index 54bb2f7..c204414 100755 --- a/.gitignore +++ b/.gitignore @@ -65,12 +65,12 @@ settings.py *.db # UI -ui/node_modules -ui/dist +cmdb-ui/node_modules +cmdb-ui/dist # Log files -ui/npm-debug.log* -ui/yarn-debug.log* -ui/yarn-error.log* -ui/yarn.lock -ui/package-lock.json +cmdb-ui/npm-debug.log* +cmdb-ui/yarn-debug.log* +cmdb-ui/yarn-error.log* +cmdb-ui/yarn.lock +cmdb-ui/package-lock.json diff --git a/Dockerfile b/Dockerfile index b510247..0bf6ed1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM node:alpine AS builder LABEL description="cmdb-ui" -COPY ui /data/apps/cmdb-ui +COPY cmdb-ui /data/apps/cmdb-ui WORKDIR /data/apps/cmdb-ui @@ -22,7 +22,7 @@ FROM python:3.7-alpine AS cmdb-api LABEL description="Python3.7,cmdb" -COPY . /data/apps/cmdb +COPY cmdb-api /data/apps/cmdb WORKDIR /data/apps/cmdb @@ -30,11 +30,11 @@ RUN apk add --no-cache tzdata gcc musl-dev libffi-dev ENV TZ=Asia/Shanghai -RUN pip install --no-cache-dir -r docs/requirements.txt \ - && cp ./api/settings.py.example ./api/settings.py \ - && sed -i "s#{user}:{password}@127.0.0.1:3306/{db}#cmdb:123456@mysql:3306/cmdb#g" api/settings.py \ - && sed -i "s#redis://127.0.0.1#redis://redis#g" api/settings.py \ - && sed -i 's#CACHE_REDIS_HOST = "127.0.0.1"#CACHE_REDIS_HOST = "redis"#g' api/settings.py +RUN pip install --no-cache-dir -r requirements.txt \ + && cp ./settings.py.example settings.py \ + && sed -i "s#{user}:{password}@127.0.0.1:3306/{db}#cmdb:123456@mysql:3306/cmdb#g" settings.py \ + && sed -i "s#redis://127.0.0.1#redis://redis#g" settings.py \ + && sed -i 's#CACHE_REDIS_HOST = "127.0.0.1"#CACHE_REDIS_HOST = "redis"#g' settings.py CMD ["bash", "-c", "flask run"] diff --git a/README.md b/README.md index 3cb8bc7..03e3406 100644 --- a/README.md +++ b/README.md @@ -28,19 +28,19 @@ Overview 3. 关系视图 - 模型之间的关系, 用树形图方式展示, **管理员可配置** ##### 资源视图 -![基础资源视图](https://raw.githubusercontent.com/pycook/cmdb/master/ui/public/cmdb-ci.jpeg) +![基础资源视图](https://raw.githubusercontent.com/pycook/cmdb/master/cmdb-ui/public/cmdb-ci.jpeg) ##### 树形视图 -![树形视图](https://raw.githubusercontent.com/pycook/cmdb/master/ui/public/cmdb-tree.jpeg) +![树形视图](https://raw.githubusercontent.com/pycook/cmdb/master/cmdb-ui/public/cmdb-tree.jpeg) ##### 关系视图 -![关系视图](https://raw.githubusercontent.com/pycook/cmdb/master/ui/public/cmdb-relation.jpeg) +![关系视图](https://raw.githubusercontent.com/pycook/cmdb/master/cmdb-ui/public/cmdb-relation.jpeg) ##### 用户订阅 -![用户订阅](https://raw.githubusercontent.com/pycook/cmdb/master/ui/public/cmdb-preference.jpeg) +![用户订阅](https://raw.githubusercontent.com/pycook/cmdb/master/cmdb-ui/public/cmdb-preference.jpeg) ##### 关系视图配置 -![关系视图配置](https://raw.githubusercontent.com/pycook/cmdb/master/ui/public/cmdb-relation-define.jpeg) +![关系视图配置](https://raw.githubusercontent.com/pycook/cmdb/master/cmdb-ui/public/cmdb-relation-define.jpeg) Docker一键快速构建 ---- @@ -66,24 +66,24 @@ Install ```bash git clone https://github.com/pycook/cmdb.git cd cmdb -cp api/settings.py.example api/settings.py +cp cmdb-api/settings.py.example cmdb-api/settings.py ``` -**设置api/settings.py里的database** +**设置cmdb-api/settings.py里的database** - 安装库 - - 后端: ```pipenv run pipenv install``` - - 前端: ```cd ui && yarn install && cd ..``` + - 后端: ```cd cmdb-api && pipenv run pipenv install && cd ..``` + - 前端: ```cd cmdb-ui && yarn install && cd ..``` - 创建数据库表 ```pipenv run flask db-setup && pipenv run flask init-cache``` -- 可以将docs/cmdb.sql导入到数据库里，登录用户和密码都是:admin +- 可以将docs/cmdb.sql导入到数据库里，登录用户和密码分别是:demo/123456 - 启动服务 - - 后端: ```pipenv run flask run -h 0.0.0.0``` - - 前端: ```cd ui && yarn run serve``` - - worker: ```celery worker -A celery_worker.celery -E -Q cmdb_async --concurrency=1``` + - 后端: 进入**cmdb-api**目录执行 ```pipenv run flask run -h 0.0.0.0``` + - 前端: 进入**cmdb-ui**目录执行```yarn run serve``` + - worker: 进入**cmdb-api**目录执行 ```pipenv run celery worker -A celery_worker.celery -E -Q cmdb_async --concurrency=1``` - 浏览器打开: [http://127.0.0.1:8000](http://127.0.0.1:8000) - - 如果是非本机访问, 要修改**ui/.env**里**VUE_APP_API_BASE_URL**里的IP地址为后端服务的ip地址 + - 如果是非本机访问, 要修改**cmdb-ui/.env**里**VUE_APP_API_BASE_URL**里的IP地址为后端服务的ip地址 Install by Makefile @@ -95,9 +95,9 @@ Install by Makefile ```bash git clone https://github.com/pycook/cmdb.git cd cmdb -cp api/settings.py.example api/settings.py +cp cmdb-api/settings.py.example cmdb-api/settings.py ``` -**设置api/settings.py里的database** +**cmdb-api/settings.py里的database** - 顺序在cmdb目录下执行 - 环境: ```make env``` @@ -109,4 +109,4 @@ cp api/settings.py.example api/settings.py ---- _**欢迎加入CMDB运维开发QQ群（336164978）**_ -![QQ群](ui/public/qr_code.jpg) \ No newline at end of file +![QQ群](cmdb-ui/public/qr_code.jpg) \ No newline at end of file diff --git a/.env b/cmdb-api/.env similarity index 100% rename from .env rename to cmdb-api/.env diff --git a/Pipfile b/cmdb-api/Pipfile similarity index 100% rename from Pipfile rename to cmdb-api/Pipfile diff --git a/api/__init__.py b/cmdb-api/api/__init__.py similarity index 100% rename from api/__init__.py rename to cmdb-api/api/__init__.py diff --git a/api/app.py b/cmdb-api/api/app.py similarity index 98% rename from api/app.py rename to cmdb-api/api/app.py index 95d6059..d331f6d 100644 --- a/api/app.py +++ b/cmdb-api/api/app.py @@ -6,6 +6,7 @@ import sys from inspect import getmembers from logging.handlers import RotatingFileHandler +from api.flask_cas import CAS from flask import Flask from flask import make_response, jsonify from flask.blueprints import Blueprint @@ -23,8 +24,7 @@ from api.extensions import ( rd, es ) -from api.flask_cas import CAS -from api.models.acl import User +from .models.acl import User HERE = os.path.abspath(os.path.dirname(__file__)) PROJECT_ROOT = os.path.join(HERE, os.pardir) @@ -72,7 +72,7 @@ class ReverseProxy(object): return self.app(environ, start_response) -def create_app(config_object="{0}.settings".format(API_PACKAGE)): +def create_app(config_object="settings"): """Create application factory, as explained here: http://flask.pocoo.org/docs/patterns/appfactories/. :param config_object: The configuration object to use. diff --git a/api/commands/__init__.py b/cmdb-api/api/commands/__init__.py similarity index 100% rename from api/commands/__init__.py rename to cmdb-api/api/commands/__init__.py diff --git a/api/commands/click_cmdb.py b/cmdb-api/api/commands/click_cmdb.py similarity index 100% rename from api/commands/click_cmdb.py rename to cmdb-api/api/commands/click_cmdb.py diff --git a/api/commands/common.py b/cmdb-api/api/commands/common.py similarity index 100% rename from api/commands/common.py rename to cmdb-api/api/commands/common.py diff --git a/api/extensions.py b/cmdb-api/api/extensions.py similarity index 100% rename from api/extensions.py rename to cmdb-api/api/extensions.py diff --git a/api/flask_cas/__init__.py b/cmdb-api/api/flask_cas/__init__.py similarity index 100% rename from api/flask_cas/__init__.py rename to cmdb-api/api/flask_cas/__init__.py diff --git a/api/flask_cas/cas_urls.py b/cmdb-api/api/flask_cas/cas_urls.py similarity index 100% rename from api/flask_cas/cas_urls.py rename to cmdb-api/api/flask_cas/cas_urls.py diff --git a/api/flask_cas/routing.py b/cmdb-api/api/flask_cas/routing.py similarity index 100% rename from api/flask_cas/routing.py rename to cmdb-api/api/flask_cas/routing.py diff --git a/api/lib/__init__.py b/cmdb-api/api/lib/__init__.py similarity index 100% rename from api/lib/__init__.py rename to cmdb-api/api/lib/__init__.py diff --git a/api/lib/cmdb/__init__.py b/cmdb-api/api/lib/cmdb/__init__.py similarity index 100% rename from api/lib/cmdb/__init__.py rename to cmdb-api/api/lib/cmdb/__init__.py diff --git a/api/lib/cmdb/attribute.py b/cmdb-api/api/lib/cmdb/attribute.py similarity index 100% rename from api/lib/cmdb/attribute.py rename to cmdb-api/api/lib/cmdb/attribute.py diff --git a/api/lib/cmdb/cache.py b/cmdb-api/api/lib/cmdb/cache.py similarity index 100% rename from api/lib/cmdb/cache.py rename to cmdb-api/api/lib/cmdb/cache.py diff --git a/api/lib/cmdb/ci.py b/cmdb-api/api/lib/cmdb/ci.py similarity index 100% rename from api/lib/cmdb/ci.py rename to cmdb-api/api/lib/cmdb/ci.py diff --git a/api/lib/cmdb/ci_type.py b/cmdb-api/api/lib/cmdb/ci_type.py similarity index 100% rename from api/lib/cmdb/ci_type.py rename to cmdb-api/api/lib/cmdb/ci_type.py diff --git a/api/lib/cmdb/const.py b/cmdb-api/api/lib/cmdb/const.py similarity index 100% rename from api/lib/cmdb/const.py rename to cmdb-api/api/lib/cmdb/const.py diff --git a/api/lib/cmdb/history.py b/cmdb-api/api/lib/cmdb/history.py similarity index 100% rename from api/lib/cmdb/history.py rename to cmdb-api/api/lib/cmdb/history.py diff --git a/api/lib/cmdb/preference.py b/cmdb-api/api/lib/cmdb/preference.py similarity index 100% rename from api/lib/cmdb/preference.py rename to cmdb-api/api/lib/cmdb/preference.py diff --git a/api/lib/cmdb/relation_type.py b/cmdb-api/api/lib/cmdb/relation_type.py similarity index 100% rename from api/lib/cmdb/relation_type.py rename to cmdb-api/api/lib/cmdb/relation_type.py diff --git a/api/lib/cmdb/search/__init__.py b/cmdb-api/api/lib/cmdb/search/__init__.py similarity index 100% rename from api/lib/cmdb/search/__init__.py rename to cmdb-api/api/lib/cmdb/search/__init__.py diff --git a/api/lib/cmdb/search/ci/__init__.py b/cmdb-api/api/lib/cmdb/search/ci/__init__.py similarity index 100% rename from api/lib/cmdb/search/ci/__init__.py rename to cmdb-api/api/lib/cmdb/search/ci/__init__.py diff --git a/api/lib/cmdb/search/ci/db/__init__.py b/cmdb-api/api/lib/cmdb/search/ci/db/__init__.py similarity index 100% rename from api/lib/cmdb/search/ci/db/__init__.py rename to cmdb-api/api/lib/cmdb/search/ci/db/__init__.py diff --git a/api/lib/cmdb/search/ci/db/query_sql.py b/cmdb-api/api/lib/cmdb/search/ci/db/query_sql.py similarity index 100% rename from api/lib/cmdb/search/ci/db/query_sql.py rename to cmdb-api/api/lib/cmdb/search/ci/db/query_sql.py diff --git a/api/lib/cmdb/search/ci/db/search.py b/cmdb-api/api/lib/cmdb/search/ci/db/search.py similarity index 100% rename from api/lib/cmdb/search/ci/db/search.py rename to cmdb-api/api/lib/cmdb/search/ci/db/search.py diff --git a/api/lib/cmdb/search/ci/es/__init__.py b/cmdb-api/api/lib/cmdb/search/ci/es/__init__.py similarity index 100% rename from api/lib/cmdb/search/ci/es/__init__.py rename to cmdb-api/api/lib/cmdb/search/ci/es/__init__.py diff --git a/api/lib/cmdb/search/ci/es/search.py b/cmdb-api/api/lib/cmdb/search/ci/es/search.py similarity index 100% rename from api/lib/cmdb/search/ci/es/search.py rename to cmdb-api/api/lib/cmdb/search/ci/es/search.py diff --git a/api/lib/cmdb/search/ci_relation/__init__.py b/cmdb-api/api/lib/cmdb/search/ci_relation/__init__.py similarity index 100% rename from api/lib/cmdb/search/ci_relation/__init__.py rename to cmdb-api/api/lib/cmdb/search/ci_relation/__init__.py diff --git a/api/lib/cmdb/search/ci_relation/search.py b/cmdb-api/api/lib/cmdb/search/ci_relation/search.py similarity index 100% rename from api/lib/cmdb/search/ci_relation/search.py rename to cmdb-api/api/lib/cmdb/search/ci_relation/search.py diff --git a/api/lib/cmdb/utils.py b/cmdb-api/api/lib/cmdb/utils.py similarity index 100% rename from api/lib/cmdb/utils.py rename to cmdb-api/api/lib/cmdb/utils.py diff --git a/api/lib/cmdb/value.py b/cmdb-api/api/lib/cmdb/value.py similarity index 100% rename from api/lib/cmdb/value.py rename to cmdb-api/api/lib/cmdb/value.py diff --git a/api/lib/database.py b/cmdb-api/api/lib/database.py similarity index 100% rename from api/lib/database.py rename to cmdb-api/api/lib/database.py diff --git a/api/lib/decorator.py b/cmdb-api/api/lib/decorator.py similarity index 100% rename from api/lib/decorator.py rename to cmdb-api/api/lib/decorator.py diff --git a/api/lib/exception.py b/cmdb-api/api/lib/exception.py similarity index 100% rename from api/lib/exception.py rename to cmdb-api/api/lib/exception.py diff --git a/api/lib/http_cli.py b/cmdb-api/api/lib/http_cli.py similarity index 100% rename from api/lib/http_cli.py rename to cmdb-api/api/lib/http_cli.py diff --git a/api/lib/mail.py b/cmdb-api/api/lib/mail.py similarity index 100% rename from api/lib/mail.py rename to cmdb-api/api/lib/mail.py diff --git a/api/lib/perm/__init__.py b/cmdb-api/api/lib/perm/__init__.py similarity index 100% rename from api/lib/perm/__init__.py rename to cmdb-api/api/lib/perm/__init__.py diff --git a/api/lib/perm/acl/__init__.py b/cmdb-api/api/lib/perm/acl/__init__.py similarity index 100% rename from api/lib/perm/acl/__init__.py rename to cmdb-api/api/lib/perm/acl/__init__.py diff --git a/api/lib/perm/acl/acl.py b/cmdb-api/api/lib/perm/acl/acl.py similarity index 100% rename from api/lib/perm/acl/acl.py rename to cmdb-api/api/lib/perm/acl/acl.py diff --git a/api/lib/perm/acl/cache.py b/cmdb-api/api/lib/perm/acl/cache.py similarity index 100% rename from api/lib/perm/acl/cache.py rename to cmdb-api/api/lib/perm/acl/cache.py diff --git a/api/lib/perm/acl/const.py b/cmdb-api/api/lib/perm/acl/const.py similarity index 100% rename from api/lib/perm/acl/const.py rename to cmdb-api/api/lib/perm/acl/const.py diff --git a/api/lib/perm/acl/permission.py b/cmdb-api/api/lib/perm/acl/permission.py similarity index 100% rename from api/lib/perm/acl/permission.py rename to cmdb-api/api/lib/perm/acl/permission.py diff --git a/api/lib/perm/acl/resource.py b/cmdb-api/api/lib/perm/acl/resource.py similarity index 100% rename from api/lib/perm/acl/resource.py rename to cmdb-api/api/lib/perm/acl/resource.py diff --git a/api/lib/perm/acl/role.py b/cmdb-api/api/lib/perm/acl/role.py similarity index 100% rename from api/lib/perm/acl/role.py rename to cmdb-api/api/lib/perm/acl/role.py diff --git a/api/lib/perm/acl/user.py b/cmdb-api/api/lib/perm/acl/user.py similarity index 100% rename from api/lib/perm/acl/user.py rename to cmdb-api/api/lib/perm/acl/user.py diff --git a/api/lib/perm/auth.py b/cmdb-api/api/lib/perm/auth.py similarity index 100% rename from api/lib/perm/auth.py rename to cmdb-api/api/lib/perm/auth.py diff --git a/api/lib/utils.py b/cmdb-api/api/lib/utils.py similarity index 100% rename from api/lib/utils.py rename to cmdb-api/api/lib/utils.py diff --git a/api/models/__init__.py b/cmdb-api/api/models/__init__.py similarity index 100% rename from api/models/__init__.py rename to cmdb-api/api/models/__init__.py diff --git a/api/models/acl.py b/cmdb-api/api/models/acl.py similarity index 100% rename from api/models/acl.py rename to cmdb-api/api/models/acl.py diff --git a/api/models/cmdb.py b/cmdb-api/api/models/cmdb.py similarity index 100% rename from api/models/cmdb.py rename to cmdb-api/api/models/cmdb.py diff --git a/api/resource.py b/cmdb-api/api/resource.py similarity index 100% rename from api/resource.py rename to cmdb-api/api/resource.py diff --git a/api/tasks/__init__.py b/cmdb-api/api/tasks/__init__.py similarity index 100% rename from api/tasks/__init__.py rename to cmdb-api/api/tasks/__init__.py diff --git a/api/tasks/acl.py b/cmdb-api/api/tasks/acl.py similarity index 100% rename from api/tasks/acl.py rename to cmdb-api/api/tasks/acl.py diff --git a/api/tasks/cmdb.py b/cmdb-api/api/tasks/cmdb.py similarity index 100% rename from api/tasks/cmdb.py rename to cmdb-api/api/tasks/cmdb.py diff --git a/api/tasks/test.py b/cmdb-api/api/tasks/test.py similarity index 100% rename from api/tasks/test.py rename to cmdb-api/api/tasks/test.py diff --git a/api/views/__init__.py b/cmdb-api/api/views/__init__.py similarity index 93% rename from api/views/__init__.py rename to cmdb-api/api/views/__init__.py index 4cde7ce..1388e62 100644 --- a/api/views/__init__.py +++ b/cmdb-api/api/views/__init__.py @@ -6,7 +6,7 @@ from flask import Blueprint from flask_restful import Api from api.resource import register_resources -from .account import LoginView, LogoutView +from api.views.account import LoginView, LogoutView HERE = os.path.abspath(os.path.dirname(__file__)) diff --git a/api/views/account.py b/cmdb-api/api/views/account.py similarity index 100% rename from api/views/account.py rename to cmdb-api/api/views/account.py diff --git a/api/views/acl/__init__.py b/cmdb-api/api/views/acl/__init__.py similarity index 100% rename from api/views/acl/__init__.py rename to cmdb-api/api/views/acl/__init__.py diff --git a/api/views/acl/permission.py b/cmdb-api/api/views/acl/permission.py similarity index 100% rename from api/views/acl/permission.py rename to cmdb-api/api/views/acl/permission.py diff --git a/api/views/acl/resources.py b/cmdb-api/api/views/acl/resources.py similarity index 100% rename from api/views/acl/resources.py rename to cmdb-api/api/views/acl/resources.py diff --git a/api/views/acl/role.py b/cmdb-api/api/views/acl/role.py similarity index 100% rename from api/views/acl/role.py rename to cmdb-api/api/views/acl/role.py diff --git a/api/views/acl/user.py b/cmdb-api/api/views/acl/user.py similarity index 100% rename from api/views/acl/user.py rename to cmdb-api/api/views/acl/user.py diff --git a/api/views/cmdb/__init__.py b/cmdb-api/api/views/cmdb/__init__.py similarity index 100% rename from api/views/cmdb/__init__.py rename to cmdb-api/api/views/cmdb/__init__.py diff --git a/api/views/cmdb/attribute.py b/cmdb-api/api/views/cmdb/attribute.py similarity index 100% rename from api/views/cmdb/attribute.py rename to cmdb-api/api/views/cmdb/attribute.py diff --git a/api/views/cmdb/ci.py b/cmdb-api/api/views/cmdb/ci.py similarity index 100% rename from api/views/cmdb/ci.py rename to cmdb-api/api/views/cmdb/ci.py diff --git a/api/views/cmdb/ci_relation.py b/cmdb-api/api/views/cmdb/ci_relation.py similarity index 100% rename from api/views/cmdb/ci_relation.py rename to cmdb-api/api/views/cmdb/ci_relation.py diff --git a/api/views/cmdb/ci_type.py b/cmdb-api/api/views/cmdb/ci_type.py similarity index 100% rename from api/views/cmdb/ci_type.py rename to cmdb-api/api/views/cmdb/ci_type.py diff --git a/api/views/cmdb/ci_type_relation.py b/cmdb-api/api/views/cmdb/ci_type_relation.py similarity index 100% rename from api/views/cmdb/ci_type_relation.py rename to cmdb-api/api/views/cmdb/ci_type_relation.py diff --git a/api/views/cmdb/history.py b/cmdb-api/api/views/cmdb/history.py similarity index 100% rename from api/views/cmdb/history.py rename to cmdb-api/api/views/cmdb/history.py diff --git a/api/views/cmdb/preference.py b/cmdb-api/api/views/cmdb/preference.py similarity index 100% rename from api/views/cmdb/preference.py rename to cmdb-api/api/views/cmdb/preference.py diff --git a/api/views/cmdb/relation_type.py b/cmdb-api/api/views/cmdb/relation_type.py similarity index 100% rename from api/views/cmdb/relation_type.py rename to cmdb-api/api/views/cmdb/relation_type.py diff --git a/autoapp.py b/cmdb-api/autoapp.py similarity index 100% rename from autoapp.py rename to cmdb-api/autoapp.py diff --git a/celery_worker.py b/cmdb-api/celery_worker.py similarity index 100% rename from celery_worker.py rename to cmdb-api/celery_worker.py diff --git a/logs/.gitkeep b/cmdb-api/logs/.gitkeep similarity index 100% rename from logs/.gitkeep rename to cmdb-api/logs/.gitkeep diff --git a/docs/requirements.txt b/cmdb-api/requirements.txt similarity index 100% rename from docs/requirements.txt rename to cmdb-api/requirements.txt diff --git a/api/settings.py.example b/cmdb-api/settings.py.example similarity index 100% rename from api/settings.py.example rename to cmdb-api/settings.py.example diff --git a/setup.cfg b/cmdb-api/setup.cfg similarity index 100% rename from setup.cfg rename to cmdb-api/setup.cfg diff --git a/tests/__init__.py b/cmdb-api/tests/__init__.py similarity index 100% rename from tests/__init__.py rename to cmdb-api/tests/__init__.py diff --git a/tests/conftest.py b/cmdb-api/tests/conftest.py similarity index 100% rename from tests/conftest.py rename to cmdb-api/tests/conftest.py diff --git a/tests/test_cmdb_attribute.py b/cmdb-api/tests/test_cmdb_attribute.py similarity index 100% rename from tests/test_cmdb_attribute.py rename to cmdb-api/tests/test_cmdb_attribute.py diff --git a/tests/test_cmdb_ci.py b/cmdb-api/tests/test_cmdb_ci.py similarity index 100% rename from tests/test_cmdb_ci.py rename to cmdb-api/tests/test_cmdb_ci.py diff --git a/tests/test_cmdb_ci_realtion.py b/cmdb-api/tests/test_cmdb_ci_realtion.py similarity index 100% rename from tests/test_cmdb_ci_realtion.py rename to cmdb-api/tests/test_cmdb_ci_realtion.py diff --git a/tests/test_cmdb_ci_type.py b/cmdb-api/tests/test_cmdb_ci_type.py similarity index 100% rename from tests/test_cmdb_ci_type.py rename to cmdb-api/tests/test_cmdb_ci_type.py diff --git a/tests/test_cmdb_ci_type_relation.py b/cmdb-api/tests/test_cmdb_ci_type_relation.py similarity index 100% rename from tests/test_cmdb_ci_type_relation.py rename to cmdb-api/tests/test_cmdb_ci_type_relation.py diff --git a/tests/test_cmdb_history.py b/cmdb-api/tests/test_cmdb_history.py similarity index 100% rename from tests/test_cmdb_history.py rename to cmdb-api/tests/test_cmdb_history.py diff --git a/tests/test_cmdb_preference.py b/cmdb-api/tests/test_cmdb_preference.py similarity index 100% rename from tests/test_cmdb_preference.py rename to cmdb-api/tests/test_cmdb_preference.py diff --git a/tests/test_cmdb_relation_type.py b/cmdb-api/tests/test_cmdb_relation_type.py similarity index 100% rename from tests/test_cmdb_relation_type.py rename to cmdb-api/tests/test_cmdb_relation_type.py diff --git a/ui/.editorconfig b/cmdb-ui/.editorconfig similarity index 100% rename from ui/.editorconfig rename to cmdb-ui/.editorconfig diff --git a/ui/.env b/cmdb-ui/.env similarity index 100% rename from ui/.env rename to cmdb-ui/.env diff --git a/ui/.env.preview b/cmdb-ui/.env.preview similarity index 100% rename from ui/.env.preview rename to cmdb-ui/.env.preview diff --git a/ui/.prettierrc b/cmdb-ui/.prettierrc similarity index 100% rename from ui/.prettierrc rename to cmdb-ui/.prettierrc diff --git a/ui/.travis.yml b/cmdb-ui/.travis.yml similarity index 100% rename from ui/.travis.yml rename to cmdb-ui/.travis.yml diff --git a/ui/LICENSE b/cmdb-ui/LICENSE similarity index 100% rename from ui/LICENSE rename to cmdb-ui/LICENSE diff --git a/ui/babel.config.js b/cmdb-ui/babel.config.js similarity index 100% rename from ui/babel.config.js rename to cmdb-ui/babel.config.js diff --git a/ui/jest.config.js b/cmdb-ui/jest.config.js similarity index 100% rename from ui/jest.config.js rename to cmdb-ui/jest.config.js diff --git a/ui/jsconfig.json b/cmdb-ui/jsconfig.json similarity index 100% rename from ui/jsconfig.json rename to cmdb-ui/jsconfig.json diff --git a/ui/package.json b/cmdb-ui/package.json similarity index 100% rename from ui/package.json rename to cmdb-ui/package.json diff --git a/ui/public/cmdb-ci.jpeg b/cmdb-ui/public/cmdb-ci.jpeg similarity index 100% rename from ui/public/cmdb-ci.jpeg rename to cmdb-ui/public/cmdb-ci.jpeg diff --git a/ui/public/cmdb-preference.jpeg b/cmdb-ui/public/cmdb-preference.jpeg similarity index 100% rename from ui/public/cmdb-preference.jpeg rename to cmdb-ui/public/cmdb-preference.jpeg diff --git a/ui/public/cmdb-relation-define.jpeg b/cmdb-ui/public/cmdb-relation-define.jpeg similarity index 100% rename from ui/public/cmdb-relation-define.jpeg rename to cmdb-ui/public/cmdb-relation-define.jpeg diff --git a/ui/public/cmdb-relation.jpeg b/cmdb-ui/public/cmdb-relation.jpeg similarity index 100% rename from ui/public/cmdb-relation.jpeg rename to cmdb-ui/public/cmdb-relation.jpeg diff --git a/ui/public/cmdb-tree.jpeg b/cmdb-ui/public/cmdb-tree.jpeg similarity index 100% rename from ui/public/cmdb-tree.jpeg rename to cmdb-ui/public/cmdb-tree.jpeg diff --git a/ui/public/cmdb01.jpeg b/cmdb-ui/public/cmdb01.jpeg similarity index 100% rename from ui/public/cmdb01.jpeg rename to cmdb-ui/public/cmdb01.jpeg diff --git a/ui/public/cmdb02.jpeg b/cmdb-ui/public/cmdb02.jpeg similarity index 100% rename from ui/public/cmdb02.jpeg rename to cmdb-ui/public/cmdb02.jpeg diff --git a/ui/public/color.less b/cmdb-ui/public/color.less similarity index 100% rename from ui/public/color.less rename to cmdb-ui/public/color.less diff --git a/ui/public/index.html b/cmdb-ui/public/index.html similarity index 100% rename from ui/public/index.html rename to cmdb-ui/public/index.html diff --git a/ui/public/loading/loading.css b/cmdb-ui/public/loading/loading.css similarity index 100% rename from ui/public/loading/loading.css rename to cmdb-ui/public/loading/loading.css diff --git a/ui/public/loading/loading.html b/cmdb-ui/public/loading/loading.html similarity index 100% rename from ui/public/loading/loading.html rename to cmdb-ui/public/loading/loading.html diff --git a/ui/public/loading/option2/html_code_segment.html b/cmdb-ui/public/loading/option2/html_code_segment.html similarity index 100% rename from ui/public/loading/option2/html_code_segment.html rename to cmdb-ui/public/loading/option2/html_code_segment.html diff --git a/ui/public/loading/option2/loading.css b/cmdb-ui/public/loading/option2/loading.css similarity index 100% rename from ui/public/loading/option2/loading.css rename to cmdb-ui/public/loading/option2/loading.css diff --git a/ui/public/loading/option2/loading.svg b/cmdb-ui/public/loading/option2/loading.svg similarity index 100% rename from ui/public/loading/option2/loading.svg rename to cmdb-ui/public/loading/option2/loading.svg diff --git a/ui/public/qr_code.jpg b/cmdb-ui/public/qr_code.jpg similarity index 100% rename from ui/public/qr_code.jpg rename to cmdb-ui/public/qr_code.jpg diff --git a/ui/src/App.vue b/cmdb-ui/src/App.vue similarity index 100% rename from ui/src/App.vue rename to cmdb-ui/src/App.vue diff --git a/ui/src/EventBus.js b/cmdb-ui/src/EventBus.js similarity index 100% rename from ui/src/EventBus.js rename to cmdb-ui/src/EventBus.js diff --git a/ui/src/api/acl/app.js b/cmdb-ui/src/api/acl/app.js similarity index 100% rename from ui/src/api/acl/app.js rename to cmdb-ui/src/api/acl/app.js diff --git a/ui/src/api/acl/permission.js b/cmdb-ui/src/api/acl/permission.js similarity index 100% rename from ui/src/api/acl/permission.js rename to cmdb-ui/src/api/acl/permission.js diff --git a/ui/src/api/acl/resource.js b/cmdb-ui/src/api/acl/resource.js similarity index 100% rename from ui/src/api/acl/resource.js rename to cmdb-ui/src/api/acl/resource.js diff --git a/ui/src/api/acl/role.js b/cmdb-ui/src/api/acl/role.js similarity index 100% rename from ui/src/api/acl/role.js rename to cmdb-ui/src/api/acl/role.js diff --git a/ui/src/api/acl/user.js b/cmdb-ui/src/api/acl/user.js similarity index 100% rename from ui/src/api/acl/user.js rename to cmdb-ui/src/api/acl/user.js diff --git a/ui/src/api/cmdb/CIRelation.js b/cmdb-ui/src/api/cmdb/CIRelation.js similarity index 100% rename from ui/src/api/cmdb/CIRelation.js rename to cmdb-ui/src/api/cmdb/CIRelation.js diff --git a/ui/src/api/cmdb/CIType.js b/cmdb-ui/src/api/cmdb/CIType.js similarity index 100% rename from ui/src/api/cmdb/CIType.js rename to cmdb-ui/src/api/cmdb/CIType.js diff --git a/ui/src/api/cmdb/CITypeAttr.js b/cmdb-ui/src/api/cmdb/CITypeAttr.js similarity index 100% rename from ui/src/api/cmdb/CITypeAttr.js rename to cmdb-ui/src/api/cmdb/CITypeAttr.js diff --git a/ui/src/api/cmdb/CITypeRelation.js b/cmdb-ui/src/api/cmdb/CITypeRelation.js similarity index 100% rename from ui/src/api/cmdb/CITypeRelation.js rename to cmdb-ui/src/api/cmdb/CITypeRelation.js diff --git a/ui/src/api/cmdb/batch.js b/cmdb-ui/src/api/cmdb/batch.js similarity index 100% rename from ui/src/api/cmdb/batch.js rename to cmdb-ui/src/api/cmdb/batch.js diff --git a/ui/src/api/cmdb/ci.js b/cmdb-ui/src/api/cmdb/ci.js similarity index 100% rename from ui/src/api/cmdb/ci.js rename to cmdb-ui/src/api/cmdb/ci.js diff --git a/ui/src/api/cmdb/history.js b/cmdb-ui/src/api/cmdb/history.js similarity index 100% rename from ui/src/api/cmdb/history.js rename to cmdb-ui/src/api/cmdb/history.js diff --git a/ui/src/api/cmdb/preference.js b/cmdb-ui/src/api/cmdb/preference.js similarity index 100% rename from ui/src/api/cmdb/preference.js rename to cmdb-ui/src/api/cmdb/preference.js diff --git a/ui/src/api/cmdb/relationType.js b/cmdb-ui/src/api/cmdb/relationType.js similarity index 100% rename from ui/src/api/cmdb/relationType.js rename to cmdb-ui/src/api/cmdb/relationType.js diff --git a/ui/src/api/index.js b/cmdb-ui/src/api/index.js similarity index 100% rename from ui/src/api/index.js rename to cmdb-ui/src/api/index.js diff --git a/ui/src/api/login.js b/cmdb-ui/src/api/login.js similarity index 100% rename from ui/src/api/login.js rename to cmdb-ui/src/api/login.js diff --git a/ui/src/api/manage.js b/cmdb-ui/src/api/manage.js similarity index 100% rename from ui/src/api/manage.js rename to cmdb-ui/src/api/manage.js diff --git a/ui/src/assets/background.svg b/cmdb-ui/src/assets/background.svg similarity index 100% rename from ui/src/assets/background.svg rename to cmdb-ui/src/assets/background.svg diff --git a/ui/src/assets/icons/bx-analyse.svg b/cmdb-ui/src/assets/icons/bx-analyse.svg similarity index 100% rename from ui/src/assets/icons/bx-analyse.svg rename to cmdb-ui/src/assets/icons/bx-analyse.svg diff --git a/ui/src/assets/logo.png b/cmdb-ui/src/assets/logo.png similarity index 100% rename from ui/src/assets/logo.png rename to cmdb-ui/src/assets/logo.png diff --git a/ui/src/assets/logo.svg b/cmdb-ui/src/assets/logo.svg similarity index 100% rename from ui/src/assets/logo.svg rename to cmdb-ui/src/assets/logo.svg diff --git a/ui/src/components/ArticleListContent/ArticleListContent.vue b/cmdb-ui/src/components/ArticleListContent/ArticleListContent.vue similarity index 100% rename from ui/src/components/ArticleListContent/ArticleListContent.vue rename to cmdb-ui/src/components/ArticleListContent/ArticleListContent.vue diff --git a/ui/src/components/ArticleListContent/index.js b/cmdb-ui/src/components/ArticleListContent/index.js similarity index 100% rename from ui/src/components/ArticleListContent/index.js rename to cmdb-ui/src/components/ArticleListContent/index.js diff --git a/ui/src/components/AvatarList/Item.vue b/cmdb-ui/src/components/AvatarList/Item.vue similarity index 100% rename from ui/src/components/AvatarList/Item.vue rename to cmdb-ui/src/components/AvatarList/Item.vue diff --git a/ui/src/components/AvatarList/List.vue b/cmdb-ui/src/components/AvatarList/List.vue similarity index 100% rename from ui/src/components/AvatarList/List.vue rename to cmdb-ui/src/components/AvatarList/List.vue diff --git a/ui/src/components/AvatarList/index.js b/cmdb-ui/src/components/AvatarList/index.js similarity index 100% rename from ui/src/components/AvatarList/index.js rename to cmdb-ui/src/components/AvatarList/index.js diff --git a/ui/src/components/AvatarList/index.less b/cmdb-ui/src/components/AvatarList/index.less similarity index 100% rename from ui/src/components/AvatarList/index.less rename to cmdb-ui/src/components/AvatarList/index.less diff --git a/ui/src/components/AvatarList/index.md b/cmdb-ui/src/components/AvatarList/index.md similarity index 100% rename from ui/src/components/AvatarList/index.md rename to cmdb-ui/src/components/AvatarList/index.md diff --git a/ui/src/components/Charts/Bar.vue b/cmdb-ui/src/components/Charts/Bar.vue similarity index 100% rename from ui/src/components/Charts/Bar.vue rename to cmdb-ui/src/components/Charts/Bar.vue diff --git a/ui/src/components/Charts/ChartCard.vue b/cmdb-ui/src/components/Charts/ChartCard.vue similarity index 100% rename from ui/src/components/Charts/ChartCard.vue rename to cmdb-ui/src/components/Charts/ChartCard.vue diff --git a/ui/src/components/Charts/Liquid.vue b/cmdb-ui/src/components/Charts/Liquid.vue similarity index 100% rename from ui/src/components/Charts/Liquid.vue rename to cmdb-ui/src/components/Charts/Liquid.vue diff --git a/ui/src/components/Charts/MiniArea.vue b/cmdb-ui/src/components/Charts/MiniArea.vue similarity index 100% rename from ui/src/components/Charts/MiniArea.vue rename to cmdb-ui/src/components/Charts/MiniArea.vue diff --git a/ui/src/components/Charts/MiniBar.vue b/cmdb-ui/src/components/Charts/MiniBar.vue similarity index 100% rename from ui/src/components/Charts/MiniBar.vue rename to cmdb-ui/src/components/Charts/MiniBar.vue diff --git a/ui/src/components/Charts/MiniProgress.vue b/cmdb-ui/src/components/Charts/MiniProgress.vue similarity index 100% rename from ui/src/components/Charts/MiniProgress.vue rename to cmdb-ui/src/components/Charts/MiniProgress.vue diff --git a/ui/src/components/Charts/MiniSmoothArea.vue b/cmdb-ui/src/components/Charts/MiniSmoothArea.vue similarity index 100% rename from ui/src/components/Charts/MiniSmoothArea.vue rename to cmdb-ui/src/components/Charts/MiniSmoothArea.vue diff --git a/ui/src/components/Charts/Radar.vue b/cmdb-ui/src/components/Charts/Radar.vue similarity index 100% rename from ui/src/components/Charts/Radar.vue rename to cmdb-ui/src/components/Charts/Radar.vue diff --git a/ui/src/components/Charts/RankList.vue b/cmdb-ui/src/components/Charts/RankList.vue similarity index 100% rename from ui/src/components/Charts/RankList.vue rename to cmdb-ui/src/components/Charts/RankList.vue diff --git a/ui/src/components/Charts/TagCloud.vue b/cmdb-ui/src/components/Charts/TagCloud.vue similarity index 100% rename from ui/src/components/Charts/TagCloud.vue rename to cmdb-ui/src/components/Charts/TagCloud.vue diff --git a/ui/src/components/Charts/TransferBar.vue b/cmdb-ui/src/components/Charts/TransferBar.vue similarity index 100% rename from ui/src/components/Charts/TransferBar.vue rename to cmdb-ui/src/components/Charts/TransferBar.vue diff --git a/ui/src/components/Charts/Trend.vue b/cmdb-ui/src/components/Charts/Trend.vue similarity index 100% rename from ui/src/components/Charts/Trend.vue rename to cmdb-ui/src/components/Charts/Trend.vue diff --git a/ui/src/components/Charts/chart.less b/cmdb-ui/src/components/Charts/chart.less similarity index 100% rename from ui/src/components/Charts/chart.less rename to cmdb-ui/src/components/Charts/chart.less diff --git a/ui/src/components/Charts/smooth.area.less b/cmdb-ui/src/components/Charts/smooth.area.less similarity index 100% rename from ui/src/components/Charts/smooth.area.less rename to cmdb-ui/src/components/Charts/smooth.area.less diff --git a/ui/src/components/CountDown/CountDown.vue b/cmdb-ui/src/components/CountDown/CountDown.vue similarity index 100% rename from ui/src/components/CountDown/CountDown.vue rename to cmdb-ui/src/components/CountDown/CountDown.vue diff --git a/ui/src/components/CountDown/index.js b/cmdb-ui/src/components/CountDown/index.js similarity index 100% rename from ui/src/components/CountDown/index.js rename to cmdb-ui/src/components/CountDown/index.js diff --git a/ui/src/components/CountDown/index.md b/cmdb-ui/src/components/CountDown/index.md similarity index 100% rename from ui/src/components/CountDown/index.md rename to cmdb-ui/src/components/CountDown/index.md diff --git a/ui/src/components/DescriptionList/DescriptionList.vue b/cmdb-ui/src/components/DescriptionList/DescriptionList.vue similarity index 100% rename from ui/src/components/DescriptionList/DescriptionList.vue rename to cmdb-ui/src/components/DescriptionList/DescriptionList.vue diff --git a/ui/src/components/DescriptionList/index.js b/cmdb-ui/src/components/DescriptionList/index.js similarity index 100% rename from ui/src/components/DescriptionList/index.js rename to cmdb-ui/src/components/DescriptionList/index.js diff --git a/ui/src/components/Editor/QuillEditor.vue b/cmdb-ui/src/components/Editor/QuillEditor.vue similarity index 100% rename from ui/src/components/Editor/QuillEditor.vue rename to cmdb-ui/src/components/Editor/QuillEditor.vue diff --git a/ui/src/components/Editor/WangEditor.vue b/cmdb-ui/src/components/Editor/WangEditor.vue similarity index 100% rename from ui/src/components/Editor/WangEditor.vue rename to cmdb-ui/src/components/Editor/WangEditor.vue diff --git a/ui/src/components/Ellipsis/Ellipsis.vue b/cmdb-ui/src/components/Ellipsis/Ellipsis.vue similarity index 100% rename from ui/src/components/Ellipsis/Ellipsis.vue rename to cmdb-ui/src/components/Ellipsis/Ellipsis.vue diff --git a/ui/src/components/Ellipsis/index.js b/cmdb-ui/src/components/Ellipsis/index.js similarity index 100% rename from ui/src/components/Ellipsis/index.js rename to cmdb-ui/src/components/Ellipsis/index.js diff --git a/ui/src/components/Ellipsis/index.md b/cmdb-ui/src/components/Ellipsis/index.md similarity index 100% rename from ui/src/components/Ellipsis/index.md rename to cmdb-ui/src/components/Ellipsis/index.md diff --git a/ui/src/components/Exception/ExceptionPage.vue b/cmdb-ui/src/components/Exception/ExceptionPage.vue similarity index 100% rename from ui/src/components/Exception/ExceptionPage.vue rename to cmdb-ui/src/components/Exception/ExceptionPage.vue diff --git a/ui/src/components/Exception/index.js b/cmdb-ui/src/components/Exception/index.js similarity index 100% rename from ui/src/components/Exception/index.js rename to cmdb-ui/src/components/Exception/index.js diff --git a/ui/src/components/Exception/type.js b/cmdb-ui/src/components/Exception/type.js similarity index 100% rename from ui/src/components/Exception/type.js rename to cmdb-ui/src/components/Exception/type.js diff --git a/ui/src/components/FooterToolbar/FooterToolBar.vue b/cmdb-ui/src/components/FooterToolbar/FooterToolBar.vue similarity index 100% rename from ui/src/components/FooterToolbar/FooterToolBar.vue rename to cmdb-ui/src/components/FooterToolbar/FooterToolBar.vue diff --git a/ui/src/components/FooterToolbar/index.js b/cmdb-ui/src/components/FooterToolbar/index.js similarity index 100% rename from ui/src/components/FooterToolbar/index.js rename to cmdb-ui/src/components/FooterToolbar/index.js diff --git a/ui/src/components/FooterToolbar/index.less b/cmdb-ui/src/components/FooterToolbar/index.less similarity index 100% rename from ui/src/components/FooterToolbar/index.less rename to cmdb-ui/src/components/FooterToolbar/index.less diff --git a/ui/src/components/FooterToolbar/index.md b/cmdb-ui/src/components/FooterToolbar/index.md similarity index 100% rename from ui/src/components/FooterToolbar/index.md rename to cmdb-ui/src/components/FooterToolbar/index.md diff --git a/ui/src/components/GlobalFooter/GlobalFooter.vue b/cmdb-ui/src/components/GlobalFooter/GlobalFooter.vue similarity index 100% rename from ui/src/components/GlobalFooter/GlobalFooter.vue rename to cmdb-ui/src/components/GlobalFooter/GlobalFooter.vue diff --git a/ui/src/components/GlobalFooter/index.js b/cmdb-ui/src/components/GlobalFooter/index.js similarity index 100% rename from ui/src/components/GlobalFooter/index.js rename to cmdb-ui/src/components/GlobalFooter/index.js diff --git a/ui/src/components/GlobalHeader/GlobalHeader.vue b/cmdb-ui/src/components/GlobalHeader/GlobalHeader.vue similarity index 100% rename from ui/src/components/GlobalHeader/GlobalHeader.vue rename to cmdb-ui/src/components/GlobalHeader/GlobalHeader.vue diff --git a/ui/src/components/GlobalHeader/index.js b/cmdb-ui/src/components/GlobalHeader/index.js similarity index 100% rename from ui/src/components/GlobalHeader/index.js rename to cmdb-ui/src/components/GlobalHeader/index.js diff --git a/ui/src/components/IconSelector/IconSelector.vue b/cmdb-ui/src/components/IconSelector/IconSelector.vue similarity index 100% rename from ui/src/components/IconSelector/IconSelector.vue rename to cmdb-ui/src/components/IconSelector/IconSelector.vue diff --git a/ui/src/components/IconSelector/README.md b/cmdb-ui/src/components/IconSelector/README.md similarity index 100% rename from ui/src/components/IconSelector/README.md rename to cmdb-ui/src/components/IconSelector/README.md diff --git a/ui/src/components/IconSelector/icons.js b/cmdb-ui/src/components/IconSelector/icons.js similarity index 100% rename from ui/src/components/IconSelector/icons.js rename to cmdb-ui/src/components/IconSelector/icons.js diff --git a/ui/src/components/IconSelector/index.js b/cmdb-ui/src/components/IconSelector/index.js similarity index 100% rename from ui/src/components/IconSelector/index.js rename to cmdb-ui/src/components/IconSelector/index.js diff --git a/ui/src/components/Menu/SideMenu.vue b/cmdb-ui/src/components/Menu/SideMenu.vue similarity index 100% rename from ui/src/components/Menu/SideMenu.vue rename to cmdb-ui/src/components/Menu/SideMenu.vue diff --git a/ui/src/components/Menu/index.js b/cmdb-ui/src/components/Menu/index.js similarity index 100% rename from ui/src/components/Menu/index.js rename to cmdb-ui/src/components/Menu/index.js diff --git a/ui/src/components/Menu/menu.js b/cmdb-ui/src/components/Menu/menu.js similarity index 100% rename from ui/src/components/Menu/menu.js rename to cmdb-ui/src/components/Menu/menu.js diff --git a/ui/src/components/MultiTab/MultiTab.vue b/cmdb-ui/src/components/MultiTab/MultiTab.vue similarity index 100% rename from ui/src/components/MultiTab/MultiTab.vue rename to cmdb-ui/src/components/MultiTab/MultiTab.vue diff --git a/ui/src/components/MultiTab/index.js b/cmdb-ui/src/components/MultiTab/index.js similarity index 100% rename from ui/src/components/MultiTab/index.js rename to cmdb-ui/src/components/MultiTab/index.js diff --git a/ui/src/components/MultiTab/index.less b/cmdb-ui/src/components/MultiTab/index.less similarity index 100% rename from ui/src/components/MultiTab/index.less rename to cmdb-ui/src/components/MultiTab/index.less diff --git a/ui/src/components/NoticeIcon/NoticeIcon.vue b/cmdb-ui/src/components/NoticeIcon/NoticeIcon.vue similarity index 100% rename from ui/src/components/NoticeIcon/NoticeIcon.vue rename to cmdb-ui/src/components/NoticeIcon/NoticeIcon.vue diff --git a/ui/src/components/NoticeIcon/index.js b/cmdb-ui/src/components/NoticeIcon/index.js similarity index 100% rename from ui/src/components/NoticeIcon/index.js rename to cmdb-ui/src/components/NoticeIcon/index.js diff --git a/ui/src/components/NumberInfo/NumberInfo.vue b/cmdb-ui/src/components/NumberInfo/NumberInfo.vue similarity index 100% rename from ui/src/components/NumberInfo/NumberInfo.vue rename to cmdb-ui/src/components/NumberInfo/NumberInfo.vue diff --git a/ui/src/components/NumberInfo/index.js b/cmdb-ui/src/components/NumberInfo/index.js similarity index 100% rename from ui/src/components/NumberInfo/index.js rename to cmdb-ui/src/components/NumberInfo/index.js diff --git a/ui/src/components/NumberInfo/index.less b/cmdb-ui/src/components/NumberInfo/index.less similarity index 100% rename from ui/src/components/NumberInfo/index.less rename to cmdb-ui/src/components/NumberInfo/index.less diff --git a/ui/src/components/NumberInfo/index.md b/cmdb-ui/src/components/NumberInfo/index.md similarity index 100% rename from ui/src/components/NumberInfo/index.md rename to cmdb-ui/src/components/NumberInfo/index.md diff --git a/ui/src/components/PageHeader/PageHeader.vue b/cmdb-ui/src/components/PageHeader/PageHeader.vue similarity index 100% rename from ui/src/components/PageHeader/PageHeader.vue rename to cmdb-ui/src/components/PageHeader/PageHeader.vue diff --git a/ui/src/components/PageHeader/index.js b/cmdb-ui/src/components/PageHeader/index.js similarity index 100% rename from ui/src/components/PageHeader/index.js rename to cmdb-ui/src/components/PageHeader/index.js diff --git a/ui/src/components/PageLoading/index.jsx b/cmdb-ui/src/components/PageLoading/index.jsx similarity index 100% rename from ui/src/components/PageLoading/index.jsx rename to cmdb-ui/src/components/PageLoading/index.jsx diff --git a/ui/src/components/Result/Result.vue b/cmdb-ui/src/components/Result/Result.vue similarity index 100% rename from ui/src/components/Result/Result.vue rename to cmdb-ui/src/components/Result/Result.vue diff --git a/ui/src/components/Result/index.js b/cmdb-ui/src/components/Result/index.js similarity index 100% rename from ui/src/components/Result/index.js rename to cmdb-ui/src/components/Result/index.js diff --git a/ui/src/components/SettingDrawer/SettingDrawer.vue b/cmdb-ui/src/components/SettingDrawer/SettingDrawer.vue similarity index 100% rename from ui/src/components/SettingDrawer/SettingDrawer.vue rename to cmdb-ui/src/components/SettingDrawer/SettingDrawer.vue diff --git a/ui/src/components/SettingDrawer/SettingItem.vue b/cmdb-ui/src/components/SettingDrawer/SettingItem.vue similarity index 100% rename from ui/src/components/SettingDrawer/SettingItem.vue rename to cmdb-ui/src/components/SettingDrawer/SettingItem.vue diff --git a/ui/src/components/SettingDrawer/index.js b/cmdb-ui/src/components/SettingDrawer/index.js similarity index 100% rename from ui/src/components/SettingDrawer/index.js rename to cmdb-ui/src/components/SettingDrawer/index.js diff --git a/ui/src/components/SettingDrawer/settingConfig.js b/cmdb-ui/src/components/SettingDrawer/settingConfig.js similarity index 100% rename from ui/src/components/SettingDrawer/settingConfig.js rename to cmdb-ui/src/components/SettingDrawer/settingConfig.js diff --git a/ui/src/components/SettingDrawer/themeColor.js b/cmdb-ui/src/components/SettingDrawer/themeColor.js similarity index 100% rename from ui/src/components/SettingDrawer/themeColor.js rename to cmdb-ui/src/components/SettingDrawer/themeColor.js diff --git a/ui/src/components/StandardFormRow/StandardFormRow.vue b/cmdb-ui/src/components/StandardFormRow/StandardFormRow.vue similarity index 100% rename from ui/src/components/StandardFormRow/StandardFormRow.vue rename to cmdb-ui/src/components/StandardFormRow/StandardFormRow.vue diff --git a/ui/src/components/StandardFormRow/index.js b/cmdb-ui/src/components/StandardFormRow/index.js similarity index 100% rename from ui/src/components/StandardFormRow/index.js rename to cmdb-ui/src/components/StandardFormRow/index.js diff --git a/ui/src/components/Table/README.md b/cmdb-ui/src/components/Table/README.md similarity index 100% rename from ui/src/components/Table/README.md rename to cmdb-ui/src/components/Table/README.md diff --git a/ui/src/components/Table/index.js b/cmdb-ui/src/components/Table/index.js similarity index 100% rename from ui/src/components/Table/index.js rename to cmdb-ui/src/components/Table/index.js diff --git a/ui/src/components/TagSelect/TagSelectOption.jsx b/cmdb-ui/src/components/TagSelect/TagSelectOption.jsx similarity index 100% rename from ui/src/components/TagSelect/TagSelectOption.jsx rename to cmdb-ui/src/components/TagSelect/TagSelectOption.jsx diff --git a/ui/src/components/TagSelect/index.jsx b/cmdb-ui/src/components/TagSelect/index.jsx similarity index 100% rename from ui/src/components/TagSelect/index.jsx rename to cmdb-ui/src/components/TagSelect/index.jsx diff --git a/ui/src/components/Tree/Tree.jsx b/cmdb-ui/src/components/Tree/Tree.jsx similarity index 100% rename from ui/src/components/Tree/Tree.jsx rename to cmdb-ui/src/components/Tree/Tree.jsx diff --git a/ui/src/components/Trend/Trend.vue b/cmdb-ui/src/components/Trend/Trend.vue similarity index 100% rename from ui/src/components/Trend/Trend.vue rename to cmdb-ui/src/components/Trend/Trend.vue diff --git a/ui/src/components/Trend/index.js b/cmdb-ui/src/components/Trend/index.js similarity index 100% rename from ui/src/components/Trend/index.js rename to cmdb-ui/src/components/Trend/index.js diff --git a/ui/src/components/Trend/index.less b/cmdb-ui/src/components/Trend/index.less similarity index 100% rename from ui/src/components/Trend/index.less rename to cmdb-ui/src/components/Trend/index.less diff --git a/ui/src/components/Trend/index.md b/cmdb-ui/src/components/Trend/index.md similarity index 100% rename from ui/src/components/Trend/index.md rename to cmdb-ui/src/components/Trend/index.md diff --git a/ui/src/components/_util/util.js b/cmdb-ui/src/components/_util/util.js similarity index 100% rename from ui/src/components/_util/util.js rename to cmdb-ui/src/components/_util/util.js diff --git a/ui/src/components/global.less b/cmdb-ui/src/components/global.less similarity index 100% rename from ui/src/components/global.less rename to cmdb-ui/src/components/global.less diff --git a/ui/src/components/index.js b/cmdb-ui/src/components/index.js similarity index 100% rename from ui/src/components/index.js rename to cmdb-ui/src/components/index.js diff --git a/ui/src/components/index.less b/cmdb-ui/src/components/index.less similarity index 100% rename from ui/src/components/index.less rename to cmdb-ui/src/components/index.less diff --git a/ui/src/components/tools/Breadcrumb.vue b/cmdb-ui/src/components/tools/Breadcrumb.vue similarity index 100% rename from ui/src/components/tools/Breadcrumb.vue rename to cmdb-ui/src/components/tools/Breadcrumb.vue diff --git a/ui/src/components/tools/DetailList.vue b/cmdb-ui/src/components/tools/DetailList.vue similarity index 100% rename from ui/src/components/tools/DetailList.vue rename to cmdb-ui/src/components/tools/DetailList.vue diff --git a/ui/src/components/tools/HeadInfo.vue b/cmdb-ui/src/components/tools/HeadInfo.vue similarity index 100% rename from ui/src/components/tools/HeadInfo.vue rename to cmdb-ui/src/components/tools/HeadInfo.vue diff --git a/ui/src/components/tools/Logo.vue b/cmdb-ui/src/components/tools/Logo.vue similarity index 100% rename from ui/src/components/tools/Logo.vue rename to cmdb-ui/src/components/tools/Logo.vue diff --git a/ui/src/components/tools/TopMenu.vue b/cmdb-ui/src/components/tools/TopMenu.vue similarity index 100% rename from ui/src/components/tools/TopMenu.vue rename to cmdb-ui/src/components/tools/TopMenu.vue diff --git a/ui/src/components/tools/TwoStepCaptcha.vue b/cmdb-ui/src/components/tools/TwoStepCaptcha.vue similarity index 100% rename from ui/src/components/tools/TwoStepCaptcha.vue rename to cmdb-ui/src/components/tools/TwoStepCaptcha.vue diff --git a/ui/src/components/tools/UserMenu.vue b/cmdb-ui/src/components/tools/UserMenu.vue similarity index 100% rename from ui/src/components/tools/UserMenu.vue rename to cmdb-ui/src/components/tools/UserMenu.vue diff --git a/ui/src/components/tools/index.js b/cmdb-ui/src/components/tools/index.js similarity index 100% rename from ui/src/components/tools/index.js rename to cmdb-ui/src/components/tools/index.js diff --git a/ui/src/config/defaultSettings.js b/cmdb-ui/src/config/defaultSettings.js similarity index 100% rename from ui/src/config/defaultSettings.js rename to cmdb-ui/src/config/defaultSettings.js diff --git a/ui/src/config/router.config.js b/cmdb-ui/src/config/router.config.js similarity index 100% rename from ui/src/config/router.config.js rename to cmdb-ui/src/config/router.config.js diff --git a/ui/src/core/bootstrap.js b/cmdb-ui/src/core/bootstrap.js similarity index 100% rename from ui/src/core/bootstrap.js rename to cmdb-ui/src/core/bootstrap.js diff --git a/ui/src/core/directives/action.js b/cmdb-ui/src/core/directives/action.js similarity index 100% rename from ui/src/core/directives/action.js rename to cmdb-ui/src/core/directives/action.js diff --git a/ui/src/core/icons.js b/cmdb-ui/src/core/icons.js similarity index 100% rename from ui/src/core/icons.js rename to cmdb-ui/src/core/icons.js diff --git a/ui/src/core/lazy_lib/components_use.js b/cmdb-ui/src/core/lazy_lib/components_use.js similarity index 100% rename from ui/src/core/lazy_lib/components_use.js rename to cmdb-ui/src/core/lazy_lib/components_use.js diff --git a/ui/src/core/lazy_use.js b/cmdb-ui/src/core/lazy_use.js similarity index 100% rename from ui/src/core/lazy_use.js rename to cmdb-ui/src/core/lazy_use.js diff --git a/ui/src/core/use.js b/cmdb-ui/src/core/use.js similarity index 100% rename from ui/src/core/use.js rename to cmdb-ui/src/core/use.js diff --git a/ui/src/layouts/BasicLayout.vue b/cmdb-ui/src/layouts/BasicLayout.vue similarity index 100% rename from ui/src/layouts/BasicLayout.vue rename to cmdb-ui/src/layouts/BasicLayout.vue diff --git a/ui/src/layouts/BlankLayout.vue b/cmdb-ui/src/layouts/BlankLayout.vue similarity index 100% rename from ui/src/layouts/BlankLayout.vue rename to cmdb-ui/src/layouts/BlankLayout.vue diff --git a/ui/src/layouts/PageView.vue b/cmdb-ui/src/layouts/PageView.vue similarity index 100% rename from ui/src/layouts/PageView.vue rename to cmdb-ui/src/layouts/PageView.vue diff --git a/ui/src/layouts/RouteView.vue b/cmdb-ui/src/layouts/RouteView.vue similarity index 100% rename from ui/src/layouts/RouteView.vue rename to cmdb-ui/src/layouts/RouteView.vue diff --git a/ui/src/layouts/UserLayout.vue b/cmdb-ui/src/layouts/UserLayout.vue similarity index 100% rename from ui/src/layouts/UserLayout.vue rename to cmdb-ui/src/layouts/UserLayout.vue diff --git a/ui/src/layouts/index.js b/cmdb-ui/src/layouts/index.js similarity index 100% rename from ui/src/layouts/index.js rename to cmdb-ui/src/layouts/index.js diff --git a/ui/src/main.js b/cmdb-ui/src/main.js similarity index 100% rename from ui/src/main.js rename to cmdb-ui/src/main.js diff --git a/ui/src/permission.js b/cmdb-ui/src/permission.js similarity index 100% rename from ui/src/permission.js rename to cmdb-ui/src/permission.js diff --git a/ui/src/router/README.md b/cmdb-ui/src/router/README.md similarity index 100% rename from ui/src/router/README.md rename to cmdb-ui/src/router/README.md diff --git a/ui/src/router/index.js b/cmdb-ui/src/router/index.js similarity index 100% rename from ui/src/router/index.js rename to cmdb-ui/src/router/index.js diff --git a/ui/src/store/getters.js b/cmdb-ui/src/store/getters.js similarity index 100% rename from ui/src/store/getters.js rename to cmdb-ui/src/store/getters.js diff --git a/ui/src/store/index.js b/cmdb-ui/src/store/index.js similarity index 100% rename from ui/src/store/index.js rename to cmdb-ui/src/store/index.js diff --git a/ui/src/store/modules/app.js b/cmdb-ui/src/store/modules/app.js similarity index 100% rename from ui/src/store/modules/app.js rename to cmdb-ui/src/store/modules/app.js diff --git a/ui/src/store/modules/permission.js b/cmdb-ui/src/store/modules/permission.js similarity index 100% rename from ui/src/store/modules/permission.js rename to cmdb-ui/src/store/modules/permission.js diff --git a/ui/src/store/modules/user.js b/cmdb-ui/src/store/modules/user.js similarity index 100% rename from ui/src/store/modules/user.js rename to cmdb-ui/src/store/modules/user.js diff --git a/ui/src/store/mutation-types.js b/cmdb-ui/src/store/mutation-types.js similarity index 100% rename from ui/src/store/mutation-types.js rename to cmdb-ui/src/store/mutation-types.js diff --git a/ui/src/utils/axios.js b/cmdb-ui/src/utils/axios.js similarity index 100% rename from ui/src/utils/axios.js rename to cmdb-ui/src/utils/axios.js diff --git a/ui/src/utils/device.js b/cmdb-ui/src/utils/device.js similarity index 100% rename from ui/src/utils/device.js rename to cmdb-ui/src/utils/device.js diff --git a/ui/src/utils/domUtil.js b/cmdb-ui/src/utils/domUtil.js similarity index 100% rename from ui/src/utils/domUtil.js rename to cmdb-ui/src/utils/domUtil.js diff --git a/ui/src/utils/filter.js b/cmdb-ui/src/utils/filter.js similarity index 100% rename from ui/src/utils/filter.js rename to cmdb-ui/src/utils/filter.js diff --git a/ui/src/utils/helper/permission.js b/cmdb-ui/src/utils/helper/permission.js similarity index 100% rename from ui/src/utils/helper/permission.js rename to cmdb-ui/src/utils/helper/permission.js diff --git a/ui/src/utils/mixin.js b/cmdb-ui/src/utils/mixin.js similarity index 100% rename from ui/src/utils/mixin.js rename to cmdb-ui/src/utils/mixin.js diff --git a/ui/src/utils/permissions.js b/cmdb-ui/src/utils/permissions.js similarity index 100% rename from ui/src/utils/permissions.js rename to cmdb-ui/src/utils/permissions.js diff --git a/ui/src/utils/request.js b/cmdb-ui/src/utils/request.js similarity index 100% rename from ui/src/utils/request.js rename to cmdb-ui/src/utils/request.js diff --git a/ui/src/utils/util.js b/cmdb-ui/src/utils/util.js similarity index 100% rename from ui/src/utils/util.js rename to cmdb-ui/src/utils/util.js diff --git a/ui/src/utils/utils.less b/cmdb-ui/src/utils/utils.less similarity index 100% rename from ui/src/utils/utils.less rename to cmdb-ui/src/utils/utils.less diff --git a/ui/src/views/404.vue b/cmdb-ui/src/views/404.vue similarity index 100% rename from ui/src/views/404.vue rename to cmdb-ui/src/views/404.vue diff --git a/ui/src/views/account/center/Index.vue b/cmdb-ui/src/views/account/center/Index.vue similarity index 100% rename from ui/src/views/account/center/Index.vue rename to cmdb-ui/src/views/account/center/Index.vue diff --git a/ui/src/views/account/center/page/App.vue b/cmdb-ui/src/views/account/center/page/App.vue similarity index 100% rename from ui/src/views/account/center/page/App.vue rename to cmdb-ui/src/views/account/center/page/App.vue diff --git a/ui/src/views/account/center/page/Article.vue b/cmdb-ui/src/views/account/center/page/Article.vue similarity index 100% rename from ui/src/views/account/center/page/Article.vue rename to cmdb-ui/src/views/account/center/page/Article.vue diff --git a/ui/src/views/account/center/page/Project.vue b/cmdb-ui/src/views/account/center/page/Project.vue similarity index 100% rename from ui/src/views/account/center/page/Project.vue rename to cmdb-ui/src/views/account/center/page/Project.vue diff --git a/ui/src/views/account/center/page/index.js b/cmdb-ui/src/views/account/center/page/index.js similarity index 100% rename from ui/src/views/account/center/page/index.js rename to cmdb-ui/src/views/account/center/page/index.js diff --git a/ui/src/views/account/settings/AvatarModal.vue b/cmdb-ui/src/views/account/settings/AvatarModal.vue similarity index 100% rename from ui/src/views/account/settings/AvatarModal.vue rename to cmdb-ui/src/views/account/settings/AvatarModal.vue diff --git a/ui/src/views/account/settings/BaseSetting.vue b/cmdb-ui/src/views/account/settings/BaseSetting.vue similarity index 100% rename from ui/src/views/account/settings/BaseSetting.vue rename to cmdb-ui/src/views/account/settings/BaseSetting.vue diff --git a/ui/src/views/account/settings/Binding.vue b/cmdb-ui/src/views/account/settings/Binding.vue similarity index 100% rename from ui/src/views/account/settings/Binding.vue rename to cmdb-ui/src/views/account/settings/Binding.vue diff --git a/ui/src/views/account/settings/Custom.vue b/cmdb-ui/src/views/account/settings/Custom.vue similarity index 100% rename from ui/src/views/account/settings/Custom.vue rename to cmdb-ui/src/views/account/settings/Custom.vue diff --git a/ui/src/views/account/settings/Index.vue b/cmdb-ui/src/views/account/settings/Index.vue similarity index 100% rename from ui/src/views/account/settings/Index.vue rename to cmdb-ui/src/views/account/settings/Index.vue diff --git a/ui/src/views/account/settings/Notification.vue b/cmdb-ui/src/views/account/settings/Notification.vue similarity index 100% rename from ui/src/views/account/settings/Notification.vue rename to cmdb-ui/src/views/account/settings/Notification.vue diff --git a/ui/src/views/account/settings/Security.vue b/cmdb-ui/src/views/account/settings/Security.vue similarity index 100% rename from ui/src/views/account/settings/Security.vue rename to cmdb-ui/src/views/account/settings/Security.vue diff --git a/ui/src/views/acl/module/addRoleRelationForm.vue b/cmdb-ui/src/views/acl/module/addRoleRelationForm.vue similarity index 100% rename from ui/src/views/acl/module/addRoleRelationForm.vue rename to cmdb-ui/src/views/acl/module/addRoleRelationForm.vue diff --git a/ui/src/views/acl/module/permissionForm.vue b/cmdb-ui/src/views/acl/module/permissionForm.vue similarity index 100% rename from ui/src/views/acl/module/permissionForm.vue rename to cmdb-ui/src/views/acl/module/permissionForm.vue diff --git a/ui/src/views/acl/module/resourceForm.vue b/cmdb-ui/src/views/acl/module/resourceForm.vue similarity index 100% rename from ui/src/views/acl/module/resourceForm.vue rename to cmdb-ui/src/views/acl/module/resourceForm.vue diff --git a/ui/src/views/acl/module/resourcePermForm.vue b/cmdb-ui/src/views/acl/module/resourcePermForm.vue similarity index 100% rename from ui/src/views/acl/module/resourcePermForm.vue rename to cmdb-ui/src/views/acl/module/resourcePermForm.vue diff --git a/ui/src/views/acl/module/resourcePermManageForm.vue b/cmdb-ui/src/views/acl/module/resourcePermManageForm.vue similarity index 100% rename from ui/src/views/acl/module/resourcePermManageForm.vue rename to cmdb-ui/src/views/acl/module/resourcePermManageForm.vue diff --git a/ui/src/views/acl/module/resourceTypeForm.vue b/cmdb-ui/src/views/acl/module/resourceTypeForm.vue similarity index 100% rename from ui/src/views/acl/module/resourceTypeForm.vue rename to cmdb-ui/src/views/acl/module/resourceTypeForm.vue diff --git a/ui/src/views/acl/module/roleForm.vue b/cmdb-ui/src/views/acl/module/roleForm.vue similarity index 100% rename from ui/src/views/acl/module/roleForm.vue rename to cmdb-ui/src/views/acl/module/roleForm.vue diff --git a/ui/src/views/acl/module/userForm.vue b/cmdb-ui/src/views/acl/module/userForm.vue similarity index 100% rename from ui/src/views/acl/module/userForm.vue rename to cmdb-ui/src/views/acl/module/userForm.vue diff --git a/ui/src/views/acl/permissions.vue b/cmdb-ui/src/views/acl/permissions.vue similarity index 100% rename from ui/src/views/acl/permissions.vue rename to cmdb-ui/src/views/acl/permissions.vue diff --git a/ui/src/views/acl/resource_types.vue b/cmdb-ui/src/views/acl/resource_types.vue similarity index 100% rename from ui/src/views/acl/resource_types.vue rename to cmdb-ui/src/views/acl/resource_types.vue diff --git a/ui/src/views/acl/resources.vue b/cmdb-ui/src/views/acl/resources.vue similarity index 100% rename from ui/src/views/acl/resources.vue rename to cmdb-ui/src/views/acl/resources.vue diff --git a/ui/src/views/acl/roles.vue b/cmdb-ui/src/views/acl/roles.vue similarity index 100% rename from ui/src/views/acl/roles.vue rename to cmdb-ui/src/views/acl/roles.vue diff --git a/ui/src/views/acl/users.vue b/cmdb-ui/src/views/acl/users.vue similarity index 100% rename from ui/src/views/acl/users.vue rename to cmdb-ui/src/views/acl/users.vue diff --git a/ui/src/views/cmdb/batch/index.vue b/cmdb-ui/src/views/cmdb/batch/index.vue similarity index 100% rename from ui/src/views/cmdb/batch/index.vue rename to cmdb-ui/src/views/cmdb/batch/index.vue diff --git a/ui/src/views/cmdb/batch/modules/CiTable.vue b/cmdb-ui/src/views/cmdb/batch/modules/CiTable.vue similarity index 100% rename from ui/src/views/cmdb/batch/modules/CiTable.vue rename to cmdb-ui/src/views/cmdb/batch/modules/CiTable.vue diff --git a/ui/src/views/cmdb/batch/modules/CiTypeChoice.vue b/cmdb-ui/src/views/cmdb/batch/modules/CiTypeChoice.vue similarity index 100% rename from ui/src/views/cmdb/batch/modules/CiTypeChoice.vue rename to cmdb-ui/src/views/cmdb/batch/modules/CiTypeChoice.vue diff --git a/ui/src/views/cmdb/batch/modules/UploadFileForm.vue b/cmdb-ui/src/views/cmdb/batch/modules/UploadFileForm.vue similarity index 100% rename from ui/src/views/cmdb/batch/modules/UploadFileForm.vue rename to cmdb-ui/src/views/cmdb/batch/modules/UploadFileForm.vue diff --git a/ui/src/views/cmdb/batch/modules/UploadResult.vue b/cmdb-ui/src/views/cmdb/batch/modules/UploadResult.vue similarity index 100% rename from ui/src/views/cmdb/batch/modules/UploadResult.vue rename to cmdb-ui/src/views/cmdb/batch/modules/UploadResult.vue diff --git a/ui/src/views/cmdb/ci/index.vue b/cmdb-ui/src/views/cmdb/ci/index.vue similarity index 100% rename from ui/src/views/cmdb/ci/index.vue rename to cmdb-ui/src/views/cmdb/ci/index.vue diff --git a/ui/src/views/cmdb/ci/modules/CiDetail.vue b/cmdb-ui/src/views/cmdb/ci/modules/CiDetail.vue similarity index 100% rename from ui/src/views/cmdb/ci/modules/CiDetail.vue rename to cmdb-ui/src/views/cmdb/ci/modules/CiDetail.vue diff --git a/ui/src/views/cmdb/ci/modules/CreateInstanceForm.vue b/cmdb-ui/src/views/cmdb/ci/modules/CreateInstanceForm.vue similarity index 100% rename from ui/src/views/cmdb/ci/modules/CreateInstanceForm.vue rename to cmdb-ui/src/views/cmdb/ci/modules/CreateInstanceForm.vue diff --git a/ui/src/views/cmdb/ci/modules/EditableCell.vue b/cmdb-ui/src/views/cmdb/ci/modules/EditableCell.vue similarity index 100% rename from ui/src/views/cmdb/ci/modules/EditableCell.vue rename to cmdb-ui/src/views/cmdb/ci/modules/EditableCell.vue diff --git a/ui/src/views/cmdb/ci/modules/SearchForm.vue b/cmdb-ui/src/views/cmdb/ci/modules/SearchForm.vue similarity index 100% rename from ui/src/views/cmdb/ci/modules/SearchForm.vue rename to cmdb-ui/src/views/cmdb/ci/modules/SearchForm.vue diff --git a/ui/src/views/cmdb/modeling/attributes/index.vue b/cmdb-ui/src/views/cmdb/modeling/attributes/index.vue similarity index 100% rename from ui/src/views/cmdb/modeling/attributes/index.vue rename to cmdb-ui/src/views/cmdb/modeling/attributes/index.vue diff --git a/ui/src/views/cmdb/modeling/attributes/module/attributeForm.vue b/cmdb-ui/src/views/cmdb/modeling/attributes/module/attributeForm.vue similarity index 100% rename from ui/src/views/cmdb/modeling/attributes/module/attributeForm.vue rename to cmdb-ui/src/views/cmdb/modeling/attributes/module/attributeForm.vue diff --git a/ui/src/views/cmdb/modeling/attributes/module/const.js b/cmdb-ui/src/views/cmdb/modeling/attributes/module/const.js similarity index 100% rename from ui/src/views/cmdb/modeling/attributes/module/const.js rename to cmdb-ui/src/views/cmdb/modeling/attributes/module/const.js diff --git a/ui/src/views/cmdb/modeling/ci_type/attributesTable.vue b/cmdb-ui/src/views/cmdb/modeling/ci_type/attributesTable.vue similarity index 100% rename from ui/src/views/cmdb/modeling/ci_type/attributesTable.vue rename to cmdb-ui/src/views/cmdb/modeling/ci_type/attributesTable.vue diff --git a/ui/src/views/cmdb/modeling/ci_type/checkTable.vue b/cmdb-ui/src/views/cmdb/modeling/ci_type/checkTable.vue similarity index 100% rename from ui/src/views/cmdb/modeling/ci_type/checkTable.vue rename to cmdb-ui/src/views/cmdb/modeling/ci_type/checkTable.vue diff --git a/ui/src/views/cmdb/modeling/ci_type/defaultShowTable.vue b/cmdb-ui/src/views/cmdb/modeling/ci_type/defaultShowTable.vue similarity index 100% rename from ui/src/views/cmdb/modeling/ci_type/defaultShowTable.vue rename to cmdb-ui/src/views/cmdb/modeling/ci_type/defaultShowTable.vue diff --git a/ui/src/views/cmdb/modeling/ci_type/detail.vue b/cmdb-ui/src/views/cmdb/modeling/ci_type/detail.vue similarity index 100% rename from ui/src/views/cmdb/modeling/ci_type/detail.vue rename to cmdb-ui/src/views/cmdb/modeling/ci_type/detail.vue diff --git a/ui/src/views/cmdb/modeling/ci_type/group.vue b/cmdb-ui/src/views/cmdb/modeling/ci_type/group.vue similarity index 100% rename from ui/src/views/cmdb/modeling/ci_type/group.vue rename to cmdb-ui/src/views/cmdb/modeling/ci_type/group.vue diff --git a/ui/src/views/cmdb/modeling/ci_type/list.vue b/cmdb-ui/src/views/cmdb/modeling/ci_type/list.vue similarity index 100% rename from ui/src/views/cmdb/modeling/ci_type/list.vue rename to cmdb-ui/src/views/cmdb/modeling/ci_type/list.vue diff --git a/ui/src/views/cmdb/modeling/ci_type/relationTable.vue b/cmdb-ui/src/views/cmdb/modeling/ci_type/relationTable.vue similarity index 100% rename from ui/src/views/cmdb/modeling/ci_type/relationTable.vue rename to cmdb-ui/src/views/cmdb/modeling/ci_type/relationTable.vue diff --git a/ui/src/views/cmdb/modeling/preference_relation/index.vue b/cmdb-ui/src/views/cmdb/modeling/preference_relation/index.vue similarity index 100% rename from ui/src/views/cmdb/modeling/preference_relation/index.vue rename to cmdb-ui/src/views/cmdb/modeling/preference_relation/index.vue diff --git a/ui/src/views/cmdb/modeling/preference_relation/modules/RelationViewForm.vue b/cmdb-ui/src/views/cmdb/modeling/preference_relation/modules/RelationViewForm.vue similarity index 100% rename from ui/src/views/cmdb/modeling/preference_relation/modules/RelationViewForm.vue rename to cmdb-ui/src/views/cmdb/modeling/preference_relation/modules/RelationViewForm.vue diff --git a/ui/src/views/cmdb/modeling/relation_type/index.vue b/cmdb-ui/src/views/cmdb/modeling/relation_type/index.vue similarity index 100% rename from ui/src/views/cmdb/modeling/relation_type/index.vue rename to cmdb-ui/src/views/cmdb/modeling/relation_type/index.vue diff --git a/ui/src/views/cmdb/modeling/relation_type/modules/relationTypeForm.vue b/cmdb-ui/src/views/cmdb/modeling/relation_type/modules/relationTypeForm.vue similarity index 100% rename from ui/src/views/cmdb/modeling/relation_type/modules/relationTypeForm.vue rename to cmdb-ui/src/views/cmdb/modeling/relation_type/modules/relationTypeForm.vue diff --git a/ui/src/views/cmdb/preference/index.vue b/cmdb-ui/src/views/cmdb/preference/index.vue similarity index 100% rename from ui/src/views/cmdb/preference/index.vue rename to cmdb-ui/src/views/cmdb/preference/index.vue diff --git a/ui/src/views/cmdb/relation_views/index.vue b/cmdb-ui/src/views/cmdb/relation_views/index.vue similarity index 100% rename from ui/src/views/cmdb/relation_views/index.vue rename to cmdb-ui/src/views/cmdb/relation_views/index.vue diff --git a/ui/src/views/cmdb/tree_views/index.vue b/cmdb-ui/src/views/cmdb/tree_views/index.vue similarity index 100% rename from ui/src/views/cmdb/tree_views/index.vue rename to cmdb-ui/src/views/cmdb/tree_views/index.vue diff --git a/ui/src/views/exception/403.vue b/cmdb-ui/src/views/exception/403.vue similarity index 100% rename from ui/src/views/exception/403.vue rename to cmdb-ui/src/views/exception/403.vue diff --git a/ui/src/views/exception/404.vue b/cmdb-ui/src/views/exception/404.vue similarity index 100% rename from ui/src/views/exception/404.vue rename to cmdb-ui/src/views/exception/404.vue diff --git a/ui/src/views/exception/500.vue b/cmdb-ui/src/views/exception/500.vue similarity index 100% rename from ui/src/views/exception/500.vue rename to cmdb-ui/src/views/exception/500.vue diff --git a/ui/src/views/user/Login.vue b/cmdb-ui/src/views/user/Login.vue similarity index 100% rename from ui/src/views/user/Login.vue rename to cmdb-ui/src/views/user/Login.vue diff --git a/ui/src/views/user/Register.vue b/cmdb-ui/src/views/user/Register.vue similarity index 100% rename from ui/src/views/user/Register.vue rename to cmdb-ui/src/views/user/Register.vue diff --git a/ui/src/views/user/RegisterResult.vue b/cmdb-ui/src/views/user/RegisterResult.vue similarity index 100% rename from ui/src/views/user/RegisterResult.vue rename to cmdb-ui/src/views/user/RegisterResult.vue diff --git a/ui/src/views/welcome/index.vue b/cmdb-ui/src/views/welcome/index.vue similarity index 100% rename from ui/src/views/welcome/index.vue rename to cmdb-ui/src/views/welcome/index.vue diff --git a/ui/src/views/welcome/welcome.vue b/cmdb-ui/src/views/welcome/welcome.vue similarity index 100% rename from ui/src/views/welcome/welcome.vue rename to cmdb-ui/src/views/welcome/welcome.vue diff --git a/ui/tests/unit/.eslintrc.js b/cmdb-ui/tests/unit/.eslintrc.js similarity index 100% rename from ui/tests/unit/.eslintrc.js rename to cmdb-ui/tests/unit/.eslintrc.js diff --git a/ui/vue.config.js b/cmdb-ui/vue.config.js similarity index 100% rename from ui/vue.config.js rename to cmdb-ui/vue.config.js diff --git a/ui/webstorm.config.js b/cmdb-ui/webstorm.config.js similarity index 100% rename from ui/webstorm.config.js rename to cmdb-ui/webstorm.config.js diff --git a/docker-compose.yml b/docker-compose.yml index b854fb9..7ca77a4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -65,9 +65,9 @@ services: - /bin/sh - -c - | - sed -i "s#USE_ES = False#USE_ES = True#g" api/settings.py - sed -i "s#USE_ACL = False#USE_ACL = True#g" api/settings.py - sed -i "s#ES_HOST = '127.0.0.1'#ES_HOST = 'cmdb-search'#g" api/settings.py + sed -i "s#USE_ES = False#USE_ES = True#g" settings.py + sed -i "s#USE_ACL = False#USE_ACL = True#g" settings.py + sed -i "s#ES_HOST = '127.0.0.1'#ES_HOST = 'cmdb-search'#g" settings.py sleep 15 gunicorn --workers=3 autoapp:app -b 0.0.0.0:5000 -D flask init-cache