diff --git a/README.md b/README.md index d85e02b..50cff0b 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ ### 整体架构 - + ### 相关文档 @@ -51,12 +51,11 @@ - 服务树 -![1](docs/0.png "首页展示") +![1](docs/images/0.png "首页展示") [查看更多展示](docs/screenshot.md) - ### 更多功能 > 也欢迎移步[维易科技官网](https://veops.cn)，发现更多免费运维系统。 @@ -67,9 +66,18 @@ ## 安装 -### [Docker 一键快速构建](docs/docker.md) +### Docker 一键快速构建 +- 进入主目录（先安装 docker 环境） -### [本地搭建](docs/local.md) +``` +docker-compose up -d +``` + +- 浏览器打开: [http://127.0.0.1:8000](http://127.0.0.1:8000) +- username: demo 或者 admin +- password: 123456 + +### [本地开发环境搭建](docs/local.md) ### [Makefile 安装](docs/makefile.md) @@ -77,4 +85,4 @@ _**欢迎关注我们的公众号，点击联系我们，加入微信、qq运维群，获得更多产品、行业相关资讯**_ -![公众号](docs/qrcode_for_gzh.jpg) +![公众号](docs/images/qrcode_for_gzh.jpg) diff --git a/README_en.md b/README_en.md index 1cb32e8..f2602c8 100644 --- a/README_en.md +++ b/README_en.md @@ -18,7 +18,7 @@ ### Technical Architecture - + ### Document @@ -51,7 +51,7 @@ ### System Overview - Service Tree - ![1](docs/0.png "首页展示") + ![1](docs/images/0.png "首页展示") [View more screenshots](docs/screenshot.md) @@ -61,7 +61,17 @@ ## Installation -### [One-Click Docker Quick Build](docs/docker_en.md) +### One-Click Docker Quick Build + +- Prepare: install docker and docker-compose +- In directory cmdb + ``` + docker-compose up -d + ``` +- View: [http://127.0.0.1:8000](http://127.0.0.1:8000) +- username: demo or admin +- password: 123456 + ### [Local Setup](docs/local_en.md) @@ -77,6 +87,6 @@ --- -_**Welcome to join us through QQ group（336164978）**_ +_**Welcome to pay attention to our public account, click to contact us, join WeChat, QQ operation and maintenance group, and get more product and industry related information**_ -![QQgroup](docs/qr_code.jpg) +![QQgroup](docs/images/qrcode_for_gzh.jpg) diff --git a/cmdb-ui/.env b/cmdb-ui/.env index ee9f4c7..1be71b7 100644 --- a/cmdb-ui/.env +++ b/cmdb-ui/.env @@ -1,5 +1,5 @@ NODE_ENV=production VUE_APP_PREVIEW=false -VUE_APP_API_BASE_URL=/api +VUE_APP_API_BASE_URL=http://127.0.0.1:5000/api VUE_APP_BUILD_PACKAGES="ticket,calendar,acl" VUE_APP_IS_OUTER=true diff --git a/docs/docker.md b/docs/docker.md deleted file mode 100644 index 459340c..0000000 --- a/docs/docker.md +++ /dev/null @@ -1,9 +0,0 @@ -- 进入主目录（先安装 docker 环境） - -``` - docker-compose up -d -``` - -- 浏览器打开: [http://127.0.0.1:8000](http://127.0.0.1:8000) -- username: demo 或者 admin -- password: 123456 diff --git a/docs/docker_en.md b/docs/docker_en.md deleted file mode 100644 index 34da411..0000000 --- a/docs/docker_en.md +++ /dev/null @@ -1,10 +0,0 @@ -### Install by Docker - -- Prepare: install docker and docker-compose -- In directory cmdb - ``` - docker-compose up -d - ``` -- View: [http://127.0.0.1:8000](http://127.0.0.1:8000) -- username: demo or admin -- password: 123456 diff --git a/docs/images/1.png b/docs/images/1.png new file mode 100644 index 0000000..fc9a469 Binary files /dev/null and b/docs/images/1.png differ diff --git a/docs/images/10.jpg b/docs/images/10.jpg new file mode 100644 index 0000000..dc97912 Binary files /dev/null and b/docs/images/10.jpg differ diff --git a/docs/images/2.png b/docs/images/2.png new file mode 100644 index 0000000..79d3ae4 Binary files /dev/null and b/docs/images/2.png differ diff --git a/docs/3.png b/docs/images/3.png similarity index 100% rename from docs/3.png rename to docs/images/3.png diff --git a/docs/images/4.png b/docs/images/4.png new file mode 100644 index 0000000..2122466 Binary files /dev/null and b/docs/images/4.png differ diff --git a/docs/images/5.png b/docs/images/5.png new file mode 100644 index 0000000..1ddfb9b Binary files /dev/null and b/docs/images/5.png differ diff --git a/docs/images/6.png b/docs/images/6.png new file mode 100644 index 0000000..8f82699 Binary files /dev/null and b/docs/images/6.png differ diff --git a/docs/images/7.png b/docs/images/7.png new file mode 100644 index 0000000..9aacfeb Binary files /dev/null and b/docs/images/7.png differ diff --git a/docs/images/8.png b/docs/images/8.png new file mode 100644 index 0000000..c55c7b4 Binary files /dev/null and b/docs/images/8.png differ diff --git a/docs/images/9.png b/docs/images/9.png new file mode 100644 index 0000000..7442664 Binary files /dev/null and b/docs/images/9.png differ diff --git a/docs/logo.png b/docs/images/logo.png similarity index 100% rename from docs/logo.png rename to docs/images/logo.png diff --git a/docs/qr_code.jpg b/docs/images/qr_code.jpg similarity index 100% rename from docs/qr_code.jpg rename to docs/images/qr_code.jpg diff --git a/docs/qrcode_for_gzh.jpg b/docs/images/qrcode_for_gzh.jpg similarity index 100% rename from docs/qrcode_for_gzh.jpg rename to docs/images/qrcode_for_gzh.jpg diff --git a/docs/images/view.jpg b/docs/images/view.jpg new file mode 100644 index 0000000..142f1d4 Binary files /dev/null and b/docs/images/view.jpg differ diff --git a/docs/screenshot.md b/docs/screenshot.md index 1f87525..6d5b962 100644 --- a/docs/screenshot.md +++ b/docs/screenshot.md @@ -2,28 +2,28 @@ - 服务树 -![1](0.png "首页展示") +![1](images/0.png "首页展示") - 资源视图 -![2](2.png "资源视图") +![2](images/2.png "资源视图") - 订阅页面 -![6](6.png "订阅页面") +![6](images/6.png "订阅页面") - 模型配置 -![9](9.png "模型配置") +![9](images/9.png "模型配置") - 属性设置 -![7](7.png "属性设置") +![7](images/7.png "属性设置") - 资源搜索 -![8](8.png "资源搜索") +![8](images/8.png "资源搜索") - 定制仪表盘 -![10](10.jpg "定制仪表盘") +![10](images/10.jpg "定制仪表盘")