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/README.md b/README.md index bcefd0c..61e7638 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) 环境和依赖 ---- @@ -50,9 +50,11 @@ 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地址为后端服务的ip地址 docker运行 ---- 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: diff --git a/logs/.gitkeep b/logs/.gitkeep new file mode 100644 index 0000000..e69de29