diff --git a/Makefile b/Makefile index 3f9411f..99b1122 100644 --- a/Makefile +++ b/Makefile @@ -18,14 +18,14 @@ env: deps: pipenv install --dev && \ pipenv run flask db-setup && \ - pipenv run flask init-cache && \ + pipenv run flask cmdb-init-cache && \ cd cmdb-ui && yarn install && cd .. api: cd cmdb-api && pipenv run flask run -h 0.0.0.0 worker: - cd cmdb-api && pipenv run celery worker -A celery_worker.celery -E -Q cmdb_async --concurrency=1 + cd cmdb-api && pipenv run celery worker -A celery_worker.celery -E -Q one_cmdb_async --concurrency=1 -D && pipenv run celery worker -A celery_worker.celery -E -Q acl_async --concurrency=1 -D ui: cd cmdb-ui && yarn run serve diff --git a/README.md b/README.md index 4179c56..d85e02b 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ ### 更多功能 -> 也欢迎移步[维易科技官网](https://www.veops.cn),发现更多免费运维系统。 +> 也欢迎移步[维易科技官网](https://veops.cn),发现更多免费运维系统。 ## 接入公司 diff --git a/cmdb-api/Pipfile b/cmdb-api/Pipfile index 3402e75..b6c98dd 100644 --- a/cmdb-api/Pipfile +++ b/cmdb-api/Pipfile @@ -39,7 +39,7 @@ kombu = "==4.4.0" # common setting Flask-APScheduler = "==1.12.4" timeout-decorator = "==0.5.0" -numpy = "==1.18.5" +numpy = "==1.21.5" pandas = "==1.3.2" WTForms = "==3.0.0" email-validator = "==1.3.1" diff --git a/cmdb-api/api/lib/cmdb/ci_type.py b/cmdb-api/api/lib/cmdb/ci_type.py index 0c2d3bb..a88a16b 100644 --- a/cmdb-api/api/lib/cmdb/ci_type.py +++ b/cmdb-api/api/lib/cmdb/ci_type.py @@ -235,7 +235,7 @@ class CITypeGroupManager(object): for t in sorted(CITypeGroupItem.get_by(group_id=group['id']), key=lambda x: x['order'] or 0): ci_type = CITypeCache.get(t['type_id']).to_dict() if resources is None or (ci_type and ci_type['name'] in resources): - ci_type['permissions'] = resources[ci_type['name']] + ci_type['permissions'] = resources[ci_type['name']] if resources is not None else None group.setdefault("ci_types", []).append(ci_type) group_types.add(t["type_id"]) @@ -244,7 +244,7 @@ class CITypeGroupManager(object): other_types = dict(ci_types=[]) for ci_type in ci_types: if ci_type["id"] not in group_types and (resources is None or ci_type['name'] in resources): - ci_type['permissions'] = resources.get(ci_type['name']) + ci_type['permissions'] = resources.get(ci_type['name']) if resources is not None else None other_types['ci_types'].append(ci_type) groups.append(other_types) diff --git a/cmdb-api/requirements.txt b/cmdb-api/requirements.txt index 39b32cb..31b6886 100644 --- a/cmdb-api/requirements.txt +++ b/cmdb-api/requirements.txt @@ -47,7 +47,7 @@ meld3==2.0.1 mistune==3.0.1 more-itertools==5.0.0 msgpack-python==0.5.6 -numpy==1.18.5 +numpy==1.21.5 pandas==1.3.2 Pillow==8.3.2 pkgutil_resolve_name==1.3.10 @@ -77,4 +77,4 @@ urllib3==1.26.16 vine==1.3.0 Werkzeug==0.15.5 WTForms==3.0.0 -zipp==3.16.0 \ No newline at end of file +zipp==3.16.0 diff --git a/cmdb-ui/src/modules/cmdb/views/ci_types/attributeEditForm.vue b/cmdb-ui/src/modules/cmdb/views/ci_types/attributeEditForm.vue index ab8fbfc..d4f6814 100644 --- a/cmdb-ui/src/modules/cmdb/views/ci_types/attributeEditForm.vue +++ b/cmdb-ui/src/modules/cmdb/views/ci_types/attributeEditForm.vue @@ -172,7 +172,7 @@ >