From fa5c15b033e1861082f3754b54d2ed5b158b958a Mon Sep 17 00:00:00 2001 From: pycook Date: Fri, 1 Nov 2019 10:42:16 +0800 Subject: [PATCH 1/6] mkdir logs, ignore *.log --- .gitignore | 2 -- logs/.gitkeep | 0 2 files changed, 2 deletions(-) create mode 100644 logs/.gitkeep diff --git a/.gitignore b/.gitignore index c1401c7..460951e 100755 --- a/.gitignore +++ b/.gitignore @@ -2,9 +2,7 @@ .idea .vscode migrates -*/logs/* config.cfg -logs/* *.log *_packed.js *_packed.css diff --git a/logs/.gitkeep b/logs/.gitkeep new file mode 100644 index 0000000..e69de29 From 7a9421a1c2c45c7893d3d5c56c1ef43fc295b07c Mon Sep 17 00:00:00 2001 From: pycook Date: Fri, 1 Nov 2019 11:27:07 +0800 Subject: [PATCH 2/6] fix add integer list --- api/lib/cmdb/value.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/api/lib/cmdb/value.py b/api/lib/cmdb/value.py index e4ef9b3..af16f39 100644 --- a/api/lib/cmdb/value.py +++ b/api/lib/cmdb/value.py @@ -129,7 +129,9 @@ class AttributeValueManager(object): operate_type = OperateType.ADD if existed_attr is None else OperateType.UPDATE value_list = handle_arg_list(value) if attr.is_list else [value] - + if not isinstance(value, list): + value_list = [value] + for v in value_list: v = self._validate(attr, v, value_table, ci_id) if not v and attr.value_type != Attribute.TEXT: From ccc7b45a8eff60545bde7229e3633aa188dfd89a Mon Sep 17 00:00:00 2001 From: pycook Date: Fri, 1 Nov 2019 11:37:07 +0800 Subject: [PATCH 3/6] update overview jpeg url --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 133290e..c1d1869 100644 --- a/README.md +++ b/README.md @@ -19,9 +19,9 @@ Overview ---- -![基础资源视图](ui/public/cmdb01.jpeg) +![基础资源视图](https://raw.githubusercontent.com/pycook/cmdb/master/ui/public/cmdb01.jpeg) -![模型配置](ui/public/cmdb02.jpeg) +![模型配置](https://raw.githubusercontent.com/pycook/cmdb/master/ui/public/cmdb02.jpeg) 环境和依赖 ---- From 4a73504921e663a5f46df452d82d9363237963c1 Mon Sep 17 00:00:00 2001 From: pycook Date: Tue, 5 Nov 2019 17:43:40 +0800 Subject: [PATCH 4/6] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 如果是非本机访问, 要修改ui/.env里VUE_APP_API_BASE_URL里的IP地址 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c1d1869..ab867a4 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,7 @@ cp api/settings.py.example api/settings.py - 安装库 - 后端: ```pipenv run pipenv install``` - 前端: ```cd ui && yarn install && cd ..``` + - 如果是非本机访问, 要修改ui/.env里VUE_APP_API_BASE_URL里的IP地址 - 创建数据库表 ```pipenv run flask db-setup``` - 可以将docs/cmdb.sql导入到数据库里，登录用户和密码都是:admin From 68d5be86ad8e2d44d07c145858646f6c587e50de Mon Sep 17 00:00:00 2001 From: pycook Date: Tue, 5 Nov 2019 17:44:48 +0800 Subject: [PATCH 5/6] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 如果是非本机访问, 要修改ui/.env里VUE_APP_API_BASE_URL里的IP地址 --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ab867a4..ab48a0d 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,6 @@ cp api/settings.py.example api/settings.py - 安装库 - 后端: ```pipenv run pipenv install``` - 前端: ```cd ui && yarn install && cd ..``` - - 如果是非本机访问, 要修改ui/.env里VUE_APP_API_BASE_URL里的IP地址 - 创建数据库表 ```pipenv run flask db-setup``` - 可以将docs/cmdb.sql导入到数据库里，登录用户和密码都是:admin @@ -53,5 +52,7 @@ cp api/settings.py.example api/settings.py - 启动服务 - 后端: ```pipenv run flask run``` - 前端: ```cd ui && yarn run serve``` + - 浏览器打开: [http://127.0.0.1:8000](http://127.0.0.1:8000) + - 如果是非本机访问, 要修改ui/.env里VUE_APP_API_BASE_URL里的IP地址 From f00f6499ebcd142e512b5a9f9818bf6f0af93835 Mon Sep 17 00:00:00 2001 From: pycook Date: Tue, 5 Nov 2019 17:52:45 +0800 Subject: [PATCH 6/6] Update README.md pipenv run flask run -h 0.0.0.0 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ab48a0d..0f80010 100644 --- a/README.md +++ b/README.md @@ -50,9 +50,9 @@ cp api/settings.py.example api/settings.py - 可以将docs/cmdb.sql导入到数据库里，登录用户和密码都是:admin - 启动服务 - - 后端: ```pipenv run flask run``` + - 后端: ```pipenv run flask run -h 0.0.0.0``` - 前端: ```cd ui && yarn run serve``` - 浏览器打开: [http://127.0.0.1:8000](http://127.0.0.1:8000) - - 如果是非本机访问, 要修改ui/.env里VUE_APP_API_BASE_URL里的IP地址 + - 如果是非本机访问, 要修改**ui/.env**里**VUE_APP_API_BASE_URL**里的IP地址为后端服务的ip地址